[500369] Regenerate AS

30 files changed, 837 insertions, 1171 deletions

diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/Area.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/Area.java
index 5eb021833..79f400491 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/Area.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/Area.java
@@ -14,7 +14,9 @@
  */
 package org.eclipse.qvtd.pivot.qvtimperative;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.ocl.pivot.Element;
+import org.eclipse.ocl.pivot.Property;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,6 +29,8 @@ import org.eclipse.ocl.pivot.Element;
  * <ul>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.Area#getGuardPattern <em>Guard Pattern</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.Area#getBottomPattern <em>Bottom Pattern</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.Area#getCheckedProperties <em>Checked Properties</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.Area#getEnforcedProperties <em>Enforced Properties</em>}</li>
  * </ul>
  *
  * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getArea()
@@ -87,4 +91,32 @@ public interface Area extends Element {
 	 */
 	void setBottomPattern(BottomPattern value);
 
+	/**
+	 * Returns the value of the '<em><b>Checked Properties</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.ocl.pivot.Property}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The properties whose accesses must be polled for readiness prior to use here.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Checked Properties</em>' reference list.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getArea_CheckedProperties()
+	 * @generated
+	 */
+	EList<Property> getCheckedProperties();
+
+	/**
+	 * Returns the value of the '<em><b>Enforced Properties</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.ocl.pivot.Property}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The properties whose assignments may be polled for readiness prior to use elsewhere.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Enforced Properties</em>' reference list.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getArea_EnforcedProperties()
+	 * @generated
+	 */
+	EList<Property> getEnforcedProperties();
+
 } // Area
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/BottomPattern.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/BottomPattern.java
index 40c353f07..7fd2e6c76 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/BottomPattern.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/BottomPattern.java
@@ -33,7 +33,7 @@ import org.eclipse.emf.common.util.EList;
  * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getBottomPattern()
  * @generated
  */
-public interface BottomPattern extends CorePattern {
+public interface BottomPattern extends ImperativePattern {
 	/**
 	 * Returns the value of the '<em><b>Area</b></em>' container reference.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.qvtd.pivot.qvtimperative.Area#getBottomPattern <em>Bottom Pattern</em>}'.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/GuardPattern.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/GuardPattern.java
index 842ebbf59..625b37468 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/GuardPattern.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/GuardPattern.java
@@ -30,7 +30,7 @@ package org.eclipse.qvtd.pivot.qvtimperative;
  * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getGuardPattern()
  * @generated
  */
-public interface GuardPattern extends CorePattern {
+public interface GuardPattern extends ImperativePattern {
 	/**
 	 * Returns the value of the '<em><b>Area</b></em>' container reference.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.qvtd.pivot.qvtimperative.Area#getGuardPattern <em>Guard Pattern</em>}'.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/ImperativeDomain.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/ImperativeDomain.java
index 5a941c4dc..29d9cd3e8 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/ImperativeDomain.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/ImperativeDomain.java
@@ -14,6 +14,8 @@
  */
 package org.eclipse.qvtd.pivot.qvtimperative;
 
+import org.eclipse.qvtd.pivot.qvtbase.Domain;
+
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Imperative Domain</b></em>'.
@@ -23,5 +25,5 @@ package org.eclipse.qvtd.pivot.qvtimperative;
  * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getImperativeDomain()
  * @generated
  */
-public interface ImperativeDomain extends CoreDomain, ImperativeArea {
+public interface ImperativeDomain extends Domain, Area {
 } // ImperativeDomain
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/ImperativePattern.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/ImperativePattern.java
new file mode 100644
index 000000000..26410628d
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/ImperativePattern.java
@@ -0,0 +1,59 @@
+/**
+ * <copyright>
+ * 
+ * Copyright (c) 2013, 2017 Willink Transformations and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   E.D.Willink - Initial API and implementation
+ * 
+ * </copyright>
+ */
+package org.eclipse.qvtd.pivot.qvtimperative;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.ocl.pivot.Variable;
+import org.eclipse.qvtd.pivot.qvtbase.Pattern;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Core Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern#getVariable <em>Variable</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getImperativePattern()
+ * @generated
+ */
+public interface ImperativePattern extends Pattern {
+	/**
+	 * Returns the value of the '<em><b>Variable</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.ocl.pivot.Variable}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Variable</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Variable</em>' containment reference list.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getImperativePattern_Variable()
+	 * @generated
+	 */
+	EList<Variable> getVariable();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	Area getArea();
+
+} // CorePattern
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/Mapping.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/Mapping.java
index 6945d2bfe..f68c02c3b 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/Mapping.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/Mapping.java
@@ -37,7 +37,7 @@ import org.eclipse.qvtd.pivot.qvtbase.Rule;
  * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMapping()
  * @generated
  */
-public interface Mapping extends Rule, ImperativeArea {
+public interface Mapping extends Rule, Area {
 	/**
 	 * Returns the value of the '<em><b>Mapping Statement</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java
index 61f47e86a..7a4a86c4c 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java
@@ -37,7 +37,7 @@ public interface QVTimperativeFactory extends EFactory {
 	 * @return a new object of class '<em>Bottom Pattern</em>'.
 	 * @generated
 	 */
-	BottomPattern createBottomPattern();
+	@NonNull BottomPattern createBottomPattern();
 
 	/**
 	 * Returns a new object of class '<em>Connection Assignment</em>'.
@@ -67,40 +67,13 @@ public interface QVTimperativeFactory extends EFactory {
 	@NonNull ConnectionVariable createConnectionVariable();
 
 	/**
-	 * Returns a new object of class '<em>Core Domain</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Core Domain</em>'.
-	 * @generated
-	 */
-	CoreDomain createCoreDomain();
-
-	/**
-	 * Returns a new object of class '<em>Core Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Core Pattern</em>'.
-	 * @generated
-	 */
-	CorePattern createCorePattern();
-
-	/**
 	 * Returns a new object of class '<em>Guard Pattern</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return a new object of class '<em>Guard Pattern</em>'.
 	 * @generated
 	 */
-	GuardPattern createGuardPattern();
-
-	/**
-	 * Returns a new object of class '<em>Imperative Bottom Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Imperative Bottom Pattern</em>'.
-	 * @generated
-	 */
-	@NonNull ImperativeBottomPattern createImperativeBottomPattern();
+	@NonNull GuardPattern createGuardPattern();
 
 	/**
 	 * Returns a new object of class '<em>Imperative Domain</em>'.
@@ -121,6 +94,15 @@ public interface QVTimperativeFactory extends EFactory {
 	@NonNull ImperativeModel createImperativeModel();
 
 	/**
+	 * Returns a new object of class '<em>Imperative Pattern</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Imperative Pattern</em>'.
+	 * @generated
+	 */
+	@NonNull ImperativePattern createImperativePattern();
+
+	/**
 	 * Returns a new object of class '<em>Mapping</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -172,7 +154,7 @@ public interface QVTimperativeFactory extends EFactory {
 	 * @return a new object of class '<em>Opposite Property Assignment</em>'.
 	 * @generated
 	 */
-	OppositePropertyAssignment createOppositePropertyAssignment();
+	@NonNull OppositePropertyAssignment createOppositePropertyAssignment();
 
 	/**
 	 * Returns a new object of class '<em>Property Assignment</em>'.
@@ -181,7 +163,7 @@ public interface QVTimperativeFactory extends EFactory {
 	 * @return a new object of class '<em>Property Assignment</em>'.
 	 * @generated
 	 */
-	PropertyAssignment createPropertyAssignment();
+	@NonNull PropertyAssignment createPropertyAssignment();
 
 	/**
 	 * Returns a new object of class '<em>Realized Variable</em>'.
@@ -190,7 +172,7 @@ public interface QVTimperativeFactory extends EFactory {
 	 * @return a new object of class '<em>Realized Variable</em>'.
 	 * @generated
 	 */
-	RealizedVariable createRealizedVariable();
+	@NonNull RealizedVariable createRealizedVariable();
 
 	/**
 	 * Returns a new object of class '<em>Variable Assignment</em>'.
@@ -199,7 +181,7 @@ public interface QVTimperativeFactory extends EFactory {
 	 * @return a new object of class '<em>Variable Assignment</em>'.
 	 * @generated
 	 */
-	VariableAssignment createVariableAssignment();
+	@NonNull VariableAssignment createVariableAssignment();
 
 	/**
 	 * Returns a new object of class '<em>Variable Predicate</em>'.
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 f15984882..7ca6dfb3b 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
@@ -31,18 +31,18 @@ import org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage;
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
  * The Package for an Imperative QVT transformation.
- *
+ * 
  * An Imperative QVT trabsformation is expected to be created by an autogenerator that observes the following run-time restrictions:
- *
+ * 
  * A mapping that my be re-invoked must have MappingCall.isInfinite set for every possible invocation.
- *
+ * 
  * A mapping that reads object slots before they are guaranteed to have been assigned must declare the slots property in a corresponding ImperativeArea.checkedProperties entry.
- *
+ * 
  * A mapping that assigns an object slot that any mapping may access before assignment is guaranteed must declare declare the slots property in a corresponding ImperativeArea.enforcedProperties entry.
- *
+ * 
  * All reads by Functions/Queries must be guaranteed to succeed; i.e. the invoking mapping must check readiness before calling the query.
- *
- * All writes to multi-valued properties must be guaranteed to occur before any read of the property.
+ * 
+ * All writes to multi-valued properties must be guaranteed to occur before any read of the property. 
  * <!-- end-model-doc -->
  * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativeFactory
  * @generated
@@ -153,13 +153,31 @@ public interface QVTimperativePackage extends EPackage {
 	int AREA__BOTTOM_PATTERN = PivotPackage.ELEMENT_FEATURE_COUNT + 1;
 
 	/**
+	 * The feature id for the '<em><b>Checked Properties</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AREA__CHECKED_PROPERTIES = PivotPackage.ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Enforced Properties</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AREA__ENFORCED_PROPERTIES = PivotPackage.ELEMENT_FEATURE_COUNT + 3;
+
+	/**
 	 * The number of structural features of the '<em>Area</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int AREA_FEATURE_COUNT = PivotPackage.ELEMENT_FEATURE_COUNT + 2;
+	int AREA_FEATURE_COUNT = PivotPackage.ELEMENT_FEATURE_COUNT + 4;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.AssignmentImpl <em>Assignment</em>}' class.
@@ -244,14 +262,14 @@ public interface QVTimperativePackage extends EPackage {
 	int ASSIGNMENT_FEATURE_COUNT = PivotPackage.ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.CorePatternImpl <em>Core Pattern</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativePatternImpl <em>Imperative Pattern</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.CorePatternImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getCorePattern()
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativePatternImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativePattern()
 	 * @generated
 	 */
-	int CORE_PATTERN = 7;
+	int IMPERATIVE_PATTERN = 9;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -260,7 +278,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CORE_PATTERN__ANNOTATING_COMMENTS = QVTbasePackage.PATTERN__ANNOTATING_COMMENTS;
+	int IMPERATIVE_PATTERN__ANNOTATING_COMMENTS = QVTbasePackage.PATTERN__ANNOTATING_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
@@ -269,7 +287,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CORE_PATTERN__OWNED_ANNOTATIONS = QVTbasePackage.PATTERN__OWNED_ANNOTATIONS;
+	int IMPERATIVE_PATTERN__OWNED_ANNOTATIONS = QVTbasePackage.PATTERN__OWNED_ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
@@ -278,7 +296,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CORE_PATTERN__OWNED_COMMENTS = QVTbasePackage.PATTERN__OWNED_COMMENTS;
+	int IMPERATIVE_PATTERN__OWNED_COMMENTS = QVTbasePackage.PATTERN__OWNED_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
@@ -287,7 +305,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CORE_PATTERN__OWNED_EXTENSIONS = QVTbasePackage.PATTERN__OWNED_EXTENSIONS;
+	int IMPERATIVE_PATTERN__OWNED_EXTENSIONS = QVTbasePackage.PATTERN__OWNED_EXTENSIONS;
 
 	/**
 	 * The feature id for the '<em><b>Predicate</b></em>' containment reference list.
@@ -296,7 +314,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CORE_PATTERN__PREDICATE = QVTbasePackage.PATTERN__PREDICATE;
+	int IMPERATIVE_PATTERN__PREDICATE = QVTbasePackage.PATTERN__PREDICATE;
 
 	/**
 	 * The feature id for the '<em><b>Binds To</b></em>' reference list.
@@ -305,7 +323,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CORE_PATTERN__BINDS_TO = QVTbasePackage.PATTERN__BINDS_TO;
+	int IMPERATIVE_PATTERN__BINDS_TO = QVTbasePackage.PATTERN__BINDS_TO;
 
 	/**
 	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
@@ -314,16 +332,16 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CORE_PATTERN__VARIABLE = QVTbasePackage.PATTERN_FEATURE_COUNT + 0;
+	int IMPERATIVE_PATTERN__VARIABLE = QVTbasePackage.PATTERN_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Core Pattern</em>' class.
+	 * The number of structural features of the '<em>Imperative Pattern</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CORE_PATTERN_FEATURE_COUNT = QVTbasePackage.PATTERN_FEATURE_COUNT + 1;
+	int IMPERATIVE_PATTERN_FEATURE_COUNT = QVTbasePackage.PATTERN_FEATURE_COUNT + 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.BottomPatternImpl <em>Bottom Pattern</em>}' class.
@@ -342,7 +360,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN__ANNOTATING_COMMENTS = CORE_PATTERN__ANNOTATING_COMMENTS;
+	int BOTTOM_PATTERN__ANNOTATING_COMMENTS = IMPERATIVE_PATTERN__ANNOTATING_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
@@ -351,7 +369,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN__OWNED_ANNOTATIONS = CORE_PATTERN__OWNED_ANNOTATIONS;
+	int BOTTOM_PATTERN__OWNED_ANNOTATIONS = IMPERATIVE_PATTERN__OWNED_ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
@@ -360,7 +378,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN__OWNED_COMMENTS = CORE_PATTERN__OWNED_COMMENTS;
+	int BOTTOM_PATTERN__OWNED_COMMENTS = IMPERATIVE_PATTERN__OWNED_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
@@ -369,7 +387,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN__OWNED_EXTENSIONS = CORE_PATTERN__OWNED_EXTENSIONS;
+	int BOTTOM_PATTERN__OWNED_EXTENSIONS = IMPERATIVE_PATTERN__OWNED_EXTENSIONS;
 
 	/**
 	 * The feature id for the '<em><b>Predicate</b></em>' containment reference list.
@@ -378,7 +396,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN__PREDICATE = CORE_PATTERN__PREDICATE;
+	int BOTTOM_PATTERN__PREDICATE = IMPERATIVE_PATTERN__PREDICATE;
 
 	/**
 	 * The feature id for the '<em><b>Binds To</b></em>' reference list.
@@ -387,7 +405,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN__BINDS_TO = CORE_PATTERN__BINDS_TO;
+	int BOTTOM_PATTERN__BINDS_TO = IMPERATIVE_PATTERN__BINDS_TO;
 
 	/**
 	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
@@ -396,7 +414,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN__VARIABLE = CORE_PATTERN__VARIABLE;
+	int BOTTOM_PATTERN__VARIABLE = IMPERATIVE_PATTERN__VARIABLE;
 
 	/**
 	 * The feature id for the '<em><b>Area</b></em>' container reference.
@@ -405,7 +423,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN__AREA = CORE_PATTERN_FEATURE_COUNT + 0;
+	int BOTTOM_PATTERN__AREA = IMPERATIVE_PATTERN_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Assignment</b></em>' containment reference list.
@@ -414,7 +432,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN__ASSIGNMENT = CORE_PATTERN_FEATURE_COUNT + 1;
+	int BOTTOM_PATTERN__ASSIGNMENT = IMPERATIVE_PATTERN_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Realized Variable</b></em>' containment reference list.
@@ -423,7 +441,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN__REALIZED_VARIABLE = CORE_PATTERN_FEATURE_COUNT + 2;
+	int BOTTOM_PATTERN__REALIZED_VARIABLE = IMPERATIVE_PATTERN_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of structural features of the '<em>Bottom Pattern</em>' class.
@@ -432,7 +450,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int BOTTOM_PATTERN_FEATURE_COUNT = CORE_PATTERN_FEATURE_COUNT + 3;
+	int BOTTOM_PATTERN_FEATURE_COUNT = IMPERATIVE_PATTERN_FEATURE_COUNT + 3;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ConnectionAssignmentImpl <em>Connection Assignment</em>}' class.
@@ -526,36 +544,6 @@ public interface QVTimperativePackage extends EPackage {
 	int CONNECTION_ASSIGNMENT_FEATURE_COUNT = ASSIGNMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea <em>Imperative Area</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeArea()
-	 * @generated
-	 */
-	int IMPERATIVE_AREA = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeBottomPatternImpl <em>Imperative Bottom Pattern</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeBottomPatternImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeBottomPattern()
-	 * @generated
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN = 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl <em>Imperative Domain</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeDomain()
-	 * @generated
-	 */
-	int IMPERATIVE_DOMAIN = 11;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeModelImpl <em>Imperative Model</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -563,7 +551,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeModel()
 	 * @generated
 	 */
-	int IMPERATIVE_MODEL = 12;
+	int IMPERATIVE_MODEL = 8;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingImpl <em>Mapping</em>}' class.
@@ -573,7 +561,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMapping()
 	 * @generated
 	 */
-	int MAPPING = 13;
+	int MAPPING = 10;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingStatementImpl <em>Mapping Statement</em>}' class.
@@ -583,7 +571,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingStatement()
 	 * @generated
 	 */
-	int MAPPING_STATEMENT = 18;
+	int MAPPING_STATEMENT = 15;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -921,124 +909,6 @@ public interface QVTimperativePackage extends EPackage {
 	int CONNECTION_VARIABLE_FEATURE_COUNT = PivotPackage.VARIABLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.CoreDomainImpl <em>Core Domain</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.CoreDomainImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getCoreDomain()
-	 * @generated
-	 */
-	int CORE_DOMAIN = 6;
-
-	/**
-	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__ANNOTATING_COMMENTS = QVTbasePackage.DOMAIN__ANNOTATING_COMMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__OWNED_ANNOTATIONS = QVTbasePackage.DOMAIN__OWNED_ANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__OWNED_COMMENTS = QVTbasePackage.DOMAIN__OWNED_COMMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__OWNED_EXTENSIONS = QVTbasePackage.DOMAIN__OWNED_EXTENSIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__NAME = QVTbasePackage.DOMAIN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Is Checkable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__IS_CHECKABLE = QVTbasePackage.DOMAIN__IS_CHECKABLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Enforceable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__IS_ENFORCEABLE = QVTbasePackage.DOMAIN__IS_ENFORCEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Rule</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__RULE = QVTbasePackage.DOMAIN__RULE;
-
-	/**
-	 * The feature id for the '<em><b>Typed Model</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__TYPED_MODEL = QVTbasePackage.DOMAIN__TYPED_MODEL;
-
-	/**
-	 * The feature id for the '<em><b>Guard Pattern</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__GUARD_PATTERN = QVTbasePackage.DOMAIN_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Bottom Pattern</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN__BOTTOM_PATTERN = QVTbasePackage.DOMAIN_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Core Domain</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CORE_DOMAIN_FEATURE_COUNT = QVTbasePackage.DOMAIN_FEATURE_COUNT + 2;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.GuardPatternImpl <em>Guard Pattern</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1046,7 +916,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getGuardPattern()
 	 * @generated
 	 */
-	int GUARD_PATTERN = 8;
+	int GUARD_PATTERN = 6;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -1055,7 +925,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int GUARD_PATTERN__ANNOTATING_COMMENTS = CORE_PATTERN__ANNOTATING_COMMENTS;
+	int GUARD_PATTERN__ANNOTATING_COMMENTS = IMPERATIVE_PATTERN__ANNOTATING_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
@@ -1064,7 +934,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int GUARD_PATTERN__OWNED_ANNOTATIONS = CORE_PATTERN__OWNED_ANNOTATIONS;
+	int GUARD_PATTERN__OWNED_ANNOTATIONS = IMPERATIVE_PATTERN__OWNED_ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
@@ -1073,7 +943,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int GUARD_PATTERN__OWNED_COMMENTS = CORE_PATTERN__OWNED_COMMENTS;
+	int GUARD_PATTERN__OWNED_COMMENTS = IMPERATIVE_PATTERN__OWNED_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
@@ -1082,7 +952,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int GUARD_PATTERN__OWNED_EXTENSIONS = CORE_PATTERN__OWNED_EXTENSIONS;
+	int GUARD_PATTERN__OWNED_EXTENSIONS = IMPERATIVE_PATTERN__OWNED_EXTENSIONS;
 
 	/**
 	 * The feature id for the '<em><b>Predicate</b></em>' containment reference list.
@@ -1091,7 +961,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int GUARD_PATTERN__PREDICATE = CORE_PATTERN__PREDICATE;
+	int GUARD_PATTERN__PREDICATE = IMPERATIVE_PATTERN__PREDICATE;
 
 	/**
 	 * The feature id for the '<em><b>Binds To</b></em>' reference list.
@@ -1100,7 +970,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int GUARD_PATTERN__BINDS_TO = CORE_PATTERN__BINDS_TO;
+	int GUARD_PATTERN__BINDS_TO = IMPERATIVE_PATTERN__BINDS_TO;
 
 	/**
 	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
@@ -1109,7 +979,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int GUARD_PATTERN__VARIABLE = CORE_PATTERN__VARIABLE;
+	int GUARD_PATTERN__VARIABLE = IMPERATIVE_PATTERN__VARIABLE;
 
 	/**
 	 * The feature id for the '<em><b>Area</b></em>' container reference.
@@ -1118,7 +988,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int GUARD_PATTERN__AREA = CORE_PATTERN_FEATURE_COUNT + 0;
+	int GUARD_PATTERN__AREA = IMPERATIVE_PATTERN_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>Guard Pattern</em>' class.
@@ -1127,196 +997,17 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int GUARD_PATTERN_FEATURE_COUNT = CORE_PATTERN_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_AREA__ANNOTATING_COMMENTS = AREA__ANNOTATING_COMMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_AREA__OWNED_ANNOTATIONS = AREA__OWNED_ANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_AREA__OWNED_COMMENTS = AREA__OWNED_COMMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_AREA__OWNED_EXTENSIONS = AREA__OWNED_EXTENSIONS;
-
-	/**
-	 * The feature id for the '<em><b>Guard Pattern</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_AREA__GUARD_PATTERN = AREA__GUARD_PATTERN;
-
-	/**
-	 * The feature id for the '<em><b>Bottom Pattern</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_AREA__BOTTOM_PATTERN = AREA__BOTTOM_PATTERN;
-
-	/**
-	 * The feature id for the '<em><b>Checked Properties</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_AREA__CHECKED_PROPERTIES = AREA_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Enforced Properties</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_AREA__ENFORCED_PROPERTIES = AREA_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Imperative Area</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_AREA_FEATURE_COUNT = AREA_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__ANNOTATING_COMMENTS = BOTTOM_PATTERN__ANNOTATING_COMMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__OWNED_ANNOTATIONS = BOTTOM_PATTERN__OWNED_ANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__OWNED_COMMENTS = BOTTOM_PATTERN__OWNED_COMMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__OWNED_EXTENSIONS = BOTTOM_PATTERN__OWNED_EXTENSIONS;
-
-	/**
-	 * The feature id for the '<em><b>Predicate</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__PREDICATE = BOTTOM_PATTERN__PREDICATE;
-
-	/**
-	 * The feature id for the '<em><b>Binds To</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__BINDS_TO = BOTTOM_PATTERN__BINDS_TO;
-
-	/**
-	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__VARIABLE = BOTTOM_PATTERN__VARIABLE;
-
-	/**
-	 * The feature id for the '<em><b>Area</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__AREA = BOTTOM_PATTERN__AREA;
-
-	/**
-	 * The feature id for the '<em><b>Assignment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__ASSIGNMENT = BOTTOM_PATTERN__ASSIGNMENT;
-
-	/**
-	 * The feature id for the '<em><b>Realized Variable</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__REALIZED_VARIABLE = BOTTOM_PATTERN__REALIZED_VARIABLE;
-
-	/**
-	 * The feature id for the '<em><b>Ordered Assignment</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPERATIVE_BOTTOM_PATTERN__ORDERED_ASSIGNMENT = BOTTOM_PATTERN_FEATURE_COUNT + 0;
+	int GUARD_PATTERN_FEATURE_COUNT = IMPERATIVE_PATTERN_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Imperative Bottom Pattern</em>' class.
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl <em>Imperative Domain</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeDomain()
 	 * @generated
-	 * @ordered
 	 */
-	int IMPERATIVE_BOTTOM_PATTERN_FEATURE_COUNT = BOTTOM_PATTERN_FEATURE_COUNT + 1;
+	int IMPERATIVE_DOMAIN = 7;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -1325,7 +1016,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__ANNOTATING_COMMENTS = CORE_DOMAIN__ANNOTATING_COMMENTS;
+	int IMPERATIVE_DOMAIN__ANNOTATING_COMMENTS = QVTbasePackage.DOMAIN__ANNOTATING_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
@@ -1334,7 +1025,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__OWNED_ANNOTATIONS = CORE_DOMAIN__OWNED_ANNOTATIONS;
+	int IMPERATIVE_DOMAIN__OWNED_ANNOTATIONS = QVTbasePackage.DOMAIN__OWNED_ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
@@ -1343,7 +1034,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__OWNED_COMMENTS = CORE_DOMAIN__OWNED_COMMENTS;
+	int IMPERATIVE_DOMAIN__OWNED_COMMENTS = QVTbasePackage.DOMAIN__OWNED_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
@@ -1352,7 +1043,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__OWNED_EXTENSIONS = CORE_DOMAIN__OWNED_EXTENSIONS;
+	int IMPERATIVE_DOMAIN__OWNED_EXTENSIONS = QVTbasePackage.DOMAIN__OWNED_EXTENSIONS;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1361,7 +1052,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__NAME = CORE_DOMAIN__NAME;
+	int IMPERATIVE_DOMAIN__NAME = QVTbasePackage.DOMAIN__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Is Checkable</b></em>' attribute.
@@ -1370,7 +1061,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__IS_CHECKABLE = CORE_DOMAIN__IS_CHECKABLE;
+	int IMPERATIVE_DOMAIN__IS_CHECKABLE = QVTbasePackage.DOMAIN__IS_CHECKABLE;
 
 	/**
 	 * The feature id for the '<em><b>Is Enforceable</b></em>' attribute.
@@ -1379,7 +1070,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__IS_ENFORCEABLE = CORE_DOMAIN__IS_ENFORCEABLE;
+	int IMPERATIVE_DOMAIN__IS_ENFORCEABLE = QVTbasePackage.DOMAIN__IS_ENFORCEABLE;
 
 	/**
 	 * The feature id for the '<em><b>Rule</b></em>' container reference.
@@ -1388,7 +1079,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__RULE = CORE_DOMAIN__RULE;
+	int IMPERATIVE_DOMAIN__RULE = QVTbasePackage.DOMAIN__RULE;
 
 	/**
 	 * The feature id for the '<em><b>Typed Model</b></em>' reference.
@@ -1397,7 +1088,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__TYPED_MODEL = CORE_DOMAIN__TYPED_MODEL;
+	int IMPERATIVE_DOMAIN__TYPED_MODEL = QVTbasePackage.DOMAIN__TYPED_MODEL;
 
 	/**
 	 * The feature id for the '<em><b>Guard Pattern</b></em>' containment reference.
@@ -1406,7 +1097,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__GUARD_PATTERN = CORE_DOMAIN__GUARD_PATTERN;
+	int IMPERATIVE_DOMAIN__GUARD_PATTERN = QVTbasePackage.DOMAIN_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Bottom Pattern</b></em>' containment reference.
@@ -1415,7 +1106,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__BOTTOM_PATTERN = CORE_DOMAIN__BOTTOM_PATTERN;
+	int IMPERATIVE_DOMAIN__BOTTOM_PATTERN = QVTbasePackage.DOMAIN_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Checked Properties</b></em>' reference list.
@@ -1424,7 +1115,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__CHECKED_PROPERTIES = CORE_DOMAIN_FEATURE_COUNT + 0;
+	int IMPERATIVE_DOMAIN__CHECKED_PROPERTIES = QVTbasePackage.DOMAIN_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Enforced Properties</b></em>' reference list.
@@ -1433,7 +1124,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN__ENFORCED_PROPERTIES = CORE_DOMAIN_FEATURE_COUNT + 1;
+	int IMPERATIVE_DOMAIN__ENFORCED_PROPERTIES = QVTbasePackage.DOMAIN_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>Imperative Domain</em>' class.
@@ -1442,7 +1133,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int IMPERATIVE_DOMAIN_FEATURE_COUNT = CORE_DOMAIN_FEATURE_COUNT + 2;
+	int IMPERATIVE_DOMAIN_FEATURE_COUNT = QVTbasePackage.DOMAIN_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -1704,7 +1395,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingCall()
 	 * @generated
 	 */
-	int MAPPING_CALL = 14;
+	int MAPPING_CALL = 11;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -1831,7 +1522,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingCallBinding()
 	 * @generated
 	 */
-	int MAPPING_CALL_BINDING = 15;
+	int MAPPING_CALL_BINDING = 12;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -1922,7 +1613,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingLoop()
 	 * @generated
 	 */
-	int MAPPING_LOOP = 16;
+	int MAPPING_LOOP = 13;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -2067,7 +1758,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingSequence()
 	 * @generated
 	 */
-	int MAPPING_SEQUENCE = 17;
+	int MAPPING_SEQUENCE = 14;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -2176,7 +1867,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getNavigationAssignment()
 	 * @generated
 	 */
-	int NAVIGATION_ASSIGNMENT = 19;
+	int NAVIGATION_ASSIGNMENT = 16;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -2267,7 +1958,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getOppositePropertyAssignment()
 	 * @generated
 	 */
-	int OPPOSITE_PROPERTY_ASSIGNMENT = 20;
+	int OPPOSITE_PROPERTY_ASSIGNMENT = 17;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -2367,7 +2058,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getPropertyAssignment()
 	 * @generated
 	 */
-	int PROPERTY_ASSIGNMENT = 21;
+	int PROPERTY_ASSIGNMENT = 18;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -2467,7 +2158,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getRealizedVariable()
 	 * @generated
 	 */
-	int REALIZED_VARIABLE = 22;
+	int REALIZED_VARIABLE = 19;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -2594,7 +2285,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getVariableAssignment()
 	 * @generated
 	 */
-	int VARIABLE_ASSIGNMENT = 23;
+	int VARIABLE_ASSIGNMENT = 20;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -2685,7 +2376,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getVariablePredicate()
 	 * @generated
 	 */
-	int VARIABLE_PREDICATE = 24;
+	int VARIABLE_PREDICATE = 21;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -2792,6 +2483,28 @@ public interface QVTimperativePackage extends EPackage {
 	EReference getArea_BottomPattern();
 
 	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.qvtd.pivot.qvtimperative.Area#getCheckedProperties <em>Checked Properties</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Checked Properties</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.Area#getCheckedProperties()
+	 * @see #getArea()
+	 * @generated
+	 */
+	EReference getArea_CheckedProperties();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.qvtd.pivot.qvtimperative.Area#getEnforcedProperties <em>Enforced Properties</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Enforced Properties</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.Area#getEnforcedProperties()
+	 * @see #getArea()
+	 * @generated
+	 */
+	EReference getArea_EnforcedProperties();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.Assignment <em>Assignment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2941,37 +2654,6 @@ public interface QVTimperativePackage extends EPackage {
 	EClass getConnectionVariable();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.CoreDomain <em>Core Domain</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Core Domain</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.CoreDomain
-	 * @generated
-	 */
-	EClass getCoreDomain();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.CorePattern <em>Core Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Core Pattern</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.CorePattern
-	 * @generated
-	 */
-	EClass getCorePattern();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.qvtd.pivot.qvtimperative.CorePattern#getVariable <em>Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Variable</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.CorePattern#getVariable()
-	 * @see #getCorePattern()
-	 * @generated
-	 */
-	EReference getCorePattern_Variable();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.GuardPattern <em>Guard Pattern</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2993,77 +2675,45 @@ public interface QVTimperativePackage extends EPackage {
 	EReference getGuardPattern_Area();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea <em>Imperative Area</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Imperative Area</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea
-	 * @generated
-	 */
-	EClass getImperativeArea();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea#getCheckedProperties <em>Checked Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Checked Properties</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea#getCheckedProperties()
-	 * @see #getImperativeArea()
-	 * @generated
-	 */
-	EReference getImperativeArea_CheckedProperties();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea#getEnforcedProperties <em>Enforced Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Enforced Properties</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea#getEnforcedProperties()
-	 * @see #getImperativeArea()
-	 * @generated
-	 */
-	EReference getImperativeArea_EnforcedProperties();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeBottomPattern <em>Imperative Bottom Pattern</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain <em>Imperative Domain</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Imperative Bottom Pattern</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeBottomPattern
+	 * @return the meta object for class '<em>Imperative Domain</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain
 	 * @generated
 	 */
-	EClass getImperativeBottomPattern();
+	EClass getImperativeDomain();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeBottomPattern#getOrderedAssignment <em>Ordered Assignment</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel <em>Imperative Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Ordered Assignment</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeBottomPattern#getOrderedAssignment()
-	 * @see #getImperativeBottomPattern()
+	 * @return the meta object for class '<em>Imperative Model</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel
 	 * @generated
 	 */
-	EReference getImperativeBottomPattern_OrderedAssignment();
+	EClass getImperativeModel();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain <em>Imperative Domain</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern <em>Imperative Pattern</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Imperative Domain</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain
+	 * @return the meta object for class '<em>Imperative Pattern</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern
 	 * @generated
 	 */
-	EClass getImperativeDomain();
+	EClass getImperativePattern();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel <em>Imperative Model</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern#getVariable <em>Variable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Imperative Model</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel
+	 * @return the meta object for the containment reference list '<em>Variable</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern#getVariable()
+	 * @see #getImperativePattern()
 	 * @generated
 	 */
-	EClass getImperativeModel();
+	EReference getImperativePattern_Variable();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.Mapping <em>Mapping</em>}'.
@@ -3432,6 +3082,22 @@ public interface QVTimperativePackage extends EPackage {
 		EReference AREA__BOTTOM_PATTERN = eINSTANCE.getArea_BottomPattern();
 
 		/**
+		 * The meta object literal for the '<em><b>Checked Properties</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference AREA__CHECKED_PROPERTIES = eINSTANCE.getArea_CheckedProperties();
+
+		/**
+		 * The meta object literal for the '<em><b>Enforced Properties</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference AREA__ENFORCED_PROPERTIES = eINSTANCE.getArea_EnforcedProperties();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.AssignmentImpl <em>Assignment</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -3554,34 +3220,6 @@ public interface QVTimperativePackage extends EPackage {
 		EClass CONNECTION_VARIABLE = eINSTANCE.getConnectionVariable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.CoreDomainImpl <em>Core Domain</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.CoreDomainImpl
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getCoreDomain()
-		 * @generated
-		 */
-		EClass CORE_DOMAIN = eINSTANCE.getCoreDomain();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.CorePatternImpl <em>Core Pattern</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.CorePatternImpl
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getCorePattern()
-		 * @generated
-		 */
-		EClass CORE_PATTERN = eINSTANCE.getCorePattern();
-
-		/**
-		 * The meta object literal for the '<em><b>Variable</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CORE_PATTERN__VARIABLE = eINSTANCE.getCorePattern_Variable();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.GuardPatternImpl <em>Guard Pattern</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -3600,68 +3238,42 @@ public interface QVTimperativePackage extends EPackage {
 		EReference GUARD_PATTERN__AREA = eINSTANCE.getGuardPattern_Area();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea <em>Imperative Area</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeArea()
-		 * @generated
-		 */
-		EClass IMPERATIVE_AREA = eINSTANCE.getImperativeArea();
-
-		/**
-		 * The meta object literal for the '<em><b>Checked Properties</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference IMPERATIVE_AREA__CHECKED_PROPERTIES = eINSTANCE.getImperativeArea_CheckedProperties();
-
-		/**
-		 * The meta object literal for the '<em><b>Enforced Properties</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference IMPERATIVE_AREA__ENFORCED_PROPERTIES = eINSTANCE.getImperativeArea_EnforcedProperties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeBottomPatternImpl <em>Imperative Bottom Pattern</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl <em>Imperative Domain</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeBottomPatternImpl
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeBottomPattern()
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeDomain()
 		 * @generated
 		 */
-		EClass IMPERATIVE_BOTTOM_PATTERN = eINSTANCE.getImperativeBottomPattern();
+		EClass IMPERATIVE_DOMAIN = eINSTANCE.getImperativeDomain();
 
 		/**
-		 * The meta object literal for the '<em><b>Ordered Assignment</b></em>' reference list feature.
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeModelImpl <em>Imperative Model</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeModelImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeModel()
 		 * @generated
 		 */
-		EReference IMPERATIVE_BOTTOM_PATTERN__ORDERED_ASSIGNMENT = eINSTANCE.getImperativeBottomPattern_OrderedAssignment();
+		EClass IMPERATIVE_MODEL = eINSTANCE.getImperativeModel();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl <em>Imperative Domain</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativePatternImpl <em>Imperative Pattern</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeDomain()
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativePatternImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativePattern()
 		 * @generated
 		 */
-		EClass IMPERATIVE_DOMAIN = eINSTANCE.getImperativeDomain();
+		EClass IMPERATIVE_PATTERN = eINSTANCE.getImperativePattern();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeModelImpl <em>Imperative Model</em>}' class.
+		 * The meta object literal for the '<em><b>Variable</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeModelImpl
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeModel()
 		 * @generated
 		 */
-		EClass IMPERATIVE_MODEL = eINSTANCE.getImperativeModel();
+		EReference IMPERATIVE_PATTERN__VARIABLE = eINSTANCE.getImperativePattern_Variable();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingImpl <em>Mapping</em>}' class.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/BottomPatternImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/BottomPatternImpl.java
index ae493c440..f4bdccb0e 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/BottomPatternImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/BottomPatternImpl.java
@@ -50,7 +50,7 @@ import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
  *
  * @generated
  */
-public class BottomPatternImpl extends CorePatternImpl implements BottomPattern {
+public class BottomPatternImpl extends ImperativePatternImpl implements BottomPattern {
 	/**
 	 * The cached value of the '{@link #getAssignment() <em>Assignment</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/GuardPatternImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/GuardPatternImpl.java
index e498b9cfb..0cb9bb807 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/GuardPatternImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/GuardPatternImpl.java
@@ -47,7 +47,7 @@ import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
  *
  * @generated
  */
-public class GuardPatternImpl extends CorePatternImpl implements GuardPattern {
+public class GuardPatternImpl extends ImperativePatternImpl implements GuardPattern {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/ImperativeDomainImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/ImperativeDomainImpl.java
index 302a210bd..6402c9af8 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/ImperativeDomainImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/ImperativeDomainImpl.java
@@ -16,13 +16,20 @@ package org.eclipse.qvtd.pivot.qvtimperative.impl;
 
 import java.util.Collection;
 
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.ocl.pivot.Property;
 import org.eclipse.ocl.pivot.util.Visitor;
-import org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea;
+import org.eclipse.qvtd.pivot.qvtbase.impl.DomainImpl;
+import org.eclipse.qvtd.pivot.qvtimperative.Area;
+import org.eclipse.qvtd.pivot.qvtimperative.BottomPattern;
+import org.eclipse.qvtd.pivot.qvtimperative.GuardPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
 import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
@@ -35,13 +42,35 @@ import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
  * The following features are implemented:
  * </p>
  * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl#getGuardPattern <em>Guard Pattern</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl#getBottomPattern <em>Bottom Pattern</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl#getCheckedProperties <em>Checked Properties</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeDomainImpl#getEnforcedProperties <em>Enforced Properties</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class ImperativeDomainImpl extends CoreDomainImpl implements ImperativeDomain {
+public class ImperativeDomainImpl extends DomainImpl implements ImperativeDomain {
+	/**
+	 * The cached value of the '{@link #getGuardPattern() <em>Guard Pattern</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGuardPattern()
+	 * @generated
+	 * @ordered
+	 */
+	protected GuardPattern guardPattern;
+
+	/**
+	 * The cached value of the '{@link #getBottomPattern() <em>Bottom Pattern</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBottomPattern()
+	 * @generated
+	 * @ordered
+	 */
+	protected BottomPattern bottomPattern;
+
 	/**
 	 * The cached value of the '{@link #getCheckedProperties() <em>Checked Properties</em>}' reference list.
 	 * <!-- begin-user-doc -->
@@ -87,6 +116,96 @@ public class ImperativeDomainImpl extends CoreDomainImpl implements ImperativeDo
 	 * @generated
 	 */
 	@Override
+	public GuardPattern getGuardPattern() {
+		return guardPattern;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetGuardPattern(GuardPattern newGuardPattern, NotificationChain msgs) {
+		GuardPattern oldGuardPattern = guardPattern;
+		guardPattern = newGuardPattern;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN, oldGuardPattern, newGuardPattern);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setGuardPattern(GuardPattern newGuardPattern) {
+		if (newGuardPattern != guardPattern) {
+			NotificationChain msgs = null;
+			if (guardPattern != null)
+				msgs = ((InternalEObject)guardPattern).eInverseRemove(this, QVTimperativePackage.GUARD_PATTERN__AREA, GuardPattern.class, msgs);
+			if (newGuardPattern != null)
+				msgs = ((InternalEObject)newGuardPattern).eInverseAdd(this, QVTimperativePackage.GUARD_PATTERN__AREA, GuardPattern.class, msgs);
+			msgs = basicSetGuardPattern(newGuardPattern, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN, newGuardPattern, newGuardPattern));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public BottomPattern getBottomPattern() {
+		return bottomPattern;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetBottomPattern(BottomPattern newBottomPattern, NotificationChain msgs) {
+		BottomPattern oldBottomPattern = bottomPattern;
+		bottomPattern = newBottomPattern;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN, oldBottomPattern, newBottomPattern);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setBottomPattern(BottomPattern newBottomPattern) {
+		if (newBottomPattern != bottomPattern) {
+			NotificationChain msgs = null;
+			if (bottomPattern != null)
+				msgs = ((InternalEObject)bottomPattern).eInverseRemove(this, QVTimperativePackage.BOTTOM_PATTERN__AREA, BottomPattern.class, msgs);
+			if (newBottomPattern != null)
+				msgs = ((InternalEObject)newBottomPattern).eInverseAdd(this, QVTimperativePackage.BOTTOM_PATTERN__AREA, BottomPattern.class, msgs);
+			msgs = basicSetBottomPattern(newBottomPattern, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN, newBottomPattern, newBottomPattern));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EList<Property> getCheckedProperties() {
 		if (checkedProperties == null) {
 			checkedProperties = new EObjectResolvingEList<Property>(Property.class, this, QVTimperativePackage.IMPERATIVE_DOMAIN__CHECKED_PROPERTIES);
@@ -113,8 +232,48 @@ public class ImperativeDomainImpl extends CoreDomainImpl implements ImperativeDo
 	 * @generated
 	 */
 	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN:
+				if (guardPattern != null)
+					msgs = ((InternalEObject)guardPattern).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN, null, msgs);
+				return basicSetGuardPattern((GuardPattern)otherEnd, msgs);
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN:
+				if (bottomPattern != null)
+					msgs = ((InternalEObject)bottomPattern).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN, null, msgs);
+				return basicSetBottomPattern((BottomPattern)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN:
+				return basicSetGuardPattern(null, msgs);
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN:
+				return basicSetBottomPattern(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN:
+				return getGuardPattern();
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN:
+				return getBottomPattern();
 			case QVTimperativePackage.IMPERATIVE_DOMAIN__CHECKED_PROPERTIES:
 				return getCheckedProperties();
 			case QVTimperativePackage.IMPERATIVE_DOMAIN__ENFORCED_PROPERTIES:
@@ -132,6 +291,12 @@ public class ImperativeDomainImpl extends CoreDomainImpl implements ImperativeDo
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN:
+				setGuardPattern((GuardPattern)newValue);
+				return;
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN:
+				setBottomPattern((BottomPattern)newValue);
+				return;
 			case QVTimperativePackage.IMPERATIVE_DOMAIN__CHECKED_PROPERTIES:
 				getCheckedProperties().clear();
 				getCheckedProperties().addAll((Collection<? extends Property>)newValue);
@@ -152,6 +317,12 @@ public class ImperativeDomainImpl extends CoreDomainImpl implements ImperativeDo
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN:
+				setGuardPattern((GuardPattern)null);
+				return;
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN:
+				setBottomPattern((BottomPattern)null);
+				return;
 			case QVTimperativePackage.IMPERATIVE_DOMAIN__CHECKED_PROPERTIES:
 				getCheckedProperties().clear();
 				return;
@@ -170,6 +341,10 @@ public class ImperativeDomainImpl extends CoreDomainImpl implements ImperativeDo
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN:
+				return guardPattern != null;
+			case QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN:
+				return bottomPattern != null;
 			case QVTimperativePackage.IMPERATIVE_DOMAIN__CHECKED_PROPERTIES:
 				return checkedProperties != null && !checkedProperties.isEmpty();
 			case QVTimperativePackage.IMPERATIVE_DOMAIN__ENFORCED_PROPERTIES:
@@ -185,10 +360,12 @@ public class ImperativeDomainImpl extends CoreDomainImpl implements ImperativeDo
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ImperativeArea.class) {
+		if (baseClass == Area.class) {
 			switch (derivedFeatureID) {
-				case QVTimperativePackage.IMPERATIVE_DOMAIN__CHECKED_PROPERTIES: return QVTimperativePackage.IMPERATIVE_AREA__CHECKED_PROPERTIES;
-				case QVTimperativePackage.IMPERATIVE_DOMAIN__ENFORCED_PROPERTIES: return QVTimperativePackage.IMPERATIVE_AREA__ENFORCED_PROPERTIES;
+				case QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN: return QVTimperativePackage.AREA__GUARD_PATTERN;
+				case QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN: return QVTimperativePackage.AREA__BOTTOM_PATTERN;
+				case QVTimperativePackage.IMPERATIVE_DOMAIN__CHECKED_PROPERTIES: return QVTimperativePackage.AREA__CHECKED_PROPERTIES;
+				case QVTimperativePackage.IMPERATIVE_DOMAIN__ENFORCED_PROPERTIES: return QVTimperativePackage.AREA__ENFORCED_PROPERTIES;
 				default: return -1;
 			}
 		}
@@ -202,10 +379,12 @@ public class ImperativeDomainImpl extends CoreDomainImpl implements ImperativeDo
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ImperativeArea.class) {
+		if (baseClass == Area.class) {
 			switch (baseFeatureID) {
-				case QVTimperativePackage.IMPERATIVE_AREA__CHECKED_PROPERTIES: return QVTimperativePackage.IMPERATIVE_DOMAIN__CHECKED_PROPERTIES;
-				case QVTimperativePackage.IMPERATIVE_AREA__ENFORCED_PROPERTIES: return QVTimperativePackage.IMPERATIVE_DOMAIN__ENFORCED_PROPERTIES;
+				case QVTimperativePackage.AREA__GUARD_PATTERN: return QVTimperativePackage.IMPERATIVE_DOMAIN__GUARD_PATTERN;
+				case QVTimperativePackage.AREA__BOTTOM_PATTERN: return QVTimperativePackage.IMPERATIVE_DOMAIN__BOTTOM_PATTERN;
+				case QVTimperativePackage.AREA__CHECKED_PROPERTIES: return QVTimperativePackage.IMPERATIVE_DOMAIN__CHECKED_PROPERTIES;
+				case QVTimperativePackage.AREA__ENFORCED_PROPERTIES: return QVTimperativePackage.IMPERATIVE_DOMAIN__ENFORCED_PROPERTIES;
 				default: return -1;
 			}
 		}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/ImperativePatternImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/ImperativePatternImpl.java
new file mode 100644
index 000000000..692791de4
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/ImperativePatternImpl.java
@@ -0,0 +1,186 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2013, 2017 Willink Transformations and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   E.D.Willink - Initial API and implementation
+ *
+ * </copyright>
+ */
+package org.eclipse.qvtd.pivot.qvtimperative.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.pivot.Variable;
+import org.eclipse.ocl.pivot.util.Visitor;
+import org.eclipse.qvtd.pivot.qvtbase.impl.PatternImpl;
+import org.eclipse.qvtd.pivot.qvtimperative.Area;
+import org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern;
+import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
+import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Core Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativePatternImpl#getVariable <em>Variable</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ImperativePatternImpl extends PatternImpl implements ImperativePattern {
+	/**
+	 * The cached value of the '{@link #getVariable() <em>Variable</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVariable()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Variable> variable;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ImperativePatternImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return QVTimperativePackage.Literals.IMPERATIVE_PATTERN;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Variable> getVariable() {
+		if (variable == null) {
+			variable = new EObjectContainmentEList<Variable>(Variable.class, this, QVTimperativePackage.IMPERATIVE_PATTERN__VARIABLE);
+		}
+		return variable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Area getArea() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_PATTERN__VARIABLE:
+				return ((InternalEList<?>)getVariable()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_PATTERN__VARIABLE:
+				return getVariable();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_PATTERN__VARIABLE:
+				getVariable().clear();
+				getVariable().addAll((Collection<? extends Variable>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_PATTERN__VARIABLE:
+				getVariable().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.IMPERATIVE_PATTERN__VARIABLE:
+				return variable != null && !variable.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public <R> R accept(@NonNull Visitor<R> visitor) {
+		return (R) ((QVTimperativeVisitor<?>)visitor).visitImperativePattern(this);
+	}
+
+} //CorePatternImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingImpl.java
index b55457c4c..c2a700c10 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingImpl.java
@@ -27,7 +27,6 @@ import org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl;
 import org.eclipse.qvtd.pivot.qvtimperative.Area;
 import org.eclipse.qvtd.pivot.qvtimperative.BottomPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.GuardPattern;
-import org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea;
 import org.eclipse.qvtd.pivot.qvtimperative.Mapping;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
@@ -534,13 +533,8 @@ public class MappingImpl extends RuleImpl implements Mapping {
 			switch (derivedFeatureID) {
 				case QVTimperativePackage.MAPPING__GUARD_PATTERN: return QVTimperativePackage.AREA__GUARD_PATTERN;
 				case QVTimperativePackage.MAPPING__BOTTOM_PATTERN: return QVTimperativePackage.AREA__BOTTOM_PATTERN;
-				default: return -1;
-			}
-		}
-		if (baseClass == ImperativeArea.class) {
-			switch (derivedFeatureID) {
-				case QVTimperativePackage.MAPPING__CHECKED_PROPERTIES: return QVTimperativePackage.IMPERATIVE_AREA__CHECKED_PROPERTIES;
-				case QVTimperativePackage.MAPPING__ENFORCED_PROPERTIES: return QVTimperativePackage.IMPERATIVE_AREA__ENFORCED_PROPERTIES;
+				case QVTimperativePackage.MAPPING__CHECKED_PROPERTIES: return QVTimperativePackage.AREA__CHECKED_PROPERTIES;
+				case QVTimperativePackage.MAPPING__ENFORCED_PROPERTIES: return QVTimperativePackage.AREA__ENFORCED_PROPERTIES;
 				default: return -1;
 			}
 		}
@@ -558,13 +552,8 @@ public class MappingImpl extends RuleImpl implements Mapping {
 			switch (baseFeatureID) {
 				case QVTimperativePackage.AREA__GUARD_PATTERN: return QVTimperativePackage.MAPPING__GUARD_PATTERN;
 				case QVTimperativePackage.AREA__BOTTOM_PATTERN: return QVTimperativePackage.MAPPING__BOTTOM_PATTERN;
-				default: return -1;
-			}
-		}
-		if (baseClass == ImperativeArea.class) {
-			switch (baseFeatureID) {
-				case QVTimperativePackage.IMPERATIVE_AREA__CHECKED_PROPERTIES: return QVTimperativePackage.MAPPING__CHECKED_PROPERTIES;
-				case QVTimperativePackage.IMPERATIVE_AREA__ENFORCED_PROPERTIES: return QVTimperativePackage.MAPPING__ENFORCED_PROPERTIES;
+				case QVTimperativePackage.AREA__CHECKED_PROPERTIES: return QVTimperativePackage.MAPPING__CHECKED_PROPERTIES;
+				case QVTimperativePackage.AREA__ENFORCED_PROPERTIES: return QVTimperativePackage.MAPPING__ENFORCED_PROPERTIES;
 				default: return -1;
 			}
 		}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java
index ff88233fe..3d8e17c0b 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java
@@ -20,12 +20,10 @@ import org.eclipse.qvtd.pivot.qvtimperative.BottomPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionAssignment;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable;
-import org.eclipse.qvtd.pivot.qvtimperative.CoreDomain;
-import org.eclipse.qvtd.pivot.qvtimperative.CorePattern;
 import org.eclipse.qvtd.pivot.qvtimperative.GuardPattern;
-import org.eclipse.qvtd.pivot.qvtimperative.ImperativeBottomPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel;
+import org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern;
 import org.eclipse.qvtd.pivot.qvtimperative.Mapping;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCall;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding;
@@ -87,12 +85,10 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 			case QVTimperativePackage.CONNECTION_ASSIGNMENT: return createConnectionAssignment();
 			case QVTimperativePackage.CONNECTION_STATEMENT: return createConnectionStatement();
 			case QVTimperativePackage.CONNECTION_VARIABLE: return createConnectionVariable();
-			case QVTimperativePackage.CORE_DOMAIN: return createCoreDomain();
-			case QVTimperativePackage.CORE_PATTERN: return createCorePattern();
 			case QVTimperativePackage.GUARD_PATTERN: return createGuardPattern();
-			case QVTimperativePackage.IMPERATIVE_BOTTOM_PATTERN: return createImperativeBottomPattern();
 			case QVTimperativePackage.IMPERATIVE_DOMAIN: return createImperativeDomain();
 			case QVTimperativePackage.IMPERATIVE_MODEL: return createImperativeModel();
+			case QVTimperativePackage.IMPERATIVE_PATTERN: return createImperativePattern();
 			case QVTimperativePackage.MAPPING: return createMapping();
 			case QVTimperativePackage.MAPPING_CALL: return createMappingCall();
 			case QVTimperativePackage.MAPPING_CALL_BINDING: return createMappingCallBinding();
@@ -114,7 +110,7 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public BottomPattern createBottomPattern() {
+	public @NonNull BottomPattern createBottomPattern() {
 		BottomPatternImpl bottomPattern = new BottomPatternImpl();
 		return bottomPattern;
 	}
@@ -158,29 +154,7 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public CoreDomain createCoreDomain() {
-		CoreDomainImpl coreDomain = new CoreDomainImpl();
-		return coreDomain;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public CorePattern createCorePattern() {
-		CorePatternImpl corePattern = new CorePatternImpl();
-		return corePattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public GuardPattern createGuardPattern() {
+	public @NonNull GuardPattern createGuardPattern() {
 		GuardPatternImpl guardPattern = new GuardPatternImpl();
 		return guardPattern;
 	}
@@ -191,9 +165,9 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public @NonNull ImperativeBottomPattern createImperativeBottomPattern() {
-		ImperativeBottomPatternImpl imperativeBottomPattern = new ImperativeBottomPatternImpl();
-		return imperativeBottomPattern;
+	public @NonNull ImperativeDomain createImperativeDomain() {
+		ImperativeDomainImpl imperativeDomain = new ImperativeDomainImpl();
+		return imperativeDomain;
 	}
 
 	/**
@@ -202,9 +176,9 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public @NonNull ImperativeDomain createImperativeDomain() {
-		ImperativeDomainImpl imperativeDomain = new ImperativeDomainImpl();
-		return imperativeDomain;
+	public @NonNull ImperativeModel createImperativeModel() {
+		ImperativeModelImpl imperativeModel = new ImperativeModelImpl();
+		return imperativeModel;
 	}
 
 	/**
@@ -213,9 +187,9 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public@NonNull ImperativeModel createImperativeModel() {
-		ImperativeModelImpl imperativeModel = new ImperativeModelImpl();
-		return imperativeModel;
+	public @NonNull ImperativePattern createImperativePattern() {
+		ImperativePatternImpl imperativePattern = new ImperativePatternImpl();
+		return imperativePattern;
 	}
 
 	/**
@@ -279,7 +253,7 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public OppositePropertyAssignment createOppositePropertyAssignment() {
+	public @NonNull OppositePropertyAssignment createOppositePropertyAssignment() {
 		OppositePropertyAssignmentImpl oppositePropertyAssignment = new OppositePropertyAssignmentImpl();
 		return oppositePropertyAssignment;
 	}
@@ -290,7 +264,7 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public PropertyAssignment createPropertyAssignment() {
+	public @NonNull PropertyAssignment createPropertyAssignment() {
 		PropertyAssignmentImpl propertyAssignment = new PropertyAssignmentImpl();
 		return propertyAssignment;
 	}
@@ -301,7 +275,7 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public RealizedVariable createRealizedVariable() {
+	public @NonNull RealizedVariable createRealizedVariable() {
 		RealizedVariableImpl realizedVariable = new RealizedVariableImpl();
 		return realizedVariable;
 	}
@@ -312,7 +286,7 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public VariableAssignment createVariableAssignment() {
+	public @NonNull VariableAssignment createVariableAssignment() {
 		VariableAssignmentImpl variableAssignment = new VariableAssignmentImpl();
 		return variableAssignment;
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java
index 91f9eddea..3985e6250 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java
@@ -23,13 +23,10 @@ import org.eclipse.qvtd.pivot.qvtimperative.BottomPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionAssignment;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable;
-import org.eclipse.qvtd.pivot.qvtimperative.CoreDomain;
-import org.eclipse.qvtd.pivot.qvtimperative.CorePattern;
 import org.eclipse.qvtd.pivot.qvtimperative.GuardPattern;
-import org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea;
-import org.eclipse.qvtd.pivot.qvtimperative.ImperativeBottomPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel;
+import org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern;
 import org.eclipse.qvtd.pivot.qvtimperative.Mapping;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCall;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding;
@@ -99,20 +96,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass coreDomainEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass corePatternEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	private EClass guardPatternEClass = null;
 
 	/**
@@ -120,28 +103,21 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass imperativeAreaEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imperativeBottomPatternEClass = null;
+	private EClass imperativeDomainEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass imperativeDomainEClass = null;
+	private EClass imperativeModelEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass imperativeModelEClass = null;
+	private EClass imperativePatternEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -328,6 +304,26 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
+	public EReference getArea_CheckedProperties() {
+		return (EReference)areaEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getArea_EnforcedProperties() {
+		return (EReference)areaEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getAssignment() {
 		return assignmentEClass;
 	}
@@ -468,36 +464,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EClass getCoreDomain() {
-		return coreDomainEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getCorePattern() {
-		return corePatternEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getCorePattern_Variable() {
-		return (EReference)corePatternEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
 	public EClass getGuardPattern() {
 		return guardPatternEClass;
 	}
@@ -518,38 +484,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EClass getImperativeArea() {
-		return imperativeAreaEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getImperativeArea_CheckedProperties() {
-		return (EReference)imperativeAreaEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getImperativeArea_EnforcedProperties() {
-		return (EReference)imperativeAreaEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getImperativeBottomPattern() {
-		return imperativeBottomPatternEClass;
+	public EClass getImperativeDomain() {
+		return imperativeDomainEClass;
 	}
 
 	/**
@@ -558,8 +494,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getImperativeBottomPattern_OrderedAssignment() {
-		return (EReference)imperativeBottomPatternEClass.getEStructuralFeatures().get(0);
+	public EClass getImperativeModel() {
+		return imperativeModelEClass;
 	}
 
 	/**
@@ -568,8 +504,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EClass getImperativeDomain() {
-		return imperativeDomainEClass;
+	public EClass getImperativePattern() {
+		return imperativePatternEClass;
 	}
 
 	/**
@@ -578,8 +514,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EClass getImperativeModel() {
-		return imperativeModelEClass;
+	public EReference getImperativePattern_Variable() {
+		return (EReference)imperativePatternEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -914,6 +850,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		areaEClass = createEClass(AREA);
 		createEReference(areaEClass, AREA__GUARD_PATTERN);
 		createEReference(areaEClass, AREA__BOTTOM_PATTERN);
+		createEReference(areaEClass, AREA__CHECKED_PROPERTIES);
+		createEReference(areaEClass, AREA__ENFORCED_PROPERTIES);
 
 		assignmentEClass = createEClass(ASSIGNMENT);
 		createEReference(assignmentEClass, ASSIGNMENT__BOTTOM_PATTERN);
@@ -934,25 +872,16 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 		connectionVariableEClass = createEClass(CONNECTION_VARIABLE);
 
-		coreDomainEClass = createEClass(CORE_DOMAIN);
-
-		corePatternEClass = createEClass(CORE_PATTERN);
-		createEReference(corePatternEClass, CORE_PATTERN__VARIABLE);
-
 		guardPatternEClass = createEClass(GUARD_PATTERN);
 		createEReference(guardPatternEClass, GUARD_PATTERN__AREA);
 
-		imperativeAreaEClass = createEClass(IMPERATIVE_AREA);
-		createEReference(imperativeAreaEClass, IMPERATIVE_AREA__CHECKED_PROPERTIES);
-		createEReference(imperativeAreaEClass, IMPERATIVE_AREA__ENFORCED_PROPERTIES);
-
-		imperativeBottomPatternEClass = createEClass(IMPERATIVE_BOTTOM_PATTERN);
-		createEReference(imperativeBottomPatternEClass, IMPERATIVE_BOTTOM_PATTERN__ORDERED_ASSIGNMENT);
-
 		imperativeDomainEClass = createEClass(IMPERATIVE_DOMAIN);
 
 		imperativeModelEClass = createEClass(IMPERATIVE_MODEL);
 
+		imperativePatternEClass = createEClass(IMPERATIVE_PATTERN);
+		createEReference(imperativePatternEClass, IMPERATIVE_PATTERN__VARIABLE);
+
 		mappingEClass = createEClass(MAPPING);
 		createEReference(mappingEClass, MAPPING__MAPPING_STATEMENT);
 		createEReference(mappingEClass, MAPPING__POLLED_CLASSES);
@@ -1030,21 +959,17 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		// Add supertypes to classes
 		areaEClass.getESuperTypes().add(thePivotPackage.getElement());
 		assignmentEClass.getESuperTypes().add(thePivotPackage.getElement());
-		bottomPatternEClass.getESuperTypes().add(this.getCorePattern());
+		bottomPatternEClass.getESuperTypes().add(this.getImperativePattern());
 		connectionAssignmentEClass.getESuperTypes().add(this.getAssignment());
 		connectionStatementEClass.getESuperTypes().add(this.getMappingStatement());
 		connectionVariableEClass.getESuperTypes().add(thePivotPackage.getVariable());
-		coreDomainEClass.getESuperTypes().add(theQVTbasePackage.getDomain());
-		coreDomainEClass.getESuperTypes().add(this.getArea());
-		corePatternEClass.getESuperTypes().add(theQVTbasePackage.getPattern());
-		guardPatternEClass.getESuperTypes().add(this.getCorePattern());
-		imperativeAreaEClass.getESuperTypes().add(this.getArea());
-		imperativeBottomPatternEClass.getESuperTypes().add(this.getBottomPattern());
-		imperativeDomainEClass.getESuperTypes().add(this.getCoreDomain());
-		imperativeDomainEClass.getESuperTypes().add(this.getImperativeArea());
+		guardPatternEClass.getESuperTypes().add(this.getImperativePattern());
+		imperativeDomainEClass.getESuperTypes().add(theQVTbasePackage.getDomain());
+		imperativeDomainEClass.getESuperTypes().add(this.getArea());
 		imperativeModelEClass.getESuperTypes().add(theQVTbasePackage.getBaseModel());
+		imperativePatternEClass.getESuperTypes().add(theQVTbasePackage.getPattern());
 		mappingEClass.getESuperTypes().add(theQVTbasePackage.getRule());
-		mappingEClass.getESuperTypes().add(this.getImperativeArea());
+		mappingEClass.getESuperTypes().add(this.getArea());
 		mappingCallEClass.getESuperTypes().add(this.getMappingStatement());
 		mappingCallEClass.getESuperTypes().add(thePivotPackage.getReferringElement());
 		mappingCallBindingEClass.getESuperTypes().add(thePivotPackage.getElement());
@@ -1063,6 +988,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		initEClass(areaEClass, Area.class, "Area", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getArea_GuardPattern(), this.getGuardPattern(), this.getGuardPattern_Area(), "guardPattern", null, 1, 1, Area.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getArea_BottomPattern(), this.getBottomPattern(), this.getBottomPattern_Area(), "bottomPattern", null, 1, 1, Area.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getArea_CheckedProperties(), thePivotPackage.getProperty(), null, "checkedProperties", null, 0, -1, Area.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getArea_EnforcedProperties(), thePivotPackage.getProperty(), null, "enforcedProperties", null, 0, -1, Area.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(assignmentEClass, Assignment.class, "Assignment", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getAssignment_BottomPattern(), this.getBottomPattern(), this.getBottomPattern_Assignment(), "bottomPattern", null, 1, 1, Assignment.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1071,7 +998,7 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 		initEClass(bottomPatternEClass, BottomPattern.class, "BottomPattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getBottomPattern_Area(), this.getArea(), this.getArea_BottomPattern(), "area", null, 1, 1, BottomPattern.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBottomPattern_Assignment(), this.getAssignment(), this.getAssignment_BottomPattern(), "assignment", null, 0, -1, BottomPattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getBottomPattern_Assignment(), this.getAssignment(), this.getAssignment_BottomPattern(), "assignment", null, 0, -1, BottomPattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getBottomPattern_RealizedVariable(), this.getRealizedVariable(), null, "realizedVariable", null, 0, -1, BottomPattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(connectionAssignmentEClass, ConnectionAssignment.class, "ConnectionAssignment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1083,27 +1010,18 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 		initEClass(connectionVariableEClass, ConnectionVariable.class, "ConnectionVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(coreDomainEClass, CoreDomain.class, "CoreDomain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(corePatternEClass, CorePattern.class, "CorePattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCorePattern_Variable(), thePivotPackage.getVariable(), null, "variable", null, 0, -1, CorePattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		addEOperation(corePatternEClass, this.getArea(), "getArea", 1, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(guardPatternEClass, GuardPattern.class, "GuardPattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getGuardPattern_Area(), this.getArea(), this.getArea_GuardPattern(), "area", null, 1, 1, GuardPattern.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(imperativeAreaEClass, ImperativeArea.class, "ImperativeArea", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getImperativeArea_CheckedProperties(), thePivotPackage.getProperty(), null, "checkedProperties", null, 0, -1, ImperativeArea.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getImperativeArea_EnforcedProperties(), thePivotPackage.getProperty(), null, "enforcedProperties", null, 0, -1, ImperativeArea.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(imperativeBottomPatternEClass, ImperativeBottomPattern.class, "ImperativeBottomPattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getImperativeBottomPattern_OrderedAssignment(), this.getAssignment(), null, "orderedAssignment", null, 0, -1, ImperativeBottomPattern.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
 		initEClass(imperativeDomainEClass, ImperativeDomain.class, "ImperativeDomain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(imperativeModelEClass, ImperativeModel.class, "ImperativeModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
+		initEClass(imperativePatternEClass, ImperativePattern.class, "ImperativePattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getImperativePattern_Variable(), thePivotPackage.getVariable(), null, "variable", null, 0, -1, ImperativePattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		addEOperation(imperativePatternEClass, this.getArea(), "getArea", 1, 1, IS_UNIQUE, IS_ORDERED);
+
 		initEClass(mappingEClass, Mapping.class, "Mapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getMapping_MappingStatement(), this.getMappingStatement(), null, "mappingStatement", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getMapping_PolledClasses(), thePivotPackage.getClass_(), null, "polledClasses", null, 0, -1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java
index 838cdd58a..8fd14f035 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java
@@ -61,26 +61,11 @@ public abstract class AbstractDelegatingQVTimperativeVisitor<R, C, @NonNull D ex
 	}
 
 	@Override
-	public R visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		return delegate.visitCoreDomain(object);
-	}
-
-	@Override
-	public R visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		return delegate.visitCorePattern(object);
-	}
-
-	@Override
 	public R visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
 		return delegate.visitGuardPattern(object);
 	}
 
 	@Override
-	public R visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
-		return delegate.visitImperativeBottomPattern(object);
-	}
-
-	@Override
 	public R visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
 		return delegate.visitImperativeDomain(object);
 	}
@@ -91,6 +76,11 @@ public abstract class AbstractDelegatingQVTimperativeVisitor<R, C, @NonNull D ex
 	}
 
 	@Override
+	public R visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
+		return delegate.visitImperativePattern(object);
+	}
+
+	@Override
 	public R visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object) {
 		return delegate.visitMapping(object);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java
index 9dde0dc3d..0e4f4aa68 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java
@@ -46,7 +46,7 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C>
 
 	@Override
 	public R visitBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BottomPattern object) {
-		return visitCorePattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
@@ -65,28 +65,13 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C>
 	}
 
 	@Override
-	public R visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		return visitDomain(object);
-	}
-
-	@Override
-	public R visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		return visitPattern(object);
-	}
-
-	@Override
 	public R visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
-		return visitCorePattern(object);
-	}
-
-	@Override
-	public R visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
-		return visitBottomPattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
 	public R visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
-		return visitCoreDomain(object);
+		return visitDomain(object);
 	}
 
 	@Override
@@ -95,6 +80,11 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C>
 	}
 
 	@Override
+	public R visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
+		return visitPattern(object);
+	}
+
+	@Override
 	public R visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object) {
 		return visitRule(object);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractMergedQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractMergedQVTimperativeVisitor.java
index 21ded2941..dbb9107de 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractMergedQVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractMergedQVTimperativeVisitor.java
@@ -59,32 +59,22 @@ public abstract class AbstractMergedQVTimperativeVisitor<R, C>
 	}
 
 	@Override
-	public R visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		return visiting(object);
-	}
-
-	@Override
-	public R visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		return visiting(object);
-	}
-
-	@Override
 	public R visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
 		return visiting(object);
 	}
 
 	@Override
-	public R visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
+	public R visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
 		return visiting(object);
 	}
 
 	@Override
-	public R visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
+	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return visiting(object);
 	}
 
 	@Override
-	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
+	public R visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
 		return visiting(object);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java
index 362b6794f..f5f053cbe 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java
@@ -65,32 +65,22 @@ public abstract class AbstractNullQVTimperativeVisitor<@Nullable R, C>
 	}
 
 	@Override
-	public R visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		return null;
-	}
-
-	@Override
-	public R visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		return null;
-	}
-
-	@Override
 	public R visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
 		return null;
 	}
 
 	@Override
-	public R visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
+	public R visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
 		return null;
 	}
 
 	@Override
-	public R visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
+	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return null;
 	}
 
 	@Override
-	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
+	public R visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
 		return null;
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java
index a12f31083..fa1155e33 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java
@@ -50,7 +50,7 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor
 
 	@Override
 	public @Nullable Object visitBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BottomPattern object) {
-		return visitCorePattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
@@ -69,28 +69,13 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor
 	}
 
 	@Override
-	public @Nullable Object visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		return visitDomain(object);
-	}
-
-	@Override
-	public @Nullable Object visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		return visitPattern(object);
-	}
-
-	@Override
 	public @Nullable Object visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
-		return visitCorePattern(object);
-	}
-
-	@Override
-	public @Nullable Object visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
-		return visitBottomPattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
 	public @Nullable Object visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
-		return visitCoreDomain(object);
+		return visitDomain(object);
 	}
 
 	@Override
@@ -99,6 +84,11 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor
 	}
 
 	@Override
+	public @Nullable Object visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
+		return visitPattern(object);
+	}
+
+	@Override
 	public @Nullable Object visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object) {
 		return visitRule(object);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java
index ccd6199b9..b6248e7c4 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java
@@ -50,7 +50,7 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor
 
 	@Override
 	public @Nullable Boolean visitBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BottomPattern object) {
-		return visitCorePattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
@@ -69,28 +69,13 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor
 	}
 
 	@Override
-	public @Nullable Boolean visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		return visitDomain(object);
-	}
-
-	@Override
-	public @Nullable Boolean visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		return visitPattern(object);
-	}
-
-	@Override
 	public @Nullable Boolean visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
-		return visitCorePattern(object);
-	}
-
-	@Override
-	public @Nullable Boolean visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
-		return visitBottomPattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
 	public @Nullable Boolean visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
-		return visitCoreDomain(object);
+		return visitDomain(object);
 	}
 
 	@Override
@@ -99,6 +84,11 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor
 	}
 
 	@Override
+	public @Nullable Boolean visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
+		return visitPattern(object);
+	}
+
+	@Override
 	public @Nullable Boolean visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object) {
 		return visitRule(object);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java
index 585ac2890..66d3decad 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java
@@ -50,7 +50,7 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor
 
 	@Override
 	public @Nullable Object visitBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BottomPattern object) {
-		return visitCorePattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
@@ -69,28 +69,13 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor
 	}
 
 	@Override
-	public @Nullable Object visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		return visitDomain(object);
-	}
-
-	@Override
-	public @Nullable Object visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		return visitPattern(object);
-	}
-
-	@Override
 	public @Nullable Object visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
-		return visitCorePattern(object);
-	}
-
-	@Override
-	public @Nullable Object visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
-		return visitBottomPattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
 	public @Nullable Object visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
-		return visitCoreDomain(object);
+		return visitDomain(object);
 	}
 
 	@Override
@@ -99,6 +84,11 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor
 	}
 
 	@Override
+	public @Nullable Object visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
+		return visitPattern(object);
+	}
+
+	@Override
 	public @Nullable Object visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object) {
 		return visitRule(object);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java
index 1bf4877bf..ab81d4328 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java
@@ -52,7 +52,7 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor
 
 	@Override
 	public @Nullable Object visitBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BottomPattern object) {
-		return visitCorePattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
@@ -71,28 +71,13 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor
 	}
 
 	@Override
-	public @Nullable Object visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		return visitDomain(object);
-	}
-
-	@Override
-	public @Nullable Object visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		return visitPattern(object);
-	}
-
-	@Override
 	public @Nullable Object visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
-		return visitCorePattern(object);
-	}
-
-	@Override
-	public @Nullable Object visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
-		return visitBottomPattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
 	public @Nullable Object visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
-		return visitCoreDomain(object);
+		return visitDomain(object);
 	}
 
 	@Override
@@ -101,6 +86,11 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor
 	}
 
 	@Override
+	public @Nullable Object visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
+		return visitPattern(object);
+	}
+
+	@Override
 	public @Nullable Object visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object) {
 		return visitRule(object);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java
index 7ffbedfd5..fd172950b 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java
@@ -50,7 +50,7 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor
 
 	@Override
 	public @Nullable Object visitBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BottomPattern object) {
-		return visitCorePattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
@@ -69,28 +69,13 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor
 	}
 
 	@Override
-	public @Nullable Object visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		return visitDomain(object);
-	}
-
-	@Override
-	public @Nullable Object visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		return visitPattern(object);
-	}
-
-	@Override
 	public @Nullable Object visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
-		return visitCorePattern(object);
-	}
-
-	@Override
-	public @Nullable Object visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
-		return visitBottomPattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
 	public @Nullable Object visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
-		return visitCoreDomain(object);
+		return visitDomain(object);
 	}
 
 	@Override
@@ -99,6 +84,11 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor
 	}
 
 	@Override
+	public @Nullable Object visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
+		return visitPattern(object);
+	}
+
+	@Override
 	public @Nullable Object visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object) {
 		return visitRule(object);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeTemplateParameterSubstitutionVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeTemplateParameterSubstitutionVisitor.java
index cb9390a93..d7ad216eb 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeTemplateParameterSubstitutionVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeTemplateParameterSubstitutionVisitor.java
@@ -53,7 +53,7 @@ public abstract class AbstractQVTimperativeTemplateParameterSubstitutionVisitor
 
 	@Override
 	public @Nullable Object visitBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BottomPattern object) {
-		return visitCorePattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
@@ -72,28 +72,13 @@ public abstract class AbstractQVTimperativeTemplateParameterSubstitutionVisitor
 	}
 
 	@Override
-	public @Nullable Object visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		return visitDomain(object);
-	}
-
-	@Override
-	public @Nullable Object visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		return visitPattern(object);
-	}
-
-	@Override
 	public @Nullable Object visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
-		return visitCorePattern(object);
-	}
-
-	@Override
-	public @Nullable Object visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
-		return visitBottomPattern(object);
+		return visitImperativePattern(object);
 	}
 
 	@Override
 	public @Nullable Object visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
-		return visitCoreDomain(object);
+		return visitDomain(object);
 	}
 
 	@Override
@@ -102,6 +87,11 @@ public abstract class AbstractQVTimperativeTemplateParameterSubstitutionVisitor
 	}
 
 	@Override
+	public @Nullable Object visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
+		return visitPattern(object);
+	}
+
+	@Override
 	public @Nullable Object visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object) {
 		return visitRule(object);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java
index 12ae4bbb1..bab6cbe58 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java
@@ -92,30 +92,6 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
-	public R visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object) {
-		@Nullable P prologue = preVisit(object);
-		try {
-			R result = delegate.visitCoreDomain(object);
-			return postVisit(object, prologue, result);
-		}
-		catch (Throwable e) {
-			return badVisit(object, prologue, e);
-		}
-	}
-
-	@Override
-	public R visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object) {
-		@Nullable P prologue = preVisit(object);
-		try {
-			R result = delegate.visitCorePattern(object);
-			return postVisit(object, prologue, result);
-		}
-		catch (Throwable e) {
-			return badVisit(object, prologue, e);
-		}
-	}
-
-	@Override
 	public R visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object) {
 		@Nullable P prologue = preVisit(object);
 		try {
@@ -128,10 +104,10 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
-	public R visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object) {
+	public R visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
 		@Nullable P prologue = preVisit(object);
 		try {
-			R result = delegate.visitImperativeBottomPattern(object);
+			R result = delegate.visitImperativeDomain(object);
 			return postVisit(object, prologue, result);
 		}
 		catch (Throwable e) {
@@ -140,10 +116,10 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
-	public R visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object) {
+	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		@Nullable P prologue = preVisit(object);
 		try {
-			R result = delegate.visitImperativeDomain(object);
+			R result = delegate.visitImperativeModel(object);
 			return postVisit(object, prologue, result);
 		}
 		catch (Throwable e) {
@@ -152,10 +128,10 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
-	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
+	public R visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object) {
 		@Nullable P prologue = preVisit(object);
 		try {
-			R result = delegate.visitImperativeModel(object);
+			R result = delegate.visitImperativePattern(object);
 			return postVisit(object, prologue, result);
 		}
 		catch (Throwable e) {
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java
index 189eba517..0c8e1d3f4 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java
@@ -38,13 +38,10 @@ import org.eclipse.qvtd.pivot.qvtimperative.BottomPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionAssignment;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable;
-import org.eclipse.qvtd.pivot.qvtimperative.CoreDomain;
-import org.eclipse.qvtd.pivot.qvtimperative.CorePattern;
 import org.eclipse.qvtd.pivot.qvtimperative.GuardPattern;
-import org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea;
-import org.eclipse.qvtd.pivot.qvtimperative.ImperativeBottomPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel;
+import org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern;
 import org.eclipse.qvtd.pivot.qvtimperative.Mapping;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCall;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding;
@@ -140,26 +137,10 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 			return createConnectionVariableAdapter();
 		}
 		@Override
-		public Adapter caseCoreDomain(CoreDomain object) {
-			return createCoreDomainAdapter();
-		}
-		@Override
-		public Adapter caseCorePattern(CorePattern object) {
-			return createCorePatternAdapter();
-		}
-		@Override
 		public Adapter caseGuardPattern(GuardPattern object) {
 			return createGuardPatternAdapter();
 		}
 		@Override
-		public Adapter caseImperativeArea(ImperativeArea object) {
-			return createImperativeAreaAdapter();
-		}
-		@Override
-		public Adapter caseImperativeBottomPattern(ImperativeBottomPattern object) {
-			return createImperativeBottomPatternAdapter();
-		}
-		@Override
 		public Adapter caseImperativeDomain(ImperativeDomain object) {
 			return createImperativeDomainAdapter();
 		}
@@ -168,6 +149,10 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 			return createImperativeModelAdapter();
 		}
 		@Override
+		public Adapter caseImperativePattern(ImperativePattern object) {
+			return createImperativePatternAdapter();
+		}
+		@Override
 		public Adapter caseMapping(Mapping object) {
 			return createMappingAdapter();
 		}
@@ -346,58 +331,30 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea <em>Imperative Area</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea
-	 * @generated
-	 */
-	public Adapter createImperativeAreaAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeBottomPattern <em>Imperative Bottom Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeBottomPattern
-	 * @generated
-	 */
-	public Adapter createImperativeBottomPatternAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain <em>Imperative Domain</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel <em>Imperative Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel
 	 * @generated
 	 */
-	public Adapter createImperativeDomainAdapter() {
+	public Adapter createImperativeModelAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel <em>Imperative Model</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern <em>Imperative Pattern</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern
 	 * @generated
 	 */
-	public Adapter createImperativeModelAdapter() {
+	public Adapter createImperativePatternAdapter() {
 		return null;
 	}
 
@@ -640,30 +597,30 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.CorePattern <em>Core Pattern</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.GuardPattern <em>Guard Pattern</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.CorePattern
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.GuardPattern
 	 * @generated
 	 */
-	public Adapter createCorePatternAdapter() {
+	public Adapter createGuardPatternAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.GuardPattern <em>Guard Pattern</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain <em>Imperative Domain</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.GuardPattern
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain
 	 * @generated
 	 */
-	public Adapter createGuardPatternAdapter() {
+	public Adapter createImperativeDomainAdapter() {
 		return null;
 	}
 
@@ -850,20 +807,6 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.CoreDomain <em>Core Domain</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.CoreDomain
-	 * @generated
-	 */
-	public Adapter createCoreDomainAdapter() {
-		return null;
-	}
-
-	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.ocl.pivot.CallExp <em>Call Exp</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java
index 42c69dd7b..493e58c09 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java
@@ -37,13 +37,10 @@ import org.eclipse.qvtd.pivot.qvtimperative.BottomPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionAssignment;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable;
-import org.eclipse.qvtd.pivot.qvtimperative.CoreDomain;
-import org.eclipse.qvtd.pivot.qvtimperative.CorePattern;
 import org.eclipse.qvtd.pivot.qvtimperative.GuardPattern;
-import org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea;
-import org.eclipse.qvtd.pivot.qvtimperative.ImperativeBottomPattern;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeDomain;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel;
+import org.eclipse.qvtd.pivot.qvtimperative.ImperativePattern;
 import org.eclipse.qvtd.pivot.qvtimperative.Mapping;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCall;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding;
@@ -134,7 +131,7 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 			case QVTimperativePackage.BOTTOM_PATTERN: {
 				BottomPattern bottomPattern = (BottomPattern)theEObject;
 				T result = caseBottomPattern(bottomPattern);
-				if (result == null) result = caseCorePattern(bottomPattern);
+				if (result == null) result = caseImperativePattern(bottomPattern);
 				if (result == null) result = casePattern(bottomPattern);
 				if (result == null) result = caseElement(bottomPattern);
 				if (result == null) result = caseVisitable(bottomPattern);
@@ -176,63 +173,19 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case QVTimperativePackage.CORE_DOMAIN: {
-				CoreDomain coreDomain = (CoreDomain)theEObject;
-				T result = caseCoreDomain(coreDomain);
-				if (result == null) result = caseDomain(coreDomain);
-				if (result == null) result = caseArea(coreDomain);
-				if (result == null) result = caseNamedElement(coreDomain);
-				if (result == null) result = caseReferringElement(coreDomain);
-				if (result == null) result = caseElement(coreDomain);
-				if (result == null) result = caseNameable(coreDomain);
-				if (result == null) result = caseVisitable(coreDomain);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case QVTimperativePackage.CORE_PATTERN: {
-				CorePattern corePattern = (CorePattern)theEObject;
-				T result = caseCorePattern(corePattern);
-				if (result == null) result = casePattern(corePattern);
-				if (result == null) result = caseElement(corePattern);
-				if (result == null) result = caseVisitable(corePattern);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case QVTimperativePackage.GUARD_PATTERN: {
 				GuardPattern guardPattern = (GuardPattern)theEObject;
 				T result = caseGuardPattern(guardPattern);
-				if (result == null) result = caseCorePattern(guardPattern);
+				if (result == null) result = caseImperativePattern(guardPattern);
 				if (result == null) result = casePattern(guardPattern);
 				if (result == null) result = caseElement(guardPattern);
 				if (result == null) result = caseVisitable(guardPattern);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case QVTimperativePackage.IMPERATIVE_AREA: {
-				ImperativeArea imperativeArea = (ImperativeArea)theEObject;
-				T result = caseImperativeArea(imperativeArea);
-				if (result == null) result = caseArea(imperativeArea);
-				if (result == null) result = caseElement(imperativeArea);
-				if (result == null) result = caseVisitable(imperativeArea);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case QVTimperativePackage.IMPERATIVE_BOTTOM_PATTERN: {
-				ImperativeBottomPattern imperativeBottomPattern = (ImperativeBottomPattern)theEObject;
-				T result = caseImperativeBottomPattern(imperativeBottomPattern);
-				if (result == null) result = caseBottomPattern(imperativeBottomPattern);
-				if (result == null) result = caseCorePattern(imperativeBottomPattern);
-				if (result == null) result = casePattern(imperativeBottomPattern);
-				if (result == null) result = caseElement(imperativeBottomPattern);
-				if (result == null) result = caseVisitable(imperativeBottomPattern);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case QVTimperativePackage.IMPERATIVE_DOMAIN: {
 				ImperativeDomain imperativeDomain = (ImperativeDomain)theEObject;
 				T result = caseImperativeDomain(imperativeDomain);
-				if (result == null) result = caseCoreDomain(imperativeDomain);
-				if (result == null) result = caseImperativeArea(imperativeDomain);
 				if (result == null) result = caseDomain(imperativeDomain);
 				if (result == null) result = caseArea(imperativeDomain);
 				if (result == null) result = caseNamedElement(imperativeDomain);
@@ -256,13 +209,21 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case QVTimperativePackage.IMPERATIVE_PATTERN: {
+				ImperativePattern imperativePattern = (ImperativePattern)theEObject;
+				T result = caseImperativePattern(imperativePattern);
+				if (result == null) result = casePattern(imperativePattern);
+				if (result == null) result = caseElement(imperativePattern);
+				if (result == null) result = caseVisitable(imperativePattern);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case QVTimperativePackage.MAPPING: {
 				Mapping mapping = (Mapping)theEObject;
 				T result = caseMapping(mapping);
 				if (result == null) result = caseRule(mapping);
-				if (result == null) result = caseImperativeArea(mapping);
-				if (result == null) result = caseNamedElement(mapping);
 				if (result == null) result = caseArea(mapping);
+				if (result == null) result = caseNamedElement(mapping);
 				if (result == null) result = caseElement(mapping);
 				if (result == null) result = caseNameable(mapping);
 				if (result == null) result = caseVisitable(mapping);
@@ -485,36 +446,6 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Core Domain</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Core Domain</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCoreDomain(CoreDomain object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Core Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Core Pattern</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCorePattern(CorePattern object) {
-		return null;
-	}
-
-	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Guard Pattern</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -530,62 +461,47 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Imperative Area</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Imperative Area</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseImperativeArea(ImperativeArea object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Imperative Bottom Pattern</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Imperative Domain</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Imperative Bottom Pattern</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Imperative Domain</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseImperativeBottomPattern(ImperativeBottomPattern object) {
+	public T caseImperativeDomain(ImperativeDomain object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Imperative Domain</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Imperative Model</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Imperative Domain</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Imperative Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseImperativeDomain(ImperativeDomain object) {
+	public T caseImperativeModel(ImperativeModel object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Imperative Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Imperative Pattern</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Imperative Model</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Imperative Pattern</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseImperativeModel(ImperativeModel object) {
+	public T caseImperativePattern(ImperativePattern object) {
 		return null;
 	}
 
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java
index f3c360a1a..3aa6efa13 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java
@@ -28,12 +28,10 @@ public interface QVTimperativeVisitor<R> extends org.eclipse.qvtd.pivot.qvtbase.
 	R visitConnectionAssignment(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ConnectionAssignment object);
 	R visitConnectionStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ConnectionStatement object);
 	R visitConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ConnectionVariable object);
-	R visitCoreDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CoreDomain object);
-	R visitCorePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CorePattern object);
 	R visitGuardPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardPattern object);
-	R visitImperativeBottomPattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeBottomPattern object);
 	R visitImperativeDomain(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeDomain object);
 	R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object);
+	R visitImperativePattern(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativePattern object);
 	R visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object);
 	R visitMappingCall(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCall object);
 	R visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object);
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.genmodel b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.genmodel
index c274d87bb..e5bbc8aed 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.genmodel
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.genmodel
@@ -42,15 +42,15 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTimperative.ecore#//ConnectionStatement/value"/>
     </genClasses>
     <genClasses ecoreClass="QVTimperative.ecore#//ConnectionVariable"/>
-    <genClasses ecoreClass="QVTimperative.ecore#//CoreDomain"/>
-    <genClasses ecoreClass="QVTimperative.ecore#//CorePattern">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTimperative.ecore#//CorePattern/variable"/>
-      <genOperations ecoreOperation="QVTimperative.ecore#//CorePattern/getArea"/>
-    </genClasses>
     <genClasses ecoreClass="QVTimperative.ecore#//GuardPattern">
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference QVTimperative.ecore#//GuardPattern/area"/>
     </genClasses>
+    <genClasses ecoreClass="QVTimperative.ecore#//ImperativeDomain"/>
     <genClasses ecoreClass="QVTimperative.ecore#//ImperativeModel"/>
+    <genClasses ecoreClass="QVTimperative.ecore#//ImperativePattern">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTimperative.ecore#//ImperativePattern/variable"/>
+      <genOperations ecoreOperation="QVTimperative.ecore#//ImperativePattern/getArea"/>
+    </genClasses>
     <genClasses ecoreClass="QVTimperative.ecore#//Mapping">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTimperative.ecore#//Mapping/mappingStatement"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTimperative.ecore#//Mapping/polledClasses"/>