diff --git a/build/org.eclipse.upr.bpmn.mover/transforms/SimplePackageMerge.qvto b/build/org.eclipse.upr.bpmn.mover/transforms/SimplePackageMerge.qvto
index 57c0a89..dd4d5b5 100644
--- a/build/org.eclipse.upr.bpmn.mover/transforms/SimplePackageMerge.qvto
+++ b/build/org.eclipse.upr.bpmn.mover/transforms/SimplePackageMerge.qvto
@@ -8,7 +8,7 @@
  * Contributors:
  * Max Bureck
  */
-modeltype UML "strict" uses uml('http://www.eclipse.org/uml2/5.0.0/UML');
+modeltype UML "strict" uses uml('http://www.eclipse.org/uml2/4.0.0/UML');
 modeltype ECORE "strict" uses ecore('http://www.eclipse.org/emf/2002/Ecore');
 	
 
diff --git a/bundles/org.eclipse.upr.bpmn/model/BPMNProfile_merge.uml b/bundles/org.eclipse.upr.bpmn/model/BPMNProfile_merge.uml
index 4f4f7f7..5188571 100644
--- a/bundles/org.eclipse.upr.bpmn/model/BPMNProfile_merge.uml
+++ b/bundles/org.eclipse.upr.bpmn/model/BPMNProfile_merge.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/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="_wrG1oHwkEeOWLfCz6n-rOA" name="BPMNProfile" URI="http://www.omg.org/spec/BPMNProfile/20121112/">
     <packageMerge xmi:id="_AdTXgHwvEeOkPrJs-TUiLQ">
       <mergedPackage href="BPMNProfile_modified.uml#BPMNProfile-Collaboration-Conversation"/>
diff --git a/bundles/org.eclipse.upr.bpmn/model/BPMNProfile_modified.uml b/bundles/org.eclipse.upr.bpmn/model/BPMNProfile_modified.uml
index b9e7d35..f9c155b 100644
--- a/bundles/org.eclipse.upr.bpmn/model/BPMNProfile_modified.uml
+++ b/bundles/org.eclipse.upr.bpmn/model/BPMNProfile_modified.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:mofext="http://www.omg.org/spec/MOF/20110701" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:mofext="http://www.omg.org/spec/MOF/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <uml:Profile xmi:id="BPMNProfile" name="BPMNProfile" URI="http://www.omg.org/spec/BPMNProfile/20121112/" metamodelReference="BPMNProfile-packageImport">
     <packageImport xmi:id="BPMNProfile-packageImport">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
diff --git a/bundles/org.eclipse.upr.bpmn/model/bpmn.profile.uml b/bundles/org.eclipse.upr.bpmn/model/bpmn.profile.uml
index 0a78675..0e3563f 100644
--- a/bundles/org.eclipse.upr.bpmn/model/bpmn.profile.uml
+++ b/bundles/org.eclipse.upr.bpmn/model/bpmn.profile.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/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="_wrG1oHwkEeOWLfCz6n-rOA" name="BPMNProfile" URI="http://www.omg.org/spec/BPMNProfile/20121112/">
     <eAnnotations xmi:id="_NJ-O0EyuEeS414m9-gV02Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
       <eAnnotations xmi:id="_N0OswEyuEeS414m9-gV02Q" source="BPMNProfile::CoreStructure::Common::Gateways" references="BPMNProfile-CoreStructure-Common-Gateways-packagedElement-21 BPMNProfile-CoreStructure-Common-Gateways-packagedElement-4 BPMNProfile-CoreStructure-Common-Gateways-packagedElement-15 BPMNProfile-CoreStructure-Common-Gateways-packagedElement-22 BPMNProfile-CoreStructure-Common-Gateways-packagedElement-11 BPMNProfile-CoreStructure-Common-Gateways-packagedElement-19 BPMNProfile-CoreStructure-Common-Gateways-packagedElement-17 BPMNProfile-CoreStructure-Common-Gateways-InclusiveGateway BPMNProfile-CoreStructure-Common-Gateways-Gateway BPMNProfile-CoreStructure-Common-Gateways-packagedElement-20 BPMNProfile-CoreStructure-Common-Gateways-packagedElement-16 BPMNProfile-CoreStructure-Common-Gateways-EventBasedGateway BPMNProfile-CoreStructure-Common-Gateways-GatewayDirection BPMNProfile-CoreStructure-Common-Gateways-packagedElement-14 BPMNProfile-CoreStructure-Common-Gateways-NonExclusiveGateway BPMNProfile-CoreStructure-Common-Gateways-ParallelGateway BPMNProfile-CoreStructure-Common-Gateways-ComplexGateway BPMNProfile-CoreStructure-Common-Gateways-EventBasedGatewayType BPMNProfile-CoreStructure-Common-Gateways-ExclusiveGateway BPMNProfile-CoreStructure-Common-Gateways-packagedElement-7 BPMNProfile-CoreStructure-Common-Gateways-packagedElement-6 BPMNProfile-CoreStructure-Common-Gateways-packagedElement-12"/>
diff --git a/bundles/org.eclipse.upr.utp/model/utp.profile.uml b/bundles/org.eclipse.upr.utp/model/utp.profile.uml
index 79f5724..f01dac0 100644
--- a/bundles/org.eclipse.upr.utp/model/utp.profile.uml
+++ b/bundles/org.eclipse.upr.utp/model/utp.profile.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/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" 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"/>
diff --git a/bundles/org.eclipse.upr.utp/model/utptypes.uml b/bundles/org.eclipse.upr.utp/model/utptypes.uml
index 86532c3..2ef146d 100644
--- a/bundles/org.eclipse.upr.utp/model/utptypes.uml
+++ b/bundles/org.eclipse.upr.utp/model/utptypes.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/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" 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"/>