88 files changed, 161 insertions, 160 deletions
diff --git a/doc/org.eclipse.qvtd.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.qvtd.doc/META-INF/MANIFEST.MF
index 56b5196e3..32042cfcc 100644
--- a/doc/org.eclipse.qvtd.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.qvtd.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.qvtd.doc;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %Provider.name
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.5.0,4.0.0)"
diff --git a/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/META-INF/MANIFEST.MF b/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/META-INF/MANIFEST.MF
index e1659414e..c3f2ef625 100644
--- a/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: QVTrelation ModelMorf Examples (Incubation)
 Bundle-SymbolicName: org.eclipse.qvtd.examples.qvtrelation.modelmorf
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Export-Package: org.eclipse.qvtd.examples.qvtrelation.modelmorf
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/examples/org.eclipse.qvtd.examples.qvtrelation.reltocore/META-INF/MANIFEST.MF b/examples/org.eclipse.qvtd.examples.qvtrelation.reltocore/META-INF/MANIFEST.MF
index 01c4c1c34..c3d7d6bcc 100644
--- a/examples/org.eclipse.qvtd.examples.qvtrelation.reltocore/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.qvtd.examples.qvtrelation.reltocore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: QVTrelation RelToCore Example (Incubation)
 Bundle-SymbolicName: org.eclipse.qvtd.examples.qvtrelation.reltocore
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Export-Package: org.eclipse.qvtd.examples.qvtrelation.reltocore
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/examples/org.eclipse.qvtd.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.qvtd.examples/META-INF/MANIFEST.MF
index 081345939..afbc0d1db 100644
--- a/examples/org.eclipse.qvtd.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.qvtd.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.examples;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.qvtd.examples.QVTDeclarativeExamplesPlugin
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
diff --git a/features/org.eclipse.qvtd.doc-feature/feature.xml b/features/org.eclipse.qvtd.doc-feature/feature.xml
index c8111a74f..10844631b 100644
--- a/features/org.eclipse.qvtd.doc-feature/feature.xml
+++ b/features/org.eclipse.qvtd.doc-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.qvtd.doc"
       label="%featureName"
-      version="0.12.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.qvtd.examples-feature/feature.xml b/features/org.eclipse.qvtd.examples-feature/feature.xml
index d28bc0432..81934ab1e 100644
--- a/features/org.eclipse.qvtd.examples-feature/feature.xml
+++ b/features/org.eclipse.qvtd.examples-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.qvtd.examples"
       label="%featureName"
-      version="0.12.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.qvtd.master-feature/feature.xml b/features/org.eclipse.qvtd.master-feature/feature.xml
index f30e0a94b..c551accb7 100644
--- a/features/org.eclipse.qvtd.master-feature/feature.xml
+++ b/features/org.eclipse.qvtd.master-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.qvtd.master"
       label="%featureName"
-      version="0.12.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.qvtd.pivot.qvtbase"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.qvtd.releng.build-feature/feature.xml b/features/org.eclipse.qvtd.releng.build-feature/feature.xml
index 3d1a86892..718848744 100644
--- a/features/org.eclipse.qvtd.releng.build-feature/feature.xml
+++ b/features/org.eclipse.qvtd.releng.build-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.qvtd.releng.build"
       label="QVTd Build Site (Incubation)"
-      version="0.12.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.qvtd.tests-feature/feature.xml b/features/org.eclipse.qvtd.tests-feature/feature.xml
index d9e80312f..97bb3c3dd 100644
--- a/features/org.eclipse.qvtd.tests-feature/feature.xml
+++ b/features/org.eclipse.qvtd.tests-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.qvtd.tests"
       label="%featureName"
-      version="0.12.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.qvtd.all.tests"
       license-feature="org.eclipse.license"
diff --git a/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF
index a5a170b37..747fffd9a 100644
--- a/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvt;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.qvtd.build.etl/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.build.etl/META-INF/MANIFEST.MF
index 7372b9c6c..4c7612933 100644
--- a/plugins/org.eclipse.qvtd.build.etl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.build.etl/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.qvtd.build.etl.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.ocl.examples.xtext.base,
+ org.eclipse.ocl.xtext.base,
  org.eclipse.qvtd.pivot.qvtbase,
  org.eclipse.qvtd.pivot.qvtimperative,
  org.eclipse.qvtd.xtext.qvtbase.tests,
diff --git a/plugins/org.eclipse.qvtd.build.etl/src/org/eclipse/qvtd/build/etl/mtc/QvtuToQvtiMtc.xml b/plugins/org.eclipse.qvtd.build.etl/src/org/eclipse/qvtd/build/etl/mtc/QvtuToQvtiMtc.xml
index d30c14f81..5296460a0 100644
--- a/plugins/org.eclipse.qvtd.build.etl/src/org/eclipse/qvtd/build/etl/mtc/QvtuToQvtiMtc.xml
+++ b/plugins/org.eclipse.qvtd.build.etl/src/org/eclipse/qvtd/build/etl/mtc/QvtuToQvtiMtc.xml
@@ -46,14 +46,14 @@
             name = "QVTc"
             aliases ="QVT"
             modelFile = "${qvtcas}" 
-            metamodelUri = "http://www.eclipse.org/qvt/0.9/QVTcore"
+            metamodelUri = "http://www.eclipse.org/qvt/2015/QVTcore"
             read="true" store="false"/>
         <!-- QVTu -->
         <epsilon.emf.loadModel
             name = "QVTu"
             aliases ="QVT"
             modelFile = "${qvtuas}" 
-            metamodelUri = "http://www.eclipse.org/qvt/0.9/QVTcore"
+            metamodelUri = "http://www.eclipse.org/qvt/2015/QVTcore"
             read="false" store="true"/>
 	    <epsilon.flock originalmodel="QVTc" migratedmodel="QVTu" uri="${QVTcToQVTu}">
 	        <model ref="QVTc"/>
@@ -71,14 +71,14 @@
             name = "QVTu"
             aliases ="QVT"
             modelFile = "${qvtuas}" 
-            metamodelUri = "http://www.eclipse.org/qvt/0.9/QVTcore"
+            metamodelUri = "http://www.eclipse.org/qvt/2015/QVTcore"
             read="true" store="false"/>
 		<!-- QVTm Flatten  -->
         <epsilon.emf.loadModel
             name = "QVTmF"
             aliases ="QVT"
             modelFile = "${qvtmas}" 
-            metamodelUri = "http://www.eclipse.org/qvt/0.9/QVTcore"
+            metamodelUri = "http://www.eclipse.org/qvt/2015/QVTcore"
             read="false" store="true"/>
         <epsilon.flock originalmodel="QVTu" migratedmodel="QVTmF" uri="${QVTuToQVTm}">
             <model ref="QVTu"/>
@@ -96,14 +96,14 @@
             name = "QVTmF"
             aliases ="QVT"
             modelFile = "${qvtmas}" 
-            metamodelUri = "http://www.eclipse.org/qvt/0.9/QVTcore"
+            metamodelUri = "http://www.eclipse.org/qvt/2015/QVTcore"
             read="true" store="false"/>
 		<!-- QVTm Partition  -->
         <epsilon.emf.loadModel
             name = "QVTmP"
             aliases ="QVT"
             modelFile = "${qvtmpartitionas}" 
-            metamodelUri = "http://www.eclipse.org/qvt/0.9/QVTcore"
+            metamodelUri = "http://www.eclipse.org/qvt/2015/QVTcore"
             read="false" store="true"/>
 		<epsilon.etl uri="${QVTuToQVTmPartitionLM}">
             <model ref="QVTmF"/>
diff --git a/plugins/org.eclipse.qvtd.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.codegen/META-INF/MANIFEST.MF
index c7d5dd193..b3fe66673 100644
--- a/plugins/org.eclipse.qvtd.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.codegen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.codegen;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
index 7d0b45d99..7a21c7461 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.debug.ui;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF
index 6efc5a590..a0ada4710 100644
--- a/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.debug;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtbase/META-INF/MANIFEST.MF
index 122adc552..60e45c9e9 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.pivot.qvtbase;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java
index 557b1317d..9960adc43 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java
@@ -46,7 +46,7 @@ public interface QVTbasePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/qvt/0.9/QVTbase";
+	String eNS_URI = "http://www.eclipse.org/qvt/2015/QVTbase";
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore
index 9f69bd5b4..ba66c22e1 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore
@@ -1,6 +1,6 @@
 <?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="qvtbase" nsURI="http://www.eclipse.org/qvt/0.9/QVTbase" nsPrefix="qvtb">
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="qvtbase" nsURI="http://www.eclipse.org/qvt/2015/QVTbase" nsPrefix="qvtb">
   <eClassifiers xsi:type="ecore:EClass" name="BaseModel" eSuperTypes="../../org.eclipse.ocl.examples.pivot/model/Pivot.ecore#//Model">
     <eStructuralFeatures xsi:type="ecore:EReference" name="unit" upperBound="-1" eType="#//Unit"
         containment="true"/>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/plugin.xml b/plugins/org.eclipse.qvtd.pivot.qvtbase/plugin.xml
index 51f5ed7d4..754bb15d9 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/plugin.xml
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/plugin.xml
@@ -9,7 +9,7 @@
 <plugin>
 
    <extension point="org.eclipse.emf.ecore.generated_package">
-      <package uri="http://www.eclipse.org/qvt/0.9/QVTbase"
+      <package uri="http://www.eclipse.org/qvt/2015/QVTbase"
             class="org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage"
             genModel="model/QVTbase.genmodel"/>
    </extension>
@@ -30,7 +30,7 @@
             name="%_UI_QVTbase_content_type"
             priority="normal">
          <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/qvt/0.9/QVTbase"/>
+            <parameter name="namespace" value="http://www.eclipse.org/qvt/2015/QVTbase"/>
             <parameter name="kind" value="xmi"/>
          </describer>
       </content-type>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtcore/META-INF/MANIFEST.MF
index 1705d2508..4af77cb54 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.pivot.qvtcore;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcorePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcorePackage.java
index 36f404292..7b40af4f0 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcorePackage.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcorePackage.java
@@ -47,7 +47,7 @@ public interface QVTcorePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@NonNull String eNS_URI = "http://www.eclipse.org/qvt/0.9/QVTcore";
+	@NonNull String eNS_URI = "http://www.eclipse.org/qvt/2015/QVTcore";
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore b/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore
index 7db947e8e..d6e69e960 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore
@@ -1,6 +1,6 @@
 <?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="qvtcore" nsURI="http://www.eclipse.org/qvt/0.9/QVTcore" nsPrefix="qvtc">
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="qvtcore" nsURI="http://www.eclipse.org/qvt/2015/QVTcore" nsPrefix="qvtc">
   <eClassifiers xsi:type="ecore:EClass" name="CoreModel" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#//BaseModel"/>
   <eClassifiers xsi:type="ecore:EClass" name="Mapping" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore#//AbstractMapping">
     <eOperations name="getAllMappings" ordered="false" upperBound="-1" eType="#//Mapping"/>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/plugin.xml b/plugins/org.eclipse.qvtd.pivot.qvtcore/plugin.xml
index a9c985d1f..a42c50939 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/plugin.xml
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/plugin.xml
@@ -21,7 +21,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated QVTcore -->
       <package
-            uri="http://www.eclipse.org/qvt/0.9/QVTcore"
+            uri="http://www.eclipse.org/qvt/2015/QVTcore"
             class="org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage"
             genModel="model/QVTcore.genmodel"/>
    </extension>
@@ -42,7 +42,7 @@
             name="%_UI_QVTcore_content_type"
             priority="normal">
          <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/qvt/0.9/QVTcore"/>
+            <parameter name="namespace" value="http://www.eclipse.org/qvt/2015/QVTcore"/>
             <parameter name="kind" value="xmi"/>
          </describer>
       </content-type>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/META-INF/MANIFEST.MF
index 3bbf8adfc..bea7e08f0 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.pivot.qvtcorebase;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/emf-gen/org/eclipse/qvtd/pivot/qvtcorebase/QVTcoreBasePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/emf-gen/org/eclipse/qvtd/pivot/qvtcorebase/QVTcoreBasePackage.java
index c0fe97953..beb4c4dd3 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/emf-gen/org/eclipse/qvtd/pivot/qvtcorebase/QVTcoreBasePackage.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/emf-gen/org/eclipse/qvtd/pivot/qvtcorebase/QVTcoreBasePackage.java
@@ -48,7 +48,7 @@ public interface QVTcoreBasePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/qvt/0.9/QVTcoreBase";
+	String eNS_URI = "http://www.eclipse.org/qvt/2015/QVTcoreBase";
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore
index b63552af8..0635673d1 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore
@@ -1,6 +1,6 @@
 <?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="qvtcorebase" nsURI="http://www.eclipse.org/qvt/0.9/QVTcoreBase"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="qvtcorebase" nsURI="http://www.eclipse.org/qvt/2015/QVTcoreBase"
     nsPrefix="qvtcb">
   <eClassifiers xsi:type="ecore:EClass" name="AbstractMapping" abstract="true" interface="true"
       eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#//Rule #//Area">
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/plugin.xml b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/plugin.xml
index 6dc5b410c..82e2aa761 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/plugin.xml
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/plugin.xml
@@ -10,7 +10,7 @@
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
-            uri="http://www.eclipse.org/qvt/0.9/QVTcoreBase"
+            uri="http://www.eclipse.org/qvt/2015/QVTcoreBase"
             class="org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
             genModel="model/QVTcoreBase.genmodel"/>
    </extension>
@@ -31,7 +31,7 @@
             name="%_UI_QVTcoreBase_content_type"
             priority="normal">
          <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/qvt/0.9/QVTcoreBase"/>
+            <parameter name="namespace" value="http://www.eclipse.org/qvt/2015/QVTcoreBase"/>
             <parameter name="kind" value="xmi"/>
          </describer>
       </content-type>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF
index 383605406..3ac5798a1 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.pivot.qvtimperative;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java
index 05527b76d..42a2d97d9 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java
@@ -51,7 +51,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@NonNull String eNS_URI = "http://www.eclipse.org/qvt/0.9/QVTimperative";
+	@NonNull String eNS_URI = "http://www.eclipse.org/qvt/2015/QVTimperative";
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore
index 32aa08650..fdd0a969a 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore
@@ -1,6 +1,6 @@
 <?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="qvtimperative" nsURI="http://www.eclipse.org/qvt/0.9/QVTimperative"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="qvtimperative" nsURI="http://www.eclipse.org/qvt/2015/QVTimperative"
     nsPrefix="qvti">
   <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
     <details key="documentation" value="The Package for an Imperative QVT transformation."/>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/plugin.xml b/plugins/org.eclipse.qvtd.pivot.qvtimperative/plugin.xml
index 687d6b539..1416c7039 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/plugin.xml
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/plugin.xml
@@ -21,7 +21,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated QVTimperative -->
       <package
-            uri="http://www.eclipse.org/qvt/0.9/QVTimperative"
+            uri="http://www.eclipse.org/qvt/2015/QVTimperative"
             class="org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage"
             genModel="model/QVTimperative.genmodel"/>
    </extension>
@@ -42,7 +42,7 @@
             name="%_UI_QVTimperative_content_type"
             priority="normal">
          <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/qvt/0.9/QVTimperative"/>
+            <parameter name="namespace" value="http://www.eclipse.org/qvt/2015/QVTimperative"/>
             <parameter name="kind" value="xmi"/>
          </describer>
       </content-type>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiModelManager.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiModelManager.java
index f2a1c1e0f..b9151a204 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiModelManager.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiModelManager.java
@@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.examples.domain.elements.DomainClass;
 import org.eclipse.ocl.examples.domain.elements.DomainPackage;
 import org.eclipse.ocl.examples.domain.elements.DomainType;
 import org.eclipse.ocl.examples.domain.evaluation.DomainModelManager;
@@ -121,11 +122,11 @@ public class QVTiModelManager implements DomainModelManager
 		}
 	}
 
-	public @NonNull Set<EObject> get(@NonNull DomainType type) {
+	public @NonNull Set<EObject> get(@NonNull DomainClass type) {
 		
 		Set<EObject> elements = new HashSet<EObject>();
 		// Find the typed model for the type
-		DomainPackage p = type.getPackage();
+		DomainPackage p = type.getOwningPackage();
 		for (TypedModel d : modelResourceMap.keySet()) {
 			for (Package up : d.getUsedPackage()) {
 				if (up.equals(p)) {
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtrelation/META-INF/MANIFEST.MF
index 1e1db3ba3..f6e575901 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.pivot.qvtrelation;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationPackage.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationPackage.java
index b853d7cdd..22658d7e4 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationPackage.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationPackage.java
@@ -48,7 +48,7 @@ public interface QVTrelationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@NonNull String eNS_URI = "http://www.eclipse.org/qvt/0.9/QVTrelation";
+	@NonNull String eNS_URI = "http://www.eclipse.org/qvt/2015/QVTrelation";
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore b/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore
index 20b63ea46..6791b8156 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <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" xmi:id="QVTRelation" name="qvtrelation" nsURI="http://www.eclipse.org/qvt/0.9/QVTrelation"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmi:id="QVTRelation" name="qvtrelation" nsURI="http://www.eclipse.org/qvt/2015/QVTrelation"
     nsPrefix="qvtr">
   <eClassifiers xsi:type="ecore:EClass" xmi:id="QVTRelation.DomainPattern" name="DomainPattern"
       eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#//Pattern">
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/plugin.xml b/plugins/org.eclipse.qvtd.pivot.qvtrelation/plugin.xml
index 032fb6908..3a02a4a1a 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/plugin.xml
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/plugin.xml
@@ -21,7 +21,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated QVTrelation -->
       <package
-            uri="http://www.eclipse.org/qvt/0.9/QVTrelation"
+            uri="http://www.eclipse.org/qvt/2015/QVTrelation"
             class="org.eclipse.qvtd.pivot.qvtrelation.QVTrelationPackage"
             genModel="model/QVTrelation.genmodel"/>
    </extension>
@@ -44,7 +44,7 @@
             name="%_UI_QVTrelation_content_type"
             priority="normal">
          <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/qvt/0.9/QVTrelation"/>
+            <parameter name="namespace" value="http://www.eclipse.org/qvt/2015/QVTrelation"/>
             <parameter name="kind" value="xmi"/>
          </describer>
       </content-type>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvttemplate/META-INF/MANIFEST.MF
index d37f80ec5..b2be705f3 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.pivot.qvttemplate;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/QVTtemplatePackage.java b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/QVTtemplatePackage.java
index 4a3b78268..0bb2189a3 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/QVTtemplatePackage.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/QVTtemplatePackage.java
@@ -46,7 +46,7 @@ public interface QVTtemplatePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/qvt/0.9/QVTtemplate";
+	String eNS_URI = "http://www.eclipse.org/qvt/2015/QVTtemplate";
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore b/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore
index 1928e80f4..f03e43e56 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <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" xmi:id="QVTTemplate" name="qvttemplate" nsURI="http://www.eclipse.org/qvt/0.9/QVTtemplate"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmi:id="QVTTemplate" name="qvttemplate" nsURI="http://www.eclipse.org/qvt/2015/QVTtemplate"
     nsPrefix="qvtt">
   <eClassifiers xsi:type="ecore:EClass" xmi:id="QVTTemplate.CollectionTemplateExp"
       name="CollectionTemplateExp" eSuperTypes="#QVTTemplate.TemplateExp">
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/plugin.xml b/plugins/org.eclipse.qvtd.pivot.qvttemplate/plugin.xml
index 73d982afa..6a51d9bf6 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/plugin.xml
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/plugin.xml
@@ -10,7 +10,7 @@
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
-            uri="http://www.eclipse.org/qvt/0.9/QVTtemplate"
+            uri="http://www.eclipse.org/qvt/2015/QVTtemplate"
             class="org.eclipse.qvtd.pivot.qvttemplate.QVTtemplatePackage"
             genModel="model/QVTtemplate.genmodel"/>
    </extension>
@@ -31,7 +31,7 @@
             name="%_UI_QVTtemplate_content_type"
             priority="normal">
          <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/qvt/0.9/QVTtemplate"/>
+            <parameter name="namespace" value="http://www.eclipse.org/qvt/2015/QVTtemplate"/>
             <parameter name="kind" value="xmi"/>
          </describer>
       </content-type>
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF
index c2b44364c..70346ff28 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtbase.ui;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.qvtd.pivot.qvtbase;visibility:=reexport,
- org.eclipse.ocl.examples.xtext.essentialocl.ui;bundle-version="[0.9.0,1.0.0)";visibility:=reexport
+ org.eclipse.ocl.xtext.essentialocl.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Export-Package: org.eclipse.qvtd.xtext.qvtbase.ui.labeling,
  org.eclipse.qvtd.xtext.qvtbase.ui.outline
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF
index cd2809df3..cecdad911 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtcore.ui; singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF
index f6db34a9d..3a5b6711f 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtcore;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcore/qvtcorecs/QVTcoreCSPackage.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcore/qvtcorecs/QVTcoreCSPackage.java
index c9bf04557..5a480e5ed 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcore/qvtcorecs/QVTcoreCSPackage.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcore/qvtcorecs/QVTcoreCSPackage.java
@@ -46,7 +46,7 @@ public interface QVTcoreCSPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/qvt/0.9/QVTcoreCST";
+	String eNS_URI = "http://www.eclipse.org/qvt/2015/QVTcoreCS";
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore
index 806c74a67..f4d046b35 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore
@@ -1,6 +1,6 @@
 <?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="qvtcorecs" nsURI="http://www.eclipse.org/qvt/0.9/QVTcoreCST"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="qvtcorecs" nsURI="http://www.eclipse.org/qvt/2015/QVTcoreCS"
     nsPrefix="qvtccs">
   <eClassifiers xsi:type="ecore:EClass" name="MappingCS" eSuperTypes="../../org.eclipse.qvtd.xtext.qvtcorebase/model/QVTcoreBaseCS.ecore#//AbstractMappingCS">
     <eStructuralFeatures xsi:type="ecore:EReference" name="composedMappings" ordered="false"
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/plugin.xml b/plugins/org.eclipse.qvtd.xtext.qvtcore/plugin.xml
index 34dc7fff4..357610157 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/plugin.xml
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/plugin.xml
@@ -10,7 +10,7 @@
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
-            uri="http://www.eclipse.org/qvt/0.9/QVTcoreCST"
+            uri="http://www.eclipse.org/qvt/2015/QVTcoreCS"
             class="org.eclipse.qvtd.xtext.qvtcore.qvtcorecs.QVTcoreCSPackage"
             genModel="model/QVTcoreCS.genmodel"/>
    </extension>
@@ -31,7 +31,7 @@
             name="%_UI_QVTcoreCS_content_type"
             priority="normal">
          <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/qvt/0.9/QVTcoreCST"/>
+            <parameter name="namespace" value="http://www.eclipse.org/qvt/2015/QVTcoreCS"/>
          </describer>
       </content-type>
    </extension>
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/validation/AbstractQVTcoreJavaValidator.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/validation/AbstractQVTcoreJavaValidator.java
index abb49981c..8ee23038d 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/validation/AbstractQVTcoreJavaValidator.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/validation/AbstractQVTcoreJavaValidator.java
@@ -15,10 +15,10 @@ public class AbstractQVTcoreJavaValidator extends org.eclipse.qvtd.xtext.qvtcore
 	@Override
 	protected List<EPackage> getEPackages() {
 	    List<EPackage> result = new ArrayList<EPackage>();
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/0.9/QVTcoreCST"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/0.9/QVTcoreBaseCST"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/3.1.0/BaseCST"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/3.1.0/EssentialOCLCST"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/2015/QVTcoreCS"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/2015/QVTcoreBaseCS"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/2015/BaseCS"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/2015/EssentialOCLCS"));
 		return result;
 	}
 
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtext b/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtext
index 0989c67a6..93ab97762 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtext
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtext
@@ -11,13 +11,13 @@
 grammar org.eclipse.qvtd.xtext.qvtcore.QVTcore with org.eclipse.qvtd.xtext.qvtcorebase.QVTcoreBase
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
-import "http://www.eclipse.org/ocl/3.1.0/BaseCST" as base
-import "http://www.eclipse.org/ocl/3.1.0/EssentialOCLCST" as essentialocl
+import "http://www.eclipse.org/ocl/2015/BaseCS" as base
+import "http://www.eclipse.org/ocl/2015/EssentialOCLCS" as essentialocl
 import "http://www.eclipse.org/ocl/3.1.0/Pivot" as pivot
-import "http://www.eclipse.org/qvt/0.9/QVTbase" as qvtbase
-import "http://www.eclipse.org/qvt/0.9/QVTcoreBase" as qvtcorebase
-import "http://www.eclipse.org/qvt/0.9/QVTcore" as qvtcore
-import "http://www.eclipse.org/qvt/0.9/QVTcoreCST"
+import "http://www.eclipse.org/qvt/2015/QVTbase" as qvtbase
+import "http://www.eclipse.org/qvt/2015/QVTcoreBase" as qvtcorebase
+import "http://www.eclipse.org/qvt/2015/QVTcore" as qvtcore
+import "http://www.eclipse.org/qvt/2015/QVTcoreCS"
 
 TopLevelCS:
 	(ownedImports+=ImportCS | /*ownedInclude+=IncludeCS |*/ ownedLibraries+=LibraryCS)*
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/META-INF/MANIFEST.MF
index c17151262..ab1c64d2b 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtcorebase.ui;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/META-INF/MANIFEST.MF
index 1fdbcee57..1253653e8 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtcorebase;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -24,6 +24,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtcorebase,
  org.eclipse.qvtd.xtext.qvtcorebase.utilities,
  org.eclipse.qvtd.xtext.qvtcorebase.validation
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ocl.examples.xtext.essentialocl;bundle-version="[0.9.0,1.0.0)";visibility:=reexport,
+ org.eclipse.ocl.xtext.essentialocl;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.qvtd.pivot.qvtcorebase;visibility:=reexport
 Import-Package: org.apache.log4j
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/emf-gen/org/eclipse/qvtd/xtext/qvtcorebase/qvtcorebasecs/QVTcoreBaseCSPackage.java b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/emf-gen/org/eclipse/qvtd/xtext/qvtcorebase/qvtcorebasecs/QVTcoreBaseCSPackage.java
index 611fac9a6..03fd5893a 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/emf-gen/org/eclipse/qvtd/xtext/qvtcorebase/qvtcorebasecs/QVTcoreBaseCSPackage.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/emf-gen/org/eclipse/qvtd/xtext/qvtcorebase/qvtcorebasecs/QVTcoreBaseCSPackage.java
@@ -48,7 +48,7 @@ public interface QVTcoreBaseCSPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/qvt/0.9/QVTcoreBaseCST";
+	String eNS_URI = "http://www.eclipse.org/qvt/2015/QVTcoreBaseCS";
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/model/QVTcoreBaseCS.ecore b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/model/QVTcoreBaseCS.ecore
index e2867aaae..fbc13171f 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/model/QVTcoreBaseCS.ecore
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/model/QVTcoreBaseCS.ecore
@@ -1,6 +1,6 @@
 <?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="qvtcorebasecs" nsURI="http://www.eclipse.org/qvt/0.9/QVTcoreBaseCST"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="qvtcorebasecs" nsURI="http://www.eclipse.org/qvt/2015/QVTcoreBaseCS"
     nsPrefix="qvtcbcs">
   <eAnnotations source="http://www.eclipse.org/OCL/Import">
     <details key="basecs" value="../../org.eclipse.ocl.examples.xtext.base/model/BaseCS.ecore#/"/>
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/plugin.xml b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/plugin.xml
index 51a5961f3..3606f5868 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/plugin.xml
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/plugin.xml
@@ -10,7 +10,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated QVTcoreBaseCS -->
       <package
-            uri="http://www.eclipse.org/qvt/0.9/QVTcoreBaseCST"
+            uri="http://www.eclipse.org/qvt/2015/QVTcoreBaseCS"
             class="org.eclipse.qvtd.xtext.qvtcorebase.qvtcorebasecs.QVTcoreBaseCSPackage"
             genModel="model/QVTcoreBaseCS.genmodel"/>
    </extension>
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/validation/AbstractQVTcoreBaseJavaValidator.java b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/validation/AbstractQVTcoreBaseJavaValidator.java
index 72c417316..1b57ed69e 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/validation/AbstractQVTcoreBaseJavaValidator.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/validation/AbstractQVTcoreBaseJavaValidator.java
@@ -15,9 +15,9 @@ public class AbstractQVTcoreBaseJavaValidator extends org.eclipse.ocl.examples.x
 	@Override
 	protected List<EPackage> getEPackages() {
 	    List<EPackage> result = new ArrayList<EPackage>();
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/0.9/QVTcoreBaseCST"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/3.1.0/BaseCST"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/3.1.0/EssentialOCLCST"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/2015/QVTcoreBaseCS"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/2015/BaseCS"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/2015/EssentialOCLCS"));
 		return result;
 	}
 
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBase.xtext b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBase.xtext
index 8e9f6e83e..91b0fcb54 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBase.xtext
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBase.xtext
@@ -11,12 +11,12 @@
 grammar org.eclipse.qvtd.xtext.qvtcorebase.QVTcoreBase with org.eclipse.ocl.examples.xtext.essentialocl.EssentialOCL
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
-import "http://www.eclipse.org/ocl/3.1.0/BaseCST" as base
-import "http://www.eclipse.org/ocl/3.1.0/EssentialOCLCST" as essentialocl
+import "http://www.eclipse.org/ocl/2015/BaseCS" as base
+import "http://www.eclipse.org/ocl/2015/EssentialOCLCS" as essentialocl
 import "http://www.eclipse.org/ocl/3.1.0/Pivot" as pivot
-import "http://www.eclipse.org/qvt/0.9/QVTbase" as qvtbase
-import "http://www.eclipse.org/qvt/0.9/QVTcoreBase" as qvtcorebase
-import "http://www.eclipse.org/qvt/0.9/QVTcoreBaseCST"
+import "http://www.eclipse.org/qvt/2015/QVTbase" as qvtbase
+import "http://www.eclipse.org/qvt/2015/QVTcoreBase" as qvtcorebase
+import "http://www.eclipse.org/qvt/2015/QVTcoreBaseCS"
 		
 BottomPatternCS:
 	( '{' (unrealizedVariables+=UnrealizedVariableCS | realizedVariables+=RealizedVariableCS)
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF
index e1fae80f2..4e4da2149 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtimperative.ui;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF
index f93cc95ea..f1bc8a754 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtimperative;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -24,7 +24,7 @@ Export-Package: org.eclipse.qvtd.xtext.qvtimperative,
  org.eclipse.qvtd.xtext.qvtimperative.utilities,
  org.eclipse.qvtd.xtext.qvtimperative.validation
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ocl.examples.xtext.completeocl;bundle-version="[0.9.0,1.0.0)",
+ org.eclipse.ocl.xtext.completeocl;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.qvtd.pivot.qvtimperative;visibility:=reexport,
  org.eclipse.qvtd.xtext.qvtcorebase;visibility:=reexport
 Import-Package: org.apache.log4j
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperative/qvtimperativecs/QVTimperativeCSPackage.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperative/qvtimperativecs/QVTimperativeCSPackage.java
index 32dfeb755..3174181a9 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperative/qvtimperativecs/QVTimperativeCSPackage.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/emf-gen/org/eclipse/qvtd/xtext/qvtimperative/qvtimperativecs/QVTimperativeCSPackage.java
@@ -47,7 +47,7 @@ public interface QVTimperativeCSPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/qvt/0.9/QVTimperativeCST";
+	String eNS_URI = "http://www.eclipse.org/qvt/2015/QVTimperativeCS";
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/model/QVTimperativeCS.ecore b/plugins/org.eclipse.qvtd.xtext.qvtimperative/model/QVTimperativeCS.ecore
index 632299230..ea26b23f8 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/model/QVTimperativeCS.ecore
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/model/QVTimperativeCS.ecore
@@ -1,6 +1,6 @@
 <?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="qvtimperativecs" nsURI="http://www.eclipse.org/qvt/0.9/QVTimperativeCST"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="qvtimperativecs" nsURI="http://www.eclipse.org/qvt/2015/QVTimperativeCS"
     nsPrefix="qvtics">
   <eClassifiers xsi:type="ecore:EClass" name="MappingCS" eSuperTypes="../../org.eclipse.qvtd.xtext.qvtcorebase/model/QVTcoreBaseCS.ecore#//AbstractMappingCS">
     <eStructuralFeatures xsi:type="ecore:EReference" name="mappingSequence" eType="#//MappingSequenceCS"
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/plugin.xml b/plugins/org.eclipse.qvtd.xtext.qvtimperative/plugin.xml
index 9eb22e99d..a71b4d001 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/plugin.xml
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/plugin.xml
@@ -10,7 +10,7 @@
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
-            uri="http://www.eclipse.org/qvt/0.9/QVTimperativeCST"
+            uri="http://www.eclipse.org/qvt/2015/QVTimperativeCS"
             class="org.eclipse.qvtd.xtext.qvtimperative.qvtimperativecs.QVTimperativeCSPackage"
             genModel="model/QVTimperativeCS.genmodel"/>
    </extension>
@@ -31,7 +31,7 @@
             name="%_UI_QVTimperativeCS_content_type"
             priority="normal">
          <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/qvt/0.9/QVTimperativeCST"/>
+            <parameter name="namespace" value="http://www.eclipse.org/qvt/2015/QVTimperativeCS"/>
          </describer>
       </content-type>
    </extension>
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/validation/AbstractQVTimperativeJavaValidator.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/validation/AbstractQVTimperativeJavaValidator.java
index 56cb259ea..9ccf521bd 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/validation/AbstractQVTimperativeJavaValidator.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/validation/AbstractQVTimperativeJavaValidator.java
@@ -15,10 +15,10 @@ public class AbstractQVTimperativeJavaValidator extends org.eclipse.qvtd.xtext.q
 	@Override
 	protected List<EPackage> getEPackages() {
 	    List<EPackage> result = new ArrayList<EPackage>();
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/0.9/QVTimperativeCST"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/0.9/QVTcoreBaseCST"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/3.1.0/EssentialOCLCST"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/3.1.0/BaseCST"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/2015/QVTimperativeCS"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/2015/QVTcoreBaseCS"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/2015/EssentialOCLCS"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/2015/BaseCS"));
 		return result;
 	}
 
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext
index 574642d72..cb48153d1 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtext
@@ -11,14 +11,14 @@
 grammar org.eclipse.qvtd.xtext.qvtimperative.QVTimperative with org.eclipse.qvtd.xtext.qvtcorebase.QVTcoreBase
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
-import "http://www.eclipse.org/ocl/3.1.0/BaseCST" as base
-import "http://www.eclipse.org/ocl/3.1.0/EssentialOCLCST" as essentialocl
+import "http://www.eclipse.org/ocl/2015/BaseCS" as base
+import "http://www.eclipse.org/ocl/2015/EssentialOCLCS" as essentialocl
 import "http://www.eclipse.org/ocl/3.1.0/Pivot" as pivot
-import "http://www.eclipse.org/qvt/0.9/QVTbase" as qvtbase
-import "http://www.eclipse.org/qvt/0.9/QVTcoreBase" as qvtcorebase
-import "http://www.eclipse.org/qvt/0.9/QVTimperative" as qvtimperative
-import "http://www.eclipse.org/qvt/0.9/QVTcoreBaseCST"
-import "http://www.eclipse.org/qvt/0.9/QVTimperativeCST"
+import "http://www.eclipse.org/qvt/2015/QVTbase" as qvtbase
+import "http://www.eclipse.org/qvt/2015/QVTcoreBase" as qvtcorebase
+import "http://www.eclipse.org/qvt/2015/QVTimperative" as qvtimperative
+import "http://www.eclipse.org/qvt/2015/QVTcoreBaseCS"
+import "http://www.eclipse.org/qvt/2015/QVTimperativeCS"
 
 TopLevelCS:
 	(ownedImports+=ImportCS | /*ownedInclude+=IncludeCS |*/ ownedLibraries+=LibraryCS)*
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF
index 6ad016ddb..7afa67b87 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtrelation.ui; singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF
index ce0f8370f..0f072fcce 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtrelation;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -23,6 +23,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtrelation,
  org.eclipse.qvtd.xtext.qvtrelation.utilities,
  org.eclipse.qvtd.xtext.qvtrelation.validation
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ocl.examples.xtext.essentialocl;bundle-version="[0.9.0,1.0.0)";visibility:=reexport,
+ org.eclipse.ocl.xtext.essentialocl;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.qvtd.pivot.qvtrelation;visibility:=reexport
 Import-Package: org.apache.log4j
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelation/qvtrelationcs/QVTrelationCSPackage.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelation/qvtrelationcs/QVTrelationCSPackage.java
index a99d11a1d..251a0865d 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelation/qvtrelationcs/QVTrelationCSPackage.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelation/qvtrelationcs/QVTrelationCSPackage.java
@@ -47,7 +47,7 @@ public interface QVTrelationCSPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/qvt/0.9/QVTrelationCST";
+	String eNS_URI = "http://www.eclipse.org/qvt/2015/QVTrelationCS";
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore b/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore
index 3fe70d004..88a502e11 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore
@@ -1,6 +1,6 @@
 <?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="qvtrelationcs" nsURI="http://www.eclipse.org/qvt/0.9/QVTrelationCST"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="qvtrelationcs" nsURI="http://www.eclipse.org/qvt/2015/QVTrelationCS"
     nsPrefix="qvtrcs">
   <eClassifiers xsi:type="ecore:EClass" name="AbstractDomainCS" abstract="true" eSuperTypes="../../org.eclipse.ocl.examples.xtext.base/model/BaseCS.ecore#//ModelElementCS ../../org.eclipse.ocl.examples.pivot/model/Pivot.ecore#//Nameable"/>
   <eClassifiers xsi:type="ecore:EClass" name="CollectionTemplateCS" eSuperTypes="#//TemplateCS">
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/plugin.xml b/plugins/org.eclipse.qvtd.xtext.qvtrelation/plugin.xml
index 6875cb61e..cbf361d97 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/plugin.xml
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/plugin.xml
@@ -8,7 +8,7 @@
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
-            uri="http://www.eclipse.org/qvt/0.9/QVTrelationCST"
+            uri="http://www.eclipse.org/qvt/2015/QVTrelationCS"
             class="org.eclipse.qvtd.xtext.qvtrelation.qvtrelationcs.QVTrelationCSPackage"
             genModel="model/QVTrelationCS.genmodel"/>
    </extension>
@@ -29,7 +29,7 @@
             name="%_UI_QVTrelationCS_content_type"
             priority="normal">
          <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/qvt/0.9/QVTrelationCST"/>
+            <parameter name="namespace" value="http://www.eclipse.org/qvt/2015/QVTrelationCS"/>
          </describer>
       </content-type>
    </extension>
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/validation/AbstractQVTrelationJavaValidator.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/validation/AbstractQVTrelationJavaValidator.java
index 35aaea271..30e030521 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/validation/AbstractQVTrelationJavaValidator.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/validation/AbstractQVTrelationJavaValidator.java
@@ -15,9 +15,9 @@ public class AbstractQVTrelationJavaValidator extends org.eclipse.ocl.examples.x
 	@Override
 	protected List<EPackage> getEPackages() {
 	    List<EPackage> result = new ArrayList<EPackage>();
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/0.9/QVTrelationCST"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/3.1.0/BaseCST"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/3.1.0/EssentialOCLCST"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/qvt/2015/QVTrelationCS"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/2015/BaseCS"));
+	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/ocl/2015/EssentialOCLCS"));
 		return result;
 	}
 
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext
index 3b6f20bb8..1d411f90d 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext
@@ -11,12 +11,12 @@
 grammar org.eclipse.qvtd.xtext.qvtrelation.QVTrelation with org.eclipse.ocl.examples.xtext.essentialocl.EssentialOCL
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
-import "http://www.eclipse.org/ocl/3.1.0/BaseCST" as base
-import "http://www.eclipse.org/ocl/3.1.0/EssentialOCLCST" as essentialocl
+import "http://www.eclipse.org/ocl/2015/BaseCS" as base
+import "http://www.eclipse.org/ocl/2015/EssentialOCLCS" as essentialocl
 import "http://www.eclipse.org/ocl/3.1.0/Pivot" as pivot
-import "http://www.eclipse.org/qvt/0.9/QVTbase" as qvtbase
-import "http://www.eclipse.org/qvt/0.9/QVTrelation" as qvtrelation
-import "http://www.eclipse.org/qvt/0.9/QVTrelationCST"
+import "http://www.eclipse.org/qvt/2015/QVTbase" as qvtbase
+import "http://www.eclipse.org/qvt/2015/QVTrelation" as qvtrelation
+import "http://www.eclipse.org/qvt/2015/QVTrelationCS"
 
 TopLevelCS:
 	(ownedImports+=UnitCS | /*ownedInclude+=IncludeCS |*/ ownedLibraries+=LibraryCS)*
diff --git a/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF b/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF
index 20d1f2b1e..93a741ee9 100644
--- a/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.build;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.resources,
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/QVTPivot2FlatQVTPivot.java b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/QVTPivot2FlatQVTPivot.java
index c4c82194e..b9966788b 100644
--- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/QVTPivot2FlatQVTPivot.java
+++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/QVTPivot2FlatQVTPivot.java
@@ -75,7 +75,7 @@ public class QVTPivot2FlatQVTPivot
 		//
 		EPackage flatPackage = EcoreFactory.eINSTANCE.createEPackage();
 		flatPackage.setName("flatqvt");
-		flatPackage.setNsURI("http://www.eclipse.org/qvt/0.9/FlatQVT");
+		flatPackage.setNsURI("http://www.eclipse.org/qvt/2015/FlatQVT");
 		flatPackage.setNsPrefix("flatqvt");
 		for (Resource ecoreResource : ecoreResourceSet.getResources()) {
 			for (EObject eObject : ecoreResource.getContents()) {
diff --git a/releng/org.eclipse.qvtd.releng.buckminster/README.txt b/releng/org.eclipse.qvtd.releng.buckminster/README.txt
index 84f04f925..bd440d243 100644
--- a/releng/org.eclipse.qvtd.releng.buckminster/README.txt
+++ b/releng/org.eclipse.qvtd.releng.buckminster/README.txt
@@ -1,23 +1,23 @@
 The Buckminster build automatically promotes downloads and updates, so no cron job help is necessary.
 
 The updates can be checked by looking for the new entry on http://www.eclipse.org/mmt/downloads/?project=qvtd
-or installing new software from e.g. http://download.eclipse.org/mmt/qvtd/updates/milestones/0.12.0/S201408191819
+or installing new software from e.g. http://download.eclipse.org/mmt/qvtd/updates/milestones/1.0.0/S201408191819
 
 However operations on composite repositories are not automated, partly because they are sufficiently important to deserve manual attention. 
 
 A new milestone build can be added to the composite repository by:
 
 logon to build.eclipse.org
-cd downloads/mmt/qvtd/updates/milestones/0.12.0
-ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=S201408191819 -Dcomposite.name="QVTd 0.12.0 milestones"
+cd downloads/mmt/qvtd/updates/milestones/1.0.0
+ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=S201408191819 -Dcomposite.name="QVTd 1.0.0 milestones"
 
-(This can be checked by installing new software from e.g. http://download.eclipse.org/mmt/qvtd/updates/milestones/0.12.0)
+(This can be checked by installing new software from e.g. http://download.eclipse.org/mmt/qvtd/updates/milestones/1.0.0)
 
 The Mars aggregator is configured by GIT\org.eclipse.simrel.build\qvtd.b3aggrcon to use an explicit milestone entry
 
 So edit qvtd.b3aggrcon to update 
-location="http://download.eclipse.org/mmt/qvtd/updates/milestones/0.12.0/S201408191819"
+location="http://download.eclipse.org/mmt/qvtd/updates/milestones/1.0.0/S201408191819"
 push to upstream master and start a new build at https://hudson.eclipse.org/hudson/job/simrel.mars.runaggregator/
 
 Once a relese has been promoted update qvtd.b3aggrcon to the final release
-location="http://download.eclipse.org/mmt/qvtd/updates/releases/0.12.0"
+location="http://download.eclipse.org/mmt/qvtd/updates/releases/1.0.0"
diff --git a/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-pre-buckminster.sh b/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-pre-buckminster.sh
index 5df9514b4..80d2bdd1f 100644
--- a/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-pre-buckminster.sh
+++ b/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-pre-buckminster.sh
@@ -69,7 +69,7 @@ COMPACT_BUILD_ID="${COMPACT_BUILD_ID:0:12}"
 	echo "packages.base=MMT-QVTd.downloads"
 	echo "tests.base=MMT-QVTd.test.results"
 	echo "javadoc.base=MMT-QVTd.javadoc"
-	echo "version=0.12.0"
+	echo "version=1.0.0"
 	echo "downloads.area=/home/data/httpd/download.eclipse.org/mmt/qvtd"
 	echo "generateSourceReferences=true"
 
diff --git a/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-tests-pre-buckminster.sh b/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-tests-pre-buckminster.sh
index 1a008e66a..b03489d34 100644
--- a/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-tests-pre-buckminster.sh
+++ b/releng/org.eclipse.qvtd.releng.buckminster/scripts/qvtd-tests-pre-buckminster.sh
@@ -69,7 +69,7 @@ COMPACT_BUILD_ID="${COMPACT_BUILD_ID:0:12}"
 	echo "packages.base=MMT-QVTd.downloads"
 	echo "tests.base=MMT-QVTd.test.results"
 	echo "javadoc.base=MMT-QVTd.javadoc"
-	echo "version=0.12.0"
+	echo "version=1.0.0"
 	echo "downloads.area=/home/data/httpd/download.eclipse.org/mmt/qvtd"
 	echo "generateSourceReferences=true"
 
diff --git a/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
index 9e0ea7477..2793b5676 100644
--- a/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.all.tests
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/QvtuToQvtiMtc.xml b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/QvtuToQvtiMtc.xml
index 582fffb6d..064232d31 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/QvtuToQvtiMtc.xml
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/QvtuToQvtiMtc.xml
@@ -29,21 +29,21 @@
             name = "QVTc"
             aliases ="QVT"
 		    modelFile = "${qvtcas}" 
-            metamodelUri = "http://www.eclipse.org/qvt/0.9/QVTcore"
+            metamodelUri = "http://www.eclipse.org/qvt/2015/QVTcore"
             read="true" store="false"/>
     	<!-- QVTu -->
         <epsilon.emf.loadModel
             name = "QVTu"
         	aliases ="QVT"
             modelFile = "${qvtuas}" 
-            metamodelUri = "http://www.eclipse.org/qvt/0.9/QVTcore"
+            metamodelUri = "http://www.eclipse.org/qvt/2015/QVTcore"
             read="false" store="true"/>
     	<!-- QVTm Flatten  -->
         <epsilon.emf.loadModel
         	name = "QVTmFlatten"
         	aliases ="QVT"
             modelFile = "${qvtmflattenas}" 
-            metamodelUri = "http://www.eclipse.org/qvt/0.9/QVTcore"
+            metamodelUri = "http://www.eclipse.org/qvt/2015/QVTcore"
             read="false" store="true"/>
 	</target>
 	
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower.qvtcas b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower.qvtcas
index bf58bb3cc..33f17fb36 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower.qvtcas
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower.qvtcas
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <qvtc:CoreModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/0.9/QVTbase"
-    xmlns:qvtc="http://www.eclipse.org/qvt/0.9/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/0.9/QVTcoreBase"
-    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/0.9/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/0.9/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/0.9/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
+    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/2015/QVTbase"
+    xmlns:qvtc="http://www.eclipse.org/qvt/2015/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/2015/QVTcoreBase"
+    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/2015/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/2015/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/2015/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
     name="UpperToLower.qvtc" externalURI="platform:/resource/uk.ac.york.qvtd.tests.hhr/src/qvtc/UpperToLower.qvtc">
   <nestedPackage xsi:type="qvtb:Transformation" xmi:id="T.copyGraph" name="copyGraph"
       superClass="http://www.eclipse.org/ocl/3.1.0/OCL.oclstdlib.oclas#T.ocl.OclElement">
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower.qvtu.qvtcas b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower.qvtu.qvtcas
index 958ebface..908a0106d 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower.qvtu.qvtcas
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower.qvtu.qvtcas
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <qvtc:CoreModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/0.9/QVTbase"
-    xmlns:qvtc="http://www.eclipse.org/qvt/0.9/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/0.9/QVTcoreBase"
-    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/0.9/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/0.9/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/0.9/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
+    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/2015/QVTbase"
+    xmlns:qvtc="http://www.eclipse.org/qvt/2015/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/2015/QVTcoreBase"
+    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/2015/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/2015/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/2015/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
     name="UpperToLower.qvtc" externalURI="platform:/resource/uk.ac.york.qvtd.tests.hhr/src/qvtc/UpperToLower.qvtc">
   <nestedPackage xsi:type="qvtb:Transformation" xmi:id="T.copyGraph" name="copyGraph"
       superClass="http://www.eclipse.org/ocl/3.1.0/OCL.oclstdlib.oclas#T.ocl.OclElement">
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower1.qvtu.qvtcas b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower1.qvtu.qvtcas
index 958ebface..908a0106d 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower1.qvtu.qvtcas
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/GraphToGraphMinimal/UpperToLower1.qvtu.qvtcas
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <qvtc:CoreModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/0.9/QVTbase"
-    xmlns:qvtc="http://www.eclipse.org/qvt/0.9/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/0.9/QVTcoreBase"
-    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/0.9/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/0.9/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/0.9/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
+    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/2015/QVTbase"
+    xmlns:qvtc="http://www.eclipse.org/qvt/2015/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/2015/QVTcoreBase"
+    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/2015/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/2015/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/2015/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
     name="UpperToLower.qvtc" externalURI="platform:/resource/uk.ac.york.qvtd.tests.hhr/src/qvtc/UpperToLower.qvtc">
   <nestedPackage xsi:type="qvtb:Transformation" xmi:id="T.copyGraph" name="copyGraph"
       superClass="http://www.eclipse.org/ocl/3.1.0/OCL.oclstdlib.oclas#T.ocl.OclElement">
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtcas b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtcas
index 2446ba035..d1bea9978 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtcas
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtcas
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <qvtc:CoreModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/0.9/QVTbase"
-    xmlns:qvtc="http://www.eclipse.org/qvt/0.9/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/0.9/QVTcoreBase"
-    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/0.9/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/0.9/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/0.9/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
+    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/2015/QVTbase"
+    xmlns:qvtc="http://www.eclipse.org/qvt/2015/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/2015/QVTcoreBase"
+    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/2015/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/2015/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/2015/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
     name="UmlToRdbms.qvtc" externalURI="platform:/resource/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtc">
   <nestedPackage xsi:type="qvtb:Transformation" xmi:id="T.umlRdbms" name="umlRdbms"
       superClass="http://www.eclipse.org/ocl/3.1.0/OCL.oclstdlib.oclas#T.ocl.OclElement">
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtm.qvtcas b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtm.qvtcas
index b15723d76..51367e966 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtm.qvtcas
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtm.qvtcas
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <qvtc:CoreModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/0.9/QVTbase"
-    xmlns:qvtc="http://www.eclipse.org/qvt/0.9/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/0.9/QVTcoreBase"
-    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/0.9/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/0.9/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/0.9/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
+    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/2015/QVTbase"
+    xmlns:qvtc="http://www.eclipse.org/qvt/2015/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/2015/QVTcoreBase"
+    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/2015/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/2015/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/2015/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
     name="UmlToRdbms.qvtc" externalURI="platform:/resource/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtc">
   <nestedPackage xsi:type="qvtb:Transformation" xmi:id="T.umlRdbms" name="umlRdbms"
       superClass="http://www.eclipse.org/ocl/3.1.0/OCL.oclstdlib.oclas#T.ocl.OclElement">
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtu.qvtcas b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtu.qvtcas
index 3b05f4801..78564fb32 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtu.qvtcas
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtu.qvtcas
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <qvtc:CoreModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/0.9/QVTbase"
-    xmlns:qvtc="http://www.eclipse.org/qvt/0.9/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/0.9/QVTcoreBase"
-    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/0.9/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/0.9/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/0.9/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
+    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/2015/QVTbase"
+    xmlns:qvtc="http://www.eclipse.org/qvt/2015/QVTcore" xmlns:qvtcb="http://www.eclipse.org/qvt/2015/QVTcoreBase"
+    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/2015/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/2015/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/2015/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage"
     name="UmlToRdbms.qvtc" externalURI="platform:/resource/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbms.qvtc">
   <nestedPackage xsi:type="qvtb:Transformation" xmi:id="T.umlRdbms" name="umlRdbms"
       superClass="http://www.eclipse.org/ocl/3.1.0/OCL.oclstdlib.oclas#T.ocl.OclElement">
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbmsPartition.qvtm.qvtcas b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbmsPartition.qvtm.qvtcas
index ab197ada2..c50d129b0 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbmsPartition.qvtm.qvtcas
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/etl/tests/UmlToRdbms/UmlToRdbmsPartition.qvtm.qvtcas
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <qvtc:CoreModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:qvtb="http://www.eclipse.org/qvt/0.9/QVTbase" xmlns:qvtc="http://www.eclipse.org/qvt/0.9/QVTcore"
-    xmlns:qvtcb="http://www.eclipse.org/qvt/0.9/QVTcoreBase" xsi:schemaLocation="http://www.eclipse.org/qvt/0.9/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/0.9/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/0.9/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage">
+    xmlns:qvtb="http://www.eclipse.org/qvt/2015/QVTbase" xmlns:qvtc="http://www.eclipse.org/qvt/2015/QVTcore"
+    xmlns:qvtcb="http://www.eclipse.org/qvt/2015/QVTcoreBase" xsi:schemaLocation="http://www.eclipse.org/qvt/2015/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/2015/QVTcore java://org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage http://www.eclipse.org/qvt/2015/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage">
   <nestedPackage xsi:type="qvtb:Transformation" xmi:id="T.umlRdbms" name="umlRdbms">
     <modelParameter name="uml" usedPackage="http://www.eclipse.org/qvt/examples/0.1/simpleUML.oclas#P.simpleuml"/>
     <modelParameter name="rdbms" usedPackage="http://www.eclipse.org/qvt/examples/0.1/SimpleRDBMS.oclas#P.simplerdbms"/>
diff --git a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF
index a5e52ad80..854e7ed85 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtbase.tests
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.junit;visibility:=reexport,
  org.eclipse.emf.mapping.ecore2xml;visibility:=reexport,
- org.eclipse.ocl.examples.xtext.essentialocl;visibility:=reexport,
+ org.eclipse.ocl.xtext.essentialocl;visibility:=reexport,
  org.apache.log4j;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.uml2.uml.resources;visibility:=reexport,
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/META-INF/MANIFEST.MF
index 41f940ee3..dae9b8dae 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtcore.tests;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF
index 68f7c2911..47bc4b13a 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtimperative.tests;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
@@ -16,7 +16,7 @@ Require-Bundle: org.junit,
  org.eclipse.qvtd.xtext.qvtimperative,
  org.eclipse.qvtd.xtext.qvtbase.tests,
  org.eclipse.ocl.examples.emf.validation.validity,
- org.eclipse.ocl.examples.xtext.completeocl
+ org.eclipse.ocl.xtext.completeocl
 Export-Package: org.eclipse.qvtd.xtext.qvtimperative.tests,
  test.simplerdbms,
  test.simplerdbms.impl,
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/Graph2GraphHierarchical/Graph2GraphHierarchical.ref.qvtias b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/Graph2GraphHierarchical/Graph2GraphHierarchical.ref.qvtias
index 416346015..014012c6a 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/Graph2GraphHierarchical/Graph2GraphHierarchical.ref.qvtias
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/Graph2GraphHierarchical/Graph2GraphHierarchical.ref.qvtias
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <qvti:ImperativeModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/0.9/QVTbase"
-    xmlns:qvtcb="http://www.eclipse.org/qvt/0.9/QVTcoreBase" xmlns:qvti="http://www.eclipse.org/qvt/0.9/QVTimperative"
-    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/0.9/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/0.9/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage http://www.eclipse.org/qvt/0.9/QVTimperative java://org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage"
+    xmlns:pivot="http://www.eclipse.org/ocl/3.1.0/Pivot" xmlns:qvtb="http://www.eclipse.org/qvt/2015/QVTbase"
+    xmlns:qvtcb="http://www.eclipse.org/qvt/2015/QVTcoreBase" xmlns:qvti="http://www.eclipse.org/qvt/2015/QVTimperative"
+    xsi:schemaLocation="http://www.eclipse.org/ocl/3.1.0/Pivot java://org.eclipse.ocl.examples.pivot.PivotPackage http://www.eclipse.org/qvt/2015/QVTbase java://org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage http://www.eclipse.org/qvt/2015/QVTcoreBase java://org.eclipse.qvtd.pivot.qvtcorebase.QVTcoreBasePackage http://www.eclipse.org/qvt/2015/QVTimperative java://org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage"
     name="Graph2GraphHierarchical.qvti" externalURI="file:/C:/GIT/org.eclipse.qvtd/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/bin/org/eclipse/qvtd/xtext/qvtimperative/tests/models/Graph2GraphHierarchical/Graph2GraphHierarchical.qvti">
   <ownedPackages xmi:id="P." name="">
     <ownedClasses xsi:type="qvtb:Transformation" xmi:id="T..CopyGraph" name="CopyGraph"
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/META-INF/MANIFEST.MF
index 723b0be59..08d47b809 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.xtext.qvtrelation.tests
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin