1 files changed, 67 insertions, 66 deletions
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml
index 21908d577f1..92695512c09 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml
@@ -2,114 +2,115 @@
 <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
   <uml:Model xmi:id="_VkhJIBLoEeeDV7UHoBIkeA" name="types" URI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2">
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwMBLoEeeDV7UHoBIkeA" name="ElementTypeSetConfiguration">
-      <generalization xmi:id="_VkhwMRLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:id="_VkhwMhLoEeeDV7UHoBIkeA" name="elementTypeConfigurations" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwVRLoEeeDV7UHoBIkeA">
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwMRLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwMhLoEeeDV7UHoBIkeA" name="elementTypeConfigurations" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwVRLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwMxLoEeeDV7UHoBIkeA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwNBLoEeeDV7UHoBIkeA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwNRLoEeeDV7UHoBIkeA" name="adviceBindingsConfigurations" type="_VkhwVxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwgRLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwNRLoEeeDV7UHoBIkeA" name="adviceBindingsConfigurations" type="_VkhwVxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwgRLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwNhLoEeeDV7UHoBIkeA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwNxLoEeeDV7UHoBIkeA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwOBLoEeeDV7UHoBIkeA" name="metamodelNsURI" visibility="public" isOrdered="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwOBLoEeeDV7UHoBIkeA" name="metamodelNsURI" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
       </ownedAttribute>
-      <interfaceRealization xmi:id="_VkhwORLoEeeDV7UHoBIkeA" client="_VkhwMBLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
-      <interfaceRealization xmi:id="_VkhwOhLoEeeDV7UHoBIkeA" client="_VkhwMBLoEeeDV7UHoBIkeA" supplier="_VkhwQBLoEeeDV7UHoBIkeA" contract="_VkhwQBLoEeeDV7UHoBIkeA"/>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwORLoEeeDV7UHoBIkeA" client="_VkhwMBLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwOhLoEeeDV7UHoBIkeA" client="_VkhwMBLoEeeDV7UHoBIkeA" supplier="_VkhwQBLoEeeDV7UHoBIkeA" contract="_VkhwQBLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwOxLoEeeDV7UHoBIkeA" name="ConfigurationElement" isAbstract="true">
-      <ownedAttribute xmi:id="_VkhwPBLoEeeDV7UHoBIkeA" name="description" visibility="public" isOrdered="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwPBLoEeeDV7UHoBIkeA" name="description" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwPRLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Interface" xmi:id="_VkhwPhLoEeeDV7UHoBIkeA" name="IdentifiedConfiguration">
-      <ownedAttribute xmi:id="_VkhwPxLoEeeDV7UHoBIkeA" name="identifier" visibility="public" isOrdered="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwPxLoEeeDV7UHoBIkeA" name="identifier" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Interface" xmi:id="_VkhwQBLoEeeDV7UHoBIkeA" name="NamedConfiguration">
-      <ownedAttribute xmi:id="_VkhwQRLoEeeDV7UHoBIkeA" name="name" visibility="public" isOrdered="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwQRLoEeeDV7UHoBIkeA" name="name" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwQhLoEeeDV7UHoBIkeA" name="ElementTypeConfiguration" isAbstract="true">
-      <generalization xmi:id="_VkhwQxLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:id="_VkhwRBLoEeeDV7UHoBIkeA" name="hint" visibility="public" isOrdered="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwQxLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwRBLoEeeDV7UHoBIkeA" name="hint" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwRRLoEeeDV7UHoBIkeA"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_VkhwRhLoEeeDV7UHoBIkeA" value="">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwRxLoEeeDV7UHoBIkeA" name="kind" visibility="public" isOrdered="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwRxLoEeeDV7UHoBIkeA" name="kind" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwSBLoEeeDV7UHoBIkeA"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_VkhwSRLoEeeDV7UHoBIkeA" value="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwShLoEeeDV7UHoBIkeA" name="iconEntry" type="_VkhwThLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwUxLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwShLoEeeDV7UHoBIkeA" name="iconEntry" type="_VkhwThLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwUxLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwSxLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <interfaceRealization xmi:id="_VkhwTBLoEeeDV7UHoBIkeA" client="_VkhwQhLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
-      <interfaceRealization xmi:id="_VkhwTRLoEeeDV7UHoBIkeA" client="_VkhwQhLoEeeDV7UHoBIkeA" supplier="_VkhwQBLoEeeDV7UHoBIkeA" contract="_VkhwQBLoEeeDV7UHoBIkeA"/>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwTBLoEeeDV7UHoBIkeA" client="_VkhwQhLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwTRLoEeeDV7UHoBIkeA" client="_VkhwQhLoEeeDV7UHoBIkeA" supplier="_VkhwQBLoEeeDV7UHoBIkeA" contract="_VkhwQBLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwThLoEeeDV7UHoBIkeA" name="IconEntry">
-      <ownedAttribute xmi:id="_VkhwTxLoEeeDV7UHoBIkeA" name="iconPath" visibility="public" isOrdered="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwTxLoEeeDV7UHoBIkeA" name="iconPath" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwUBLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwURLoEeeDV7UHoBIkeA" name="bundleId" visibility="public" isOrdered="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwURLoEeeDV7UHoBIkeA" name="bundleId" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwUhLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwUxLoEeeDV7UHoBIkeA" memberEnd="_VkhwShLoEeeDV7UHoBIkeA _VkhwVBLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwVBLoEeeDV7UHoBIkeA" type="_VkhwQhLoEeeDV7UHoBIkeA" association="_VkhwUxLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwVBLoEeeDV7UHoBIkeA" type="_VkhwQhLoEeeDV7UHoBIkeA" association="_VkhwUxLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwVRLoEeeDV7UHoBIkeA" memberEnd="_VkhwMhLoEeeDV7UHoBIkeA _VkhwVhLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwVhLoEeeDV7UHoBIkeA" type="_VkhwMBLoEeeDV7UHoBIkeA" association="_VkhwVRLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwVhLoEeeDV7UHoBIkeA" type="_VkhwMBLoEeeDV7UHoBIkeA" association="_VkhwVRLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwVxLoEeeDV7UHoBIkeA" name="AbstractAdviceBindingConfiguration" isAbstract="true">
-      <generalization xmi:id="_VkhwWBLoEeeDV7UHoBIkeA" general="_VkhwYRLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:id="_VkhwWRLoEeeDV7UHoBIkeA" name="target" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwbRLoEeeDV7UHoBIkeA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwWhLoEeeDV7UHoBIkeA"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwWBLoEeeDV7UHoBIkeA" general="_VkhwYRLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwWRLoEeeDV7UHoBIkeA" name="target" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwbRLoEeeDV7UHoBIkeA">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwWhLoEeeDV7UHoBIkeA" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SixAkGdmEemuaY_wnFi0kA" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwWxLoEeeDV7UHoBIkeA" name="containerConfiguration" type="_VkhwbxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwehLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwWxLoEeeDV7UHoBIkeA" name="containerConfiguration" type="_VkhwbxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwehLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwXBLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwXRLoEeeDV7UHoBIkeA" name="matcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwfBLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwXRLoEeeDV7UHoBIkeA" name="matcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwfBLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwXhLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwXxLoEeeDV7UHoBIkeA" name="inheritance" visibility="public" type="_VkhwfhLoEeeDV7UHoBIkeA" isOrdered="true"/>
-      <interfaceRealization xmi:id="_VkhwYBLoEeeDV7UHoBIkeA" client="_VkhwVxLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwXxLoEeeDV7UHoBIkeA" name="inheritance" visibility="public" type="_VkhwfhLoEeeDV7UHoBIkeA" isOrdered="true"/>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwYBLoEeeDV7UHoBIkeA" client="_VkhwVxLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwYRLoEeeDV7UHoBIkeA" name="AdviceConfiguration" isAbstract="true">
-      <generalization xmi:id="_VkhwYhLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:id="_VkhwYxLoEeeDV7UHoBIkeA" name="before" type="_VkhwYRLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwaRLoEeeDV7UHoBIkeA">
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwYhLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwYxLoEeeDV7UHoBIkeA" name="before" type="_VkhwYRLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwaRLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwZBLoEeeDV7UHoBIkeA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwZRLoEeeDV7UHoBIkeA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwZhLoEeeDV7UHoBIkeA" name="after" type="_VkhwYRLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwaxLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwZhLoEeeDV7UHoBIkeA" name="after" type="_VkhwYRLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwaxLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwZxLoEeeDV7UHoBIkeA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwaBLoEeeDV7UHoBIkeA" value="*"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwaRLoEeeDV7UHoBIkeA" memberEnd="_VkhwYxLoEeeDV7UHoBIkeA _VkhwahLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwahLoEeeDV7UHoBIkeA" type="_VkhwYRLoEeeDV7UHoBIkeA" association="_VkhwaRLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwahLoEeeDV7UHoBIkeA" type="_VkhwYRLoEeeDV7UHoBIkeA" association="_VkhwaRLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwaxLoEeeDV7UHoBIkeA" memberEnd="_VkhwZhLoEeeDV7UHoBIkeA _VkhwbBLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwbBLoEeeDV7UHoBIkeA" type="_VkhwYRLoEeeDV7UHoBIkeA" association="_VkhwaxLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwbBLoEeeDV7UHoBIkeA" type="_VkhwYRLoEeeDV7UHoBIkeA" association="_VkhwaxLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwbRLoEeeDV7UHoBIkeA" memberEnd="_VkhwWRLoEeeDV7UHoBIkeA _VkhwbhLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwbhLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwbRLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwbhLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwbRLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwbxLoEeeDV7UHoBIkeA" name="ContainerConfiguration">
-      <ownedAttribute xmi:id="_VkhwcBLoEeeDV7UHoBIkeA" name="containerMatcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwdhLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwcBLoEeeDV7UHoBIkeA" name="containerMatcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwdhLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwcRLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwchLoEeeDV7UHoBIkeA" name="eContainmentFeatures" isOrdered="true" association="_VkhweBLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwchLoEeeDV7UHoBIkeA" name="eContainmentFeatures" isOrdered="true" association="_VkhweBLoEeeDV7UHoBIkeA">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EReference"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwcxLoEeeDV7UHoBIkeA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwdBLoEeeDV7UHoBIkeA" value="*"/>
@@ -117,97 +118,97 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwdRLoEeeDV7UHoBIkeA" name="AbstractMatcherConfiguration" isAbstract="true"/>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwdhLoEeeDV7UHoBIkeA" memberEnd="_VkhwcBLoEeeDV7UHoBIkeA _VkhwdxLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwdxLoEeeDV7UHoBIkeA" type="_VkhwbxLoEeeDV7UHoBIkeA" association="_VkhwdhLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwdxLoEeeDV7UHoBIkeA" type="_VkhwbxLoEeeDV7UHoBIkeA" association="_VkhwdhLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhweBLoEeeDV7UHoBIkeA" memberEnd="_VkhwchLoEeeDV7UHoBIkeA _VkhweRLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhweRLoEeeDV7UHoBIkeA" type="_VkhwbxLoEeeDV7UHoBIkeA" association="_VkhweBLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhweRLoEeeDV7UHoBIkeA" type="_VkhwbxLoEeeDV7UHoBIkeA" association="_VkhweBLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwehLoEeeDV7UHoBIkeA" memberEnd="_VkhwWxLoEeeDV7UHoBIkeA _VkhwexLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwexLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwehLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwexLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwehLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwfBLoEeeDV7UHoBIkeA" memberEnd="_VkhwXRLoEeeDV7UHoBIkeA _VkhwfRLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwfRLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwfBLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwfRLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwfBLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Enumeration" xmi:id="_VkhwfhLoEeeDV7UHoBIkeA" name="InheritanceKind">
-      <ownedLiteral xmi:id="_VkhwfxLoEeeDV7UHoBIkeA" name="none"/>
-      <ownedLiteral xmi:id="_VkhwgBLoEeeDV7UHoBIkeA" name="all"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_VkhwfxLoEeeDV7UHoBIkeA" name="none"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_VkhwgBLoEeeDV7UHoBIkeA" name="all"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwgRLoEeeDV7UHoBIkeA" memberEnd="_VkhwNRLoEeeDV7UHoBIkeA _VkhwghLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwghLoEeeDV7UHoBIkeA" type="_VkhwMBLoEeeDV7UHoBIkeA" association="_VkhwgRLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwghLoEeeDV7UHoBIkeA" type="_VkhwMBLoEeeDV7UHoBIkeA" association="_VkhwgRLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwgxLoEeeDV7UHoBIkeA" name="SpecializationTypeConfiguration">
-      <generalization xmi:id="_VkhwhBLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:id="_VkhwhRLoEeeDV7UHoBIkeA" name="editHelperAdviceConfiguration" type="_VkhwjhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwkRLoEeeDV7UHoBIkeA">
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwhBLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwhRLoEeeDV7UHoBIkeA" name="editHelperAdviceConfiguration" type="_VkhwjhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwkRLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwhhLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwhxLoEeeDV7UHoBIkeA" name="containerConfiguration" type="_VkhwbxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwkhLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwhxLoEeeDV7UHoBIkeA" name="containerConfiguration" type="_VkhwbxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwkhLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwiBLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwiRLoEeeDV7UHoBIkeA" name="matcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwlBLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwiRLoEeeDV7UHoBIkeA" name="matcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwlBLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwihLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwixLoEeeDV7UHoBIkeA" name="specializedTypes" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwlhLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwixLoEeeDV7UHoBIkeA" name="specializedTypes" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwlhLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwjBLoEeeDV7UHoBIkeA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwjRLoEeeDV7UHoBIkeA" value="*"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwjhLoEeeDV7UHoBIkeA" name="AbstractEditHelperAdviceConfiguration" isAbstract="true">
-      <generalization xmi:id="_VkhwjxLoEeeDV7UHoBIkeA" general="_VkhwYRLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:id="_VkhwkBLoEeeDV7UHoBIkeA" name="target" type="_VkhwgxLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwkRLoEeeDV7UHoBIkeA"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwjxLoEeeDV7UHoBIkeA" general="_VkhwYRLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwkBLoEeeDV7UHoBIkeA" name="target" type="_VkhwgxLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwkRLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwkRLoEeeDV7UHoBIkeA" memberEnd="_VkhwhRLoEeeDV7UHoBIkeA _VkhwkBLoEeeDV7UHoBIkeA"/>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwkhLoEeeDV7UHoBIkeA" memberEnd="_VkhwhxLoEeeDV7UHoBIkeA _VkhwkxLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwkxLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwkhLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwkxLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwkhLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwlBLoEeeDV7UHoBIkeA" memberEnd="_VkhwiRLoEeeDV7UHoBIkeA _VkhwlRLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwlRLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwlBLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwlRLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwlBLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwlhLoEeeDV7UHoBIkeA" memberEnd="_VkhwixLoEeeDV7UHoBIkeA _VkhwlxLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwlxLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwlhLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwlxLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwlhLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwmBLoEeeDV7UHoBIkeA" name="MetamodelTypeConfiguration">
-      <generalization xmi:id="_VkhwmRLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:id="_VkhwmhLoEeeDV7UHoBIkeA" name="eClass" isOrdered="true" association="_VkhwnhLoEeeDV7UHoBIkeA">
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwmRLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwmhLoEeeDV7UHoBIkeA" name="eClass" isOrdered="true" association="_VkhwnhLoEeeDV7UHoBIkeA">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EClass"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwmxLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:id="_VkhwnBLoEeeDV7UHoBIkeA" name="editHelperClassName" visibility="public" isOrdered="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwnBLoEeeDV7UHoBIkeA" name="editHelperClassName" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwnRLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwnhLoEeeDV7UHoBIkeA" memberEnd="_VkhwmhLoEeeDV7UHoBIkeA _VkhwnxLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:id="_VkhwnxLoEeeDV7UHoBIkeA" type="_VkhwmBLoEeeDV7UHoBIkeA" association="_VkhwnhLoEeeDV7UHoBIkeA"/>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwnxLoEeeDV7UHoBIkeA" type="_VkhwmBLoEeeDV7UHoBIkeA" association="_VkhwnhLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwoBLoEeeDV7UHoBIkeA" name="EditHelperAdviceConfiguration">
-      <generalization xmi:id="_VkhwoRLoEeeDV7UHoBIkeA" general="_VkhwjhLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:id="_VkhwohLoEeeDV7UHoBIkeA" name="editHelperAdviceClassName" visibility="public" isOrdered="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwoRLoEeeDV7UHoBIkeA" general="_VkhwjhLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwohLoEeeDV7UHoBIkeA" name="editHelperAdviceClassName" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwoxLoEeeDV7UHoBIkeA" name="AdviceBindingConfiguration">
-      <generalization xmi:id="_VkhwpBLoEeeDV7UHoBIkeA" general="_VkhwVxLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:id="_VkhwpRLoEeeDV7UHoBIkeA" name="editHelperAdviceClassName" visibility="public" isOrdered="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwpBLoEeeDV7UHoBIkeA" general="_VkhwVxLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwpRLoEeeDV7UHoBIkeA" name="editHelperAdviceClassName" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwphLoEeeDV7UHoBIkeA" name="MatcherConfiguration">
-      <generalization xmi:id="_VkhwpxLoEeeDV7UHoBIkeA" general="_VkhwdRLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:id="_VkhwqBLoEeeDV7UHoBIkeA" name="matcherClassName" visibility="public" isOrdered="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwpxLoEeeDV7UHoBIkeA" general="_VkhwdRLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwqBLoEeeDV7UHoBIkeA" name="matcherClassName" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwqRLoEeeDV7UHoBIkeA" name="ExternallyRegisteredType">
-      <generalization xmi:id="_VkhwqhLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwqhLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwqxLoEeeDV7UHoBIkeA" name="ExternallyRegisteredAdvice">
-      <generalization xmi:id="_VkhwrBLoEeeDV7UHoBIkeA" general="_VkhwoxLoEeeDV7UHoBIkeA"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_VkhwrBLoEeeDV7UHoBIkeA" general="_VkhwoxLoEeeDV7UHoBIkeA"/>
     </packagedElement>
-    <profileApplication xmi:id="_VkhwrRLoEeeDV7UHoBIkeA">
-      <eAnnotations xmi:id="_VkhwrhLoEeeDV7UHoBIkeA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_VkhwrRLoEeeDV7UHoBIkeA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VkhwrhLoEeeDV7UHoBIkeA" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
       </eAnnotations>
-      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
     </profileApplication>
   </uml:Model>
   <Ecore:EPackage xmi:id="_VkhwrxLoEeeDV7UHoBIkeA" base_Package="_VkhJIBLoEeeDV7UHoBIkeA" nsPrefix="elementtypesconfigurations" basePackage="org.eclipse.papyrus.infra"/>