Fixed issues with missing UML generated package extension point
definition.
diff --git a/bundles/org.eclipse.upr.utp/META-INF/MANIFEST.MF b/bundles/org.eclipse.upr.utp/META-INF/MANIFEST.MF
index 8ecfb7e..3f76cfe 100644
--- a/bundles/org.eclipse.upr.utp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.upr.utp/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.uml2.types;visibility:=reexport,
  org.eclipse.uml2.common;visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0";visibility:=reexport,
  org.eclipse.upr.utp;visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.upr.utp/model/utp.profile.uml b/bundles/org.eclipse.upr.utp/model/utp.profile.uml
index 5866d1b..79f5724 100644
--- a/bundles/org.eclipse.upr.utp/model/utp.profile.uml
+++ b/bundles/org.eclipse.upr.utp/model/utp.profile.uml
@@ -1,86 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" 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/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
-  <uml:Profile xmi:id="_iCl4wOVMEeG84fBOY39c0g" name="utp" metamodelReference="_packageImport.0">
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_CMQj4OVNEeG84fBOY39c0g" alias="Class">
+<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:Profile xmi:id="_iCl4wOVMEeG84fBOY39c0g" name="utp" URI="http://www.omg.org/spec/UTP/20120801/utp.xmi" metamodelReference="_packageImport.0">
+    <elementImport xmi:id="_CMQj4OVNEeG84fBOY39c0g" alias="Class">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_HFZdEOVNEeG84fBOY39c0g" alias="BehavioredClassifier">
+    <elementImport xmi:id="_HFZdEOVNEeG84fBOY39c0g" alias="BehavioredClassifier">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioredClassifier"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_HFZdEeVNEeG84fBOY39c0g" alias="Property">
+    <elementImport xmi:id="_HFZdEeVNEeG84fBOY39c0g" alias="Property">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_HFZdEuVNEeG84fBOY39c0g" alias="StructuredClassifier">
+    <elementImport xmi:id="_HFZdEuVNEeG84fBOY39c0g" alias="StructuredClassifier">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredClassifier"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_Gjje0OVOEeG84fBOY39c0g" alias="CombinedFragment">
+    <elementImport xmi:id="_Gjje0OVOEeG84fBOY39c0g" alias="CombinedFragment">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CombinedFragment"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_GjkF4OVOEeG84fBOY39c0g" alias="OpaqueAction">
+    <elementImport xmi:id="_GjkF4OVOEeG84fBOY39c0g" alias="OpaqueAction">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#OpaqueAction"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_GjkF4eVOEeG84fBOY39c0g" alias="InvocationAction">
+    <elementImport xmi:id="_GjkF4eVOEeG84fBOY39c0g" alias="InvocationAction">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_GjkF4uVOEeG84fBOY39c0g" alias="SendObjectAction">
+    <elementImport xmi:id="_GjkF4uVOEeG84fBOY39c0g" alias="SendObjectAction">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#SendObjectAction"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_Gjks8OVOEeG84fBOY39c0g" alias="Operation">
+    <elementImport xmi:id="_Gjks8OVOEeG84fBOY39c0g" alias="Operation">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_Gjks8eVOEeG84fBOY39c0g" alias="Behavior">
+    <elementImport xmi:id="_Gjks8eVOEeG84fBOY39c0g" alias="Behavior">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_Gjks8uVOEeG84fBOY39c0g" alias="CallOperationAction">
+    <elementImport xmi:id="_Gjks8uVOEeG84fBOY39c0g" alias="CallOperationAction">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CallOperationAction"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_4TA78OVOEeG84fBOY39c0g" alias="Dependency">
+    <elementImport xmi:id="_4TA78OVOEeG84fBOY39c0g" alias="Dependency">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_jodjAOVPEeG84fBOY39c0g" alias="TimeEvent">
+    <elementImport xmi:id="_jodjAOVPEeG84fBOY39c0g" alias="TimeEvent">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeEvent"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_jodjAeVPEeG84fBOY39c0g" alias="Message">
+    <elementImport xmi:id="_jodjAeVPEeG84fBOY39c0g" alias="Message">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Message"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_jodjAuVPEeG84fBOY39c0g" alias="AcceptEventAction">
+    <elementImport xmi:id="_jodjAuVPEeG84fBOY39c0g" alias="AcceptEventAction">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#AcceptEventAction"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_joeKEOVPEeG84fBOY39c0g" alias="ReadStructuralFeatureAction">
+    <elementImport xmi:id="_joeKEOVPEeG84fBOY39c0g" alias="ReadStructuralFeatureAction">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ReadStructuralFeatureAction"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_PPQYwOVQEeG84fBOY39c0g" alias="WriteStructuralFeatureAction">
+    <elementImport xmi:id="_PPQYwOVQEeG84fBOY39c0g" alias="WriteStructuralFeatureAction">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#WriteStructuralFeatureAction"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_hEVj8OVQEeG84fBOY39c0g" alias="Classifier">
+    <elementImport xmi:id="_hEVj8OVQEeG84fBOY39c0g" alias="Classifier">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_uhJuYOVQEeG84fBOY39c0g" alias="Namespace">
+    <elementImport xmi:id="_uhJuYOVQEeG84fBOY39c0g" alias="Namespace">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Namespace"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_vl2soOVQEeG84fBOY39c0g" alias="ValueSpecification">
+    <elementImport xmi:id="_vl2soOVQEeG84fBOY39c0g" alias="ValueSpecification">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_Pi1moOVREeG84fBOY39c0g" alias="LiteralSpecification">
+    <elementImport xmi:id="_Pi1moOVREeG84fBOY39c0g" alias="LiteralSpecification">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#LiteralSpecification"/>
     </elementImport>
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_Gr4ssOVUEeG84fBOY39c0g" alias="OccurrenceSpecification">
+    <elementImport xmi:id="_Gr4ssOVUEeG84fBOY39c0g" alias="OccurrenceSpecification">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#OccurrenceSpecification"/>
     </elementImport>
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_packageImport.0">
+    <packageImport xmi:id="_packageImport.0">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
     </packageImport>
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_im1YIBwcEeKHYbG3BYHXnQ">
+    <packageImport xmi:id="_im1YIBwcEeKHYbG3BYHXnQ">
       <importedPackage xmi:type="uml:Model" href="utptypes.uml#_nGjLwOVVEeG84fBOY39c0g"/>
     </packageImport>
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_xAHKQFG8EeOFcOyNGrgpSA">
+    <packageImport xmi:id="_xAHKQFG8EeOFcOyNGrgpSA">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
     </packageImport>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_JICqQOVNEeG84fBOY39c0g" name="TestComponent">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Md82IOVNEeG84fBOY39c0g" name="base_Class" association="_Md82IeVNEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_Md82IOVNEeG84fBOY39c0g" name="base_Class" association="_Md82IeVNEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_mZ_gsBwcEeKHYbG3BYHXnQ" name="zone" visibility="public">
+      <ownedAttribute xmi:id="_mZ_gsBwcEeKHYbG3BYHXnQ" name="zone" visibility="public">
         <type xmi:type="uml:PrimitiveType" href="utptypes.uml#_uz-KcOVVEeG84fBOY39c0g"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p_Y6EBwcEeKHYbG3BYHXnQ"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p_ZhIBwcEeKHYbG3BYHXnQ" value="1"/>
@@ -90,22 +90,22 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_KHackOVNEeG84fBOY39c0g" name="SUT">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_MLf0MOVNEeG84fBOY39c0g" name="base_Property" association="_MLf0MeVNEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_MLf0MOVNEeG84fBOY39c0g" name="base_Property" association="_MLf0MeVNEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_Kvd7EOVNEeG84fBOY39c0g" name="TestContext">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_LvplsOVNEeG84fBOY39c0g" name="base_BehavioredClassifier" association="_LvqMwOVNEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_LvplsOVNEeG84fBOY39c0g" name="base_BehavioredClassifier" association="_LvqMwOVNEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioredClassifier"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_L9w6MOVNEeG84fBOY39c0g" name="base_StructuredClassifier" association="_L9w6MeVNEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_L9w6MOVNEeG84fBOY39c0g" name="base_StructuredClassifier" association="_L9w6MeVNEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredClassifier"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_pGzhkOV8EeGeWM1a3nx0Ow" name="testLevel">
+      <ownedAttribute xmi:id="_pGzhkOV8EeGeWM1a3nx0Ow" name="testLevel">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rX7PoOV8EeGeWM1a3nx0Ow"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_sZuq4OV8EeGeWM1a3nx0Ow" name="arbiter">
+      <ownedAttribute xmi:id="_sZuq4OV8EeGeWM1a3nx0Ow" name="arbiter">
         <type xmi:type="uml:Interface" href="utptypes.uml#_rCbLcOVVEeG84fBOY39c0g"/>
       </ownedAttribute>
     </packagedElement>
@@ -122,15 +122,15 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Md82IuVNEeG84fBOY39c0g" name="extension_TestComponent" type="_JICqQOVNEeG84fBOY39c0g" aggregation="composite" association="_Md82IeVNEeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_Jt-zcOVOEeG84fBOY39c0g" name="DetermAlt">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Mq9h8OVOEeG84fBOY39c0g" name="base_CombinedFragment" association="_Mq-JAOVOEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_Mq9h8OVOEeG84fBOY39c0g" name="base_CombinedFragment" association="_Mq-JAOVOEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CombinedFragment"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_LbOYYOVOEeG84fBOY39c0g" name="FinishAction">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_M-EEIOVOEeG84fBOY39c0g" name="base_OpaqueAction" association="_M-EEIeVOEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_M-EEIOVOEeG84fBOY39c0g" name="base_OpaqueAction" association="_M-EEIeVOEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#OpaqueAction"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_NNcj8OVOEeG84fBOY39c0g" name="base_InvocationAction" association="_NNdLAOVOEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_NNcj8OVOEeG84fBOY39c0g" name="base_InvocationAction" association="_NNdLAOVOEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
       </ownedAttribute>
     </packagedElement>
@@ -144,7 +144,7 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_NNdLAeVOEeG84fBOY39c0g" name="extension_FinishAction" type="_LbOYYOVOEeG84fBOY39c0g" aggregation="composite" association="_NNdLAOVOEeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_OPIDYOVOEeG84fBOY39c0g" name="LogAction">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_PCoj8OVOEeG84fBOY39c0g" name="base_SendObjectAction" association="_PCoj8eVOEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_PCoj8OVOEeG84fBOY39c0g" name="base_SendObjectAction" association="_PCoj8eVOEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#SendObjectAction"/>
       </ownedAttribute>
     </packagedElement>
@@ -152,21 +152,21 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_PCoj8uVOEeG84fBOY39c0g" name="extension_LogAction" type="_OPIDYOVOEeG84fBOY39c0g" aggregation="composite" association="_PCoj8eVOEeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_PsR94OVOEeG84fBOY39c0g" name="TestCase">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_ZvGtsOVOEeG84fBOY39c0g">
+      <ownedComment xmi:id="_ZvGtsOVOEeG84fBOY39c0g">
         <body>[09.08.2012 09:16:54] Pekka Aho: my choice would be: Scandic Palace Tallinn, 3 VABADUSE VALJAK SQUARE, TALLINN, EE10141</body>
       </ownedComment>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Qf2v4OVOEeG84fBOY39c0g" name="base_Operation" association="_Qf3W8OVOEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_Qf2v4OVOEeG84fBOY39c0g" name="base_Operation" association="_Qf3W8OVOEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_QyU_8OVOEeG84fBOY39c0g" name="base_Behavior" association="_QyU_8eVOEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_QyU_8OVOEeG84fBOY39c0g" name="base_Behavior" association="_QyU_8eVOEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_cClMMOVOEeG84fBOY39c0g" name="priority">
+      <ownedAttribute xmi:id="_cClMMOVOEeG84fBOY39c0g" name="priority">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cClMMeVOEeG84fBOY39c0g"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cClMMuVOEeG84fBOY39c0g" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_cRiOMOVOEeG84fBOY39c0g" name="testType">
+      <ownedAttribute xmi:id="_cRiOMOVOEeG84fBOY39c0g" name="testType">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cRiOMeVOEeG84fBOY39c0g"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cRiOMuVOEeG84fBOY39c0g" value="*"/>
@@ -179,10 +179,10 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_QyU_8uVOEeG84fBOY39c0g" name="extension_TestCase" type="_PsR94OVOEeG84fBOY39c0g" aggregation="composite" association="_QyU_8eVOEeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_SCu34OVOEeG84fBOY39c0g" name="ValidationAction">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_TWIZcOVOEeG84fBOY39c0g" name="base_CallOperationAction" association="_TWIZceVOEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_TWIZcOVOEeG84fBOY39c0g" name="base_CallOperationAction" association="_TWIZceVOEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CallOperationAction"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_UBse8OVOEeG84fBOY39c0g" name="reason">
+      <ownedAttribute xmi:id="_UBse8OVOEeG84fBOY39c0g" name="reason">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YRansOVOEeG84fBOY39c0g"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YRbOwOVOEeG84fBOY39c0g" value="*"/>
@@ -192,16 +192,16 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_TWIZcuVOEeG84fBOY39c0g" name="extension_ValidationAction" type="_SCu34OVOEeG84fBOY39c0g" aggregation="composite" association="_TWIZceVOEeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_p6IK0OVOEeG84fBOY39c0g" name="Default">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_6ymj0OVOEeG84fBOY39c0g" name="base_Behavior" association="_6ymj0eVOEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_6ymj0OVOEeG84fBOY39c0g" name="base_Behavior" association="_6ymj0eVOEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_qtUiUOVOEeG84fBOY39c0g" name="DefaultApplication">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_sZRt0OVOEeG84fBOY39c0g" name="repetition">
+      <ownedAttribute xmi:id="_sZRt0OVOEeG84fBOY39c0g" name="repetition">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_VdvJsOVPEeG84fBOY39c0g" value="0"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_7Ke4UOVOEeG84fBOY39c0g" name="base_Dependency" association="_7Ke4UeVOEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_7Ke4UOVOEeG84fBOY39c0g" name="base_Dependency" association="_7Ke4UeVOEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
       </ownedAttribute>
     </packagedElement>
@@ -212,37 +212,37 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_7Ke4UuVOEeG84fBOY39c0g" name="extension_DefaultApplication" type="_qtUiUOVOEeG84fBOY39c0g" aggregation="composite" association="_7Ke4UeVOEeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_ozrDoOVPEeG84fBOY39c0g" name="TimeOut">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_AYrmEOVQEeG84fBOY39c0g" name="base_TimeEvent" association="_AYsNIOVQEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_AYrmEOVQEeG84fBOY39c0g" name="base_TimeEvent" association="_AYsNIOVQEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeEvent"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_qwfVoOVPEeG84fBOY39c0g" name="TimeOutMessage">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ArJPEOVQEeG84fBOY39c0g" name="base_Message" association="_ArJPEeVQEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_ArJPEOVQEeG84fBOY39c0g" name="base_Message" association="_ArJPEeVQEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Message"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_tC5dIOVPEeG84fBOY39c0g" name="TimeOutAction">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_A9dHEOVQEeG84fBOY39c0g" name="base_AcceptEventAction" association="_A9duIOVQEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_A9dHEOVQEeG84fBOY39c0g" name="base_AcceptEventAction" association="_A9duIOVQEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#AcceptEventAction"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_yfQYIOVPEeG84fBOY39c0g" name="ReadTimerAction">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_AFPFoOVQEeG84fBOY39c0g" name="base_CallOperationAction" association="_AFPFoeVQEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_AFPFoOVQEeG84fBOY39c0g" name="base_CallOperationAction" association="_AFPFoeVQEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CallOperationAction"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_21QvEOVPEeG84fBOY39c0g" name="StartTimerAction">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="__z1MkOVPEeG84fBOY39c0g" name="base_CallOperationAction" association="__z1zoOVPEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="__z1MkOVPEeG84fBOY39c0g" name="base_CallOperationAction" association="__z1zoOVPEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CallOperationAction"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_4zc6EOVPEeG84fBOY39c0g" name="StopTimerAction">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="__g1_IOVPEeG84fBOY39c0g" name="base_CallOperationAction" association="__g1_IeVPEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="__g1_IOVPEeG84fBOY39c0g" name="base_CallOperationAction" association="__g1_IeVPEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CallOperationAction"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_630lkOVPEeG84fBOY39c0g" name="TimerRunningAction">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="__LBgIOVPEeG84fBOY39c0g" name="base_ReadStructuralFeatureAction" association="__LBgIeVPEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="__LBgIOVPEeG84fBOY39c0g" name="base_ReadStructuralFeatureAction" association="__LBgIeVPEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ReadStructuralFeatureAction"/>
       </ownedAttribute>
     </packagedElement>
@@ -268,12 +268,12 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_A9duIeVQEeG84fBOY39c0g" name="extension_TimeOutAction" type="_tC5dIOVPEeG84fBOY39c0g" aggregation="composite" association="_A9duIOVQEeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_QxBGcOVQEeG84fBOY39c0g" name="GetTimezoneAction">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_VKjSgOVQEeG84fBOY39c0g" name="base_ReadStructuralFeatureAction" association="_VKj5kOVQEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_VKjSgOVQEeG84fBOY39c0g" name="base_ReadStructuralFeatureAction" association="_VKj5kOVQEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ReadStructuralFeatureAction"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_SqzSkOVQEeG84fBOY39c0g" name="SetTimezoneAction">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_U1zxkOVQEeG84fBOY39c0g" name="base_WriteStructuralFeatureAction" association="_U1zxkeVQEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_U1zxkOVQEeG84fBOY39c0g" name="base_WriteStructuralFeatureAction" association="_U1zxkeVQEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#WriteStructuralFeatureAction"/>
       </ownedAttribute>
     </packagedElement>
@@ -284,15 +284,15 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_VKj5keVQEeG84fBOY39c0g" name="extension_GetTimezoneAction" type="_QxBGcOVQEeG84fBOY39c0g" aggregation="composite" association="_VKj5kOVQEeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_japUAOVQEeG84fBOY39c0g" name="DataPartition">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_nOyUAOVQEeG84fBOY39c0g" name="base_Classifier" association="_nOyUAeVQEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_nOyUAOVQEeG84fBOY39c0g" name="base_Classifier" association="_nOyUAeVQEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_l19f4OVQEeG84fBOY39c0g" name="DataPool">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_m7GjAOVQEeG84fBOY39c0g" name="base_Classifier" association="_m7GjAeVQEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_m7GjAOVQEeG84fBOY39c0g" name="base_Classifier" association="_m7GjAeVQEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_nmXGgOVQEeG84fBOY39c0g" name="base_Property" association="_nmXGgeVQEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_nmXGgOVQEeG84fBOY39c0g" name="base_Property" association="_nmXGgeVQEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
       </ownedAttribute>
     </packagedElement>
@@ -306,7 +306,7 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_nmXGguVQEeG84fBOY39c0g" name="extension_DataPool" type="_l19f4OVQEeG84fBOY39c0g" aggregation="composite" association="_nmXGgeVQEeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_oFUTYOVQEeG84fBOY39c0g" name="DataSelector">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_pe1EAOVQEeG84fBOY39c0g" name="base_Operation" association="_pe1EAeVQEeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_pe1EAOVQEeG84fBOY39c0g" name="base_Operation" association="_pe1EAeVQEeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
       </ownedAttribute>
     </packagedElement>
@@ -314,16 +314,16 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_pe1EAuVQEeG84fBOY39c0g" name="extension_DataSelector" type="_oFUTYOVQEeG84fBOY39c0g" aggregation="composite" association="_pe1EAeVQEeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_zcQWcOVQEeG84fBOY39c0g" name="CodingRule">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_1zUUcOVQEeG84fBOY39c0g" name="coding">
+      <ownedAttribute xmi:id="_1zUUcOVQEeG84fBOY39c0g" name="coding">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_J5Fv4OVREeG84fBOY39c0g" name="base_Namespace" association="_J5Fv4eVREeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_J5Fv4OVREeG84fBOY39c0g" name="base_Namespace" association="_J5Fv4eVREeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Namespace"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_KHbt4OVREeG84fBOY39c0g" name="base_ValueSpecification" association="_KHbt4eVREeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_KHbt4OVREeG84fBOY39c0g" name="base_ValueSpecification" association="_KHbt4eVREeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_KXKL8OVREeG84fBOY39c0g" name="base_Property" association="_KXKL8eVREeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_KXKL8OVREeG84fBOY39c0g" name="base_Property" association="_KXKL8eVREeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
       </ownedAttribute>
     </packagedElement>
@@ -337,7 +337,7 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_KXKL8uVREeG84fBOY39c0g" name="extension_CodingRule" type="_zcQWcOVQEeG84fBOY39c0g" aggregation="composite" association="_KXKL8eVREeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_MgZJUOVREeG84fBOY39c0g" name="Modification">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Ngab4OVREeG84fBOY39c0g" name="base_Dependency" association="_NgbC8OVREeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_Ngab4OVREeG84fBOY39c0g" name="base_Dependency" association="_NgbC8OVREeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
       </ownedAttribute>
     </packagedElement>
@@ -345,12 +345,12 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_NgbC8eVREeG84fBOY39c0g" name="extension_Modification" type="_MgZJUOVREeG84fBOY39c0g" aggregation="composite" association="_NgbC8OVREeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_QdnM0OVREeG84fBOY39c0g" name="LiteralAny">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_SyeLYOVREeG84fBOY39c0g" name="base_LiteralSpecification" association="_SyeLYeVREeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_SyeLYOVREeG84fBOY39c0g" name="base_LiteralSpecification" association="_SyeLYeVREeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#LiteralSpecification"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_R5FFQOVREeG84fBOY39c0g" name="LiteralAnyOrNull">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_TFspYOVREeG84fBOY39c0g" name="base_LiteralSpecification" association="_TFspYeVREeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_TFspYOVREeG84fBOY39c0g" name="base_LiteralSpecification" association="_TFspYeVREeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#LiteralSpecification"/>
       </ownedAttribute>
     </packagedElement>
@@ -361,16 +361,16 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_TFspYuVREeG84fBOY39c0g" name="extension_LiteralAnyOrNull" type="_R5FFQOVREeG84fBOY39c0g" aggregation="composite" association="_TFspYeVREeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_fmnzUOVREeG84fBOY39c0g" name="TestObjectiveSpecification">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_hDZTUOVREeG84fBOY39c0g" name="base_Class" association="_hDZTUeVREeG84fBOY39c0g">
+      <ownedAttribute xmi:id="_hDZTUOVREeG84fBOY39c0g" name="base_Class" association="_hDZTUeVREeG84fBOY39c0g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_iZhYwOVREeG84fBOY39c0g" name="id">
+      <ownedAttribute xmi:id="_iZhYwOVREeG84fBOY39c0g" name="id">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_nP9jQOVREeG84fBOY39c0g" name="specification">
+      <ownedAttribute xmi:id="_nP9jQOVREeG84fBOY39c0g" name="specification">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_sknTwOVREeG84fBOY39c0g" name="priority" visibility="public">
+      <ownedAttribute xmi:id="_sknTwOVREeG84fBOY39c0g" name="priority" visibility="public">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tHvO8OVREeG84fBOY39c0g"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tHv2AOVREeG84fBOY39c0g" value="1"/>
@@ -378,7 +378,7 @@
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_041MsOVREeG84fBOY39c0g" name="references">
+      <ownedAttribute xmi:id="_041MsOVREeG84fBOY39c0g" name="references">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EHLXoOV9EeGeWM1a3nx0Ow"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2xtZ4OVREeG84fBOY39c0g" value="*"/>
@@ -388,20 +388,20 @@
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_hDZTUuVREeG84fBOY39c0g" name="extension_TestObjectiveSpecification" type="_fmnzUOVREeG84fBOY39c0g" aggregation="composite" association="_hDZTUeVREeG84fBOY39c0g"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_HpKNQOVUEeG84fBOY39c0g" name="TestLog">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_NMTswOVUEeG84fBOY39c0g" name="tester">
+      <ownedAttribute xmi:id="_NMTswOVUEeG84fBOY39c0g" name="tester">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dfF-wOVUEeG84fBOY39c0g"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cenZMOVUEeG84fBOY39c0g" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_OYEVQOVUEeG84fBOY39c0g" name="executionAt">
+      <ownedAttribute xmi:id="_OYEVQOVUEeG84fBOY39c0g" name="executionAt">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UTP/utptypes.uml#_skeNAOVVEeG84fBOY39c0g"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eINNMOVUEeG84fBOY39c0g"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_QKbqwOVUEeG84fBOY39c0g" name="duration">
+      <ownedAttribute xmi:id="_QKbqwOVUEeG84fBOY39c0g" name="duration">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UTP/utptypes.uml#_tnmd8OVVEeG84fBOY39c0g"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_euH9sOVUEeG84fBOY39c0g"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_RgpPwOVUEeG84fBOY39c0g" name="verdict" visibility="public">
+      <ownedAttribute xmi:id="_RgpPwOVUEeG84fBOY39c0g" name="verdict" visibility="public">
         <type xmi:type="uml:Enumeration" href="pathmap://UTP/utptypes.uml#_ntpoAOVVEeG84fBOY39c0g"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R0AQoOVUEeG84fBOY39c0g" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R0A3sOVUEeG84fBOY39c0g" value="1"/>
@@ -410,7 +410,7 @@
           <instance xmi:type="uml:EnumerationLiteral" href="pathmap://UTP/utptypes.uml#_w-6YAOVVEeG84fBOY39c0g"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_SyDNQOVUEeG84fBOY39c0g" name="verdictReason">
+      <ownedAttribute xmi:id="_SyDNQOVUEeG84fBOY39c0g" name="verdictReason">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VGQEgOVUEeG84fBOY39c0g"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VGQEgeVUEeG84fBOY39c0g" value="*"/>
@@ -418,23 +418,23 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_IX6wsOVUEeG84fBOY39c0g" name="TestLogApplication"/>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_KXuFQOVUEeG84fBOY39c0g" name="TestLogEntry">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_LSxYQOVUEeG84fBOY39c0g" name="timestamp">
+      <ownedAttribute xmi:id="_LSxYQOVUEeG84fBOY39c0g" name="timestamp">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UTP/utptypes.uml#_skeNAOVVEeG84fBOY39c0g"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_QGLjcOWBEeG4wJ01XcOLOg" name="TestObjective">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ToKccuWBEeG4wJ01XcOLOg" name="base_Dependency" association="_ToKccOWBEeG4wJ01XcOLOg">
+      <ownedAttribute xmi:id="_ToKccuWBEeG4wJ01XcOLOg" name="base_Dependency" association="_ToKccOWBEeG4wJ01XcOLOg">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Extension" xmi:id="_ToKccOWBEeG4wJ01XcOLOg" name="Dependency_TestObjective" memberEnd="_ToKcceWBEeG4wJ01XcOLOg _ToKccuWBEeG4wJ01XcOLOg">
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ToKcceWBEeG4wJ01XcOLOg" name="extension_TestObjective" type="_QGLjcOWBEeG4wJ01XcOLOg" aggregation="composite" association="_ToKccOWBEeG4wJ01XcOLOg"/>
     </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_xBoD4OVMEeG84fBOY39c0g">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xB0RIOVMEeG84fBOY39c0g" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:id="_xBoD4OVMEeG84fBOY39c0g">
+      <eAnnotations xmi:id="_xB0RIOVMEeG84fBOY39c0g" 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 xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
     </profileApplication>
   </uml:Profile>
   <Ecore:EPackage xmi:id="_yuCiYOVMEeG84fBOY39c0g" base_Package="_iCl4wOVMEeG84fBOY39c0g" packageName="utp" nsPrefix="utp" nsURI="http://www.omg.org/spec/UTP/20120801/utp.xmi" basePackage="org.eclipse.upr" prefix="UTP"/>
diff --git a/bundles/org.eclipse.upr.utp/model/utptypes.uml b/bundles/org.eclipse.upr.utp/model/utptypes.uml
index ed8046c..86532c3 100644
--- a/bundles/org.eclipse.upr.utp/model/utptypes.uml
+++ b/bundles/org.eclipse.upr.utp/model/utptypes.uml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" 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/4.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="_nGjLwOVVEeG84fBOY39c0g" name="utptypes">
+<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="_nGjLwOVVEeG84fBOY39c0g" name="utptypes" URI="http://www.omg.org/spec/UTP/20120801/utptypes.xmi">
     <packageImport xmi:id="_nGjLweVVEeG84fBOY39c0g">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
     </packageImport>
diff --git a/bundles/org.eclipse.upr.utp/plugin.xml b/bundles/org.eclipse.upr.utp/plugin.xml
index 7dd282f..b41a632 100644
--- a/bundles/org.eclipse.upr.utp/plugin.xml
+++ b/bundles/org.eclipse.upr.utp/plugin.xml
@@ -44,4 +44,21 @@
             type="utplib"
             class="org.eclipse.upr.utptypes.util.UTPLibResourceFactoryImpl"/>
    </extension>
+   
+      <extension
+         point="org.eclipse.uml2.uml.generated_package">
+      <profile
+            location="pathmap://UTP/utp.profile.uml#_iCl4wOVMEeG84fBOY39c0g"
+            uri="http://www.omg.org/spec/UTP/20120801/utp.xmi">
+      </profile>
+   </extension>
+   
+      <extension
+         point="org.eclipse.uml2.uml.generated_package">
+      <profile
+            location="pathmap://UTP/utptypes.uml#_nGjLwOVVEeG84fBOY39c0g"
+            uri="http://www.omg.org/spec/UTP/20120801/utptypes.xmi">
+      </profile>
+   </extension>
+   
 </plugin>