[511646] Generate QVTc CS DirectionCS using TypedModel

11 files changed, 52 insertions, 50 deletions

diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g
index 4e669d12b..211ffa493 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g
@@ -24893,12 +24893,12 @@ rule__DirectionCS__UsesAssignment_5_1
     }
 :
 (
-{ before(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_1_0()); }
+{ before(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_1_0()); }
 (
-{ before(grammarAccess.getDirectionCSAccess().getUsesCoreDomainUnrestrictedNameParserRuleCall_5_1_0_1()); }
-	ruleUnrestrictedName{ after(grammarAccess.getDirectionCSAccess().getUsesCoreDomainUnrestrictedNameParserRuleCall_5_1_0_1()); }
+{ before(grammarAccess.getDirectionCSAccess().getUsesTypedModelUnrestrictedNameParserRuleCall_5_1_0_1()); }
+	ruleUnrestrictedName{ after(grammarAccess.getDirectionCSAccess().getUsesTypedModelUnrestrictedNameParserRuleCall_5_1_0_1()); }
 )
-{ after(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_1_0()); }
+{ after(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_1_0()); }
 )
 
 ;
@@ -24912,12 +24912,12 @@ rule__DirectionCS__UsesAssignment_5_2_1
     }
 :
 (
-{ before(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_2_1_0()); }
+{ before(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_2_1_0()); }
 (
-{ before(grammarAccess.getDirectionCSAccess().getUsesCoreDomainUnrestrictedNameParserRuleCall_5_2_1_0_1()); }
-	ruleUnrestrictedName{ after(grammarAccess.getDirectionCSAccess().getUsesCoreDomainUnrestrictedNameParserRuleCall_5_2_1_0_1()); }
+{ before(grammarAccess.getDirectionCSAccess().getUsesTypedModelUnrestrictedNameParserRuleCall_5_2_1_0_1()); }
+	ruleUnrestrictedName{ after(grammarAccess.getDirectionCSAccess().getUsesTypedModelUnrestrictedNameParserRuleCall_5_2_1_0_1()); }
 )
-{ after(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_2_1_0()); }
+{ after(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_2_1_0()); }
 )
 
 ;
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java
index 150c26020..419ad343f 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java
@@ -73126,13 +73126,13 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser {
             // InternalQVTcore.g:24896:1: ( ruleUnrestrictedName )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_1_0());
+               before(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_1_0());
             }
             // InternalQVTcore.g:24897:1: ( ruleUnrestrictedName )
             // InternalQVTcore.g:24898:1: ruleUnrestrictedName
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getDirectionCSAccess().getUsesCoreDomainUnrestrictedNameParserRuleCall_5_1_0_1());
+               before(grammarAccess.getDirectionCSAccess().getUsesTypedModelUnrestrictedNameParserRuleCall_5_1_0_1());
             }
             pushFollow(FollowSets000.FOLLOW_2);
             ruleUnrestrictedName();
@@ -73140,13 +73140,13 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser {
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getDirectionCSAccess().getUsesCoreDomainUnrestrictedNameParserRuleCall_5_1_0_1());
+               after(grammarAccess.getDirectionCSAccess().getUsesTypedModelUnrestrictedNameParserRuleCall_5_1_0_1());
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_1_0());
+               after(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_1_0());
             }
 
             }
@@ -73183,13 +73183,13 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser {
             // InternalQVTcore.g:24915:1: ( ruleUnrestrictedName )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_2_1_0());
+               before(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_2_1_0());
             }
             // InternalQVTcore.g:24916:1: ( ruleUnrestrictedName )
             // InternalQVTcore.g:24917:1: ruleUnrestrictedName
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getDirectionCSAccess().getUsesCoreDomainUnrestrictedNameParserRuleCall_5_2_1_0_1());
+               before(grammarAccess.getDirectionCSAccess().getUsesTypedModelUnrestrictedNameParserRuleCall_5_2_1_0_1());
             }
             pushFollow(FollowSets000.FOLLOW_2);
             ruleUnrestrictedName();
@@ -73197,13 +73197,13 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser {
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getDirectionCSAccess().getUsesCoreDomainUnrestrictedNameParserRuleCall_5_2_1_0_1());
+               after(grammarAccess.getDirectionCSAccess().getUsesTypedModelUnrestrictedNameParserRuleCall_5_2_1_0_1());
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_2_1_0());
+               after(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_2_1_0());
             }
 
             }
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/DirectionCS.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/DirectionCS.java
index 5a1ff50bb..2cd0fe268 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/DirectionCS.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/DirectionCS.java
@@ -16,6 +16,7 @@ package org.eclipse.qvtd.xtext.qvtcorecs;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.ocl.xtext.basecs.NamedElementCS;
+import org.eclipse.qvtd.pivot.qvtbase.TypedModel;
 import org.eclipse.qvtd.pivot.qvtcore.CoreDomain;
 
 /**
@@ -54,7 +55,7 @@ public interface DirectionCS extends NamedElementCS {
 
 	/**
 	 * Returns the value of the '<em><b>Uses</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.qvtd.pivot.qvtcore.CoreDomain}.
+	 * The list contents are of type {@link org.eclipse.qvtd.pivot.qvtbase.TypedModel}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Uses</em>' reference list isn't clear,
@@ -66,6 +67,6 @@ public interface DirectionCS extends NamedElementCS {
 	 * @model
 	 * @generated
 	 */
-	EList<CoreDomain> getUses();
+	EList<TypedModel> getUses();
 
 } // DirectionCS
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/DirectionCSImpl.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/DirectionCSImpl.java
index 8a843082a..dc5298be8 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/DirectionCSImpl.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/DirectionCSImpl.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.ocl.xtext.basecs.impl.NamedElementCSImpl;
 import org.eclipse.ocl.xtext.basecs.util.BaseCSVisitor;
+import org.eclipse.qvtd.pivot.qvtbase.TypedModel;
 import org.eclipse.qvtd.pivot.qvtcore.CoreDomain;
 import org.eclipse.qvtd.xtext.qvtcorecs.DirectionCS;
 import org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage;
@@ -60,7 +61,7 @@ public class DirectionCSImpl extends NamedElementCSImpl implements DirectionCS {
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CoreDomain> uses;
+	protected EList<TypedModel> uses;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -100,9 +101,9 @@ public class DirectionCSImpl extends NamedElementCSImpl implements DirectionCS {
 	 * @generated
 	 */
 	@Override
-	public EList<CoreDomain> getUses() {
+	public EList<TypedModel> getUses() {
 		if (uses == null) {
-			uses = new EObjectResolvingEList<CoreDomain>(CoreDomain.class, this, QVTcoreCSPackage.DIRECTION_CS__USES);
+			uses = new EObjectResolvingEList<TypedModel>(TypedModel.class, this, QVTcoreCSPackage.DIRECTION_CS__USES);
 		}
 		return uses;
 	}
@@ -138,7 +139,7 @@ public class DirectionCSImpl extends NamedElementCSImpl implements DirectionCS {
 				return;
 			case QVTcoreCSPackage.DIRECTION_CS__USES:
 				getUses().clear();
-				getUses().addAll((Collection<? extends CoreDomain>)newValue);
+				getUses().addAll((Collection<? extends TypedModel>)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/QVTcoreCSPackageImpl.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/QVTcoreCSPackageImpl.java
index 4a408b409..181b1f42a 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/QVTcoreCSPackageImpl.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/QVTcoreCSPackageImpl.java
@@ -890,9 +890,9 @@ public class QVTcoreCSPackageImpl extends EPackageImpl implements QVTcoreCSPacka
 		// Obtain other dependent packages
 		BaseCSPackage theBaseCSPackage = (BaseCSPackage)EPackage.Registry.INSTANCE.getEPackage(BaseCSPackage.eNS_URI);
 		PivotPackage thePivotPackage = (PivotPackage)EPackage.Registry.INSTANCE.getEPackage(PivotPackage.eNS_URI);
-		QVTcorePackage theQVTcorePackage = (QVTcorePackage)EPackage.Registry.INSTANCE.getEPackage(QVTcorePackage.eNS_URI);
 		QVTbasePackage theQVTbasePackage = (QVTbasePackage)EPackage.Registry.INSTANCE.getEPackage(QVTbasePackage.eNS_URI);
 		EssentialOCLCSPackage theEssentialOCLCSPackage = (EssentialOCLCSPackage)EPackage.Registry.INSTANCE.getEPackage(EssentialOCLCSPackage.eNS_URI);
+		QVTcorePackage theQVTcorePackage = (QVTcorePackage)EPackage.Registry.INSTANCE.getEPackage(QVTcorePackage.eNS_URI);
 		QVTbaseCSPackage theQVTbaseCSPackage = (QVTbaseCSPackage)EPackage.Registry.INSTANCE.getEPackage(QVTbaseCSPackage.eNS_URI);
 
 		// Create type parameters
@@ -930,7 +930,7 @@ public class QVTcoreCSPackageImpl extends EPackageImpl implements QVTcoreCSPacka
 
 		initEClass(directionCSEClass, DirectionCS.class, "DirectionCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getDirectionCS_Imports(), thePivotPackage.getPackage(), null, "imports", null, 0, -1, DirectionCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDirectionCS_Uses(), theQVTcorePackage.getCoreDomain(), null, "uses", null, 0, -1, DirectionCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDirectionCS_Uses(), theQVTbasePackage.getTypedModel(), null, "uses", null, 0, -1, DirectionCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(domainCSEClass, DomainCS.class, "DomainCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getDomainCS_IsCheck(), ecorePackage.getEBoolean(), "isCheck", null, 0, 1, DomainCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin
index 3234906e5..dd113a122 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java
index 2137b7bfb..79966fa8f 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java
@@ -124,7 +124,7 @@ public class QVTcoreGrammarResource extends AbstractGrammarResource
 
 		private static void initParserRules() {
 			PR_BottomPatternCS.setAlternatives(createAlternatives(createGroup(createKeyword("{"), createAlternatives(createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_UnrealizedVariableCS)), createAssignment("ownedRealizedVariables", "+=", createRuleCall(PR_RealizedVariableCS))), setCardinality("*", createGroup(createKeyword(","), createAlternatives(createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_UnrealizedVariableCS)), createAssignment("ownedRealizedVariables", "+=", createRuleCall(PR_RealizedVariableCS))))), createKeyword("|"), setCardinality("*", createAssignment("ownedConstraints", "+=", createRuleCall(PR_PredicateOrAssignmentCS))), createKeyword("}")), createGroup(createKeyword("{"), createAlternatives(createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_UnrealizedVariableCS)), createAssignment("ownedRealizedVariables", "+=", createRuleCall(PR_RealizedVariableCS))), setCardinality("*", createGroup(createKeyword(","), createAlternatives(createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_UnrealizedVariableCS)), createAssignment("ownedRealizedVariables", "+=", createRuleCall(PR_RealizedVariableCS))))), createKeyword("}")), createGroup(createKeyword("{"), setCardinality("+", createAssignment("ownedConstraints", "+=", createRuleCall(PR_PredicateOrAssignmentCS))), createKeyword("}")), createGroup(createAction(null, null, createTypeRef(MM, org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage.Literals.BOTTOM_PATTERN_CS)), createKeyword("{"), createKeyword("}"))));
-			PR_DirectionCS.setAlternatives(createGroup(createAction(null, null, createTypeRef(MM, org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage.Literals.DIRECTION_CS)), setCardinality("?", createAssignment("name", "=", createRuleCall(PR_UnrestrictedName))), createKeyword("imports"), createAssignment("imports", "+=", createCrossReference(createTypeRef(MM_pivot, org.eclipse.ocl.pivot.PivotPackage.Literals.PACKAGE), createRuleCall(PR_UnrestrictedName))), setCardinality("*", createGroup(createKeyword(","), createAssignment("imports", "+=", createCrossReference(createTypeRef(MM_pivot, org.eclipse.ocl.pivot.PivotPackage.Literals.PACKAGE), createRuleCall(PR_UnrestrictedName))))), setCardinality("?", createGroup(createKeyword("uses"), createAssignment("uses", "+=", createCrossReference(createTypeRef(MM_qvtcore, org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage.Literals.CORE_DOMAIN), createRuleCall(PR_UnrestrictedName))), setCardinality("*", createGroup(createKeyword(","), createAssignment("uses", "+=", createCrossReference(createTypeRef(MM_qvtcore, org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage.Literals.CORE_DOMAIN), createRuleCall(PR_UnrestrictedName)))))))));
+			PR_DirectionCS.setAlternatives(createGroup(createAction(null, null, createTypeRef(MM, org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage.Literals.DIRECTION_CS)), setCardinality("?", createAssignment("name", "=", createRuleCall(PR_UnrestrictedName))), createKeyword("imports"), createAssignment("imports", "+=", createCrossReference(createTypeRef(MM_pivot, org.eclipse.ocl.pivot.PivotPackage.Literals.PACKAGE), createRuleCall(PR_UnrestrictedName))), setCardinality("*", createGroup(createKeyword(","), createAssignment("imports", "+=", createCrossReference(createTypeRef(MM_pivot, org.eclipse.ocl.pivot.PivotPackage.Literals.PACKAGE), createRuleCall(PR_UnrestrictedName))))), setCardinality("?", createGroup(createKeyword("uses"), createAssignment("uses", "+=", createCrossReference(createTypeRef(MM_qvtbase, org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage.Literals.TYPED_MODEL), createRuleCall(PR_UnrestrictedName))), setCardinality("*", createGroup(createKeyword(","), createAssignment("uses", "+=", createCrossReference(createTypeRef(MM_qvtbase, org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage.Literals.TYPED_MODEL), createRuleCall(PR_UnrestrictedName)))))))));
 			PR_GuardPatternCS.setAlternatives(createAlternatives(createGroup(createKeyword("("), createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_GuardVariableCS)), setCardinality("*", createGroup(createKeyword(","), createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_GuardVariableCS)))), createKeyword("|"), setCardinality("*", createAssignment("ownedPredicates", "+=", createRuleCall(PR_PredicateCS))), createKeyword(")")), createGroup(createKeyword("("), createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_GuardVariableCS)), setCardinality("*", createGroup(createKeyword(","), createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_GuardVariableCS)))), createKeyword(")")), createGroup(createKeyword("("), setCardinality("+", createAssignment("ownedPredicates", "+=", createRuleCall(PR_PredicateCS))), createKeyword(")")), createGroup(createAction(null, null, createTypeRef(MM, org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage.Literals.GUARD_PATTERN_CS)), createKeyword("("), createKeyword(")"))));
 			PR_GuardVariableCS.setAlternatives(createGroup(createAssignment("name", "=", createRuleCall(PR_UnrestrictedName)), createKeyword(":"), createAssignment("ownedType", "=", createRuleCall(_EssentialOCL.PR_TypeExpCS))));
 			PR_ImportCS.setAlternatives(createGroup(createKeyword("import"), setCardinality("?", createGroup(createAssignment("name", "=", createRuleCall(_Base.PR_Identifier)), createKeyword(":"))), createAssignment("ownedPathName", "=", createRuleCall(_EssentialOCL.PR_URIPathNameCS)), setCardinality("?", createGroup(createAssignment("isAll", "?=", createKeyword("::")), createKeyword("*"))), createKeyword(";")));
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g
index f7760e437..951d55baa 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g
@@ -551,7 +551,7 @@ ruleDirectionCS returns [EObject current=null]
 	        }
         }
 		{
-	        newCompositeNode(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_1_0());
+	        newCompositeNode(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_1_0());
 	    }
 		ruleUnrestrictedName		{
 	        afterParserOrEnumRuleCall();
@@ -573,7 +573,7 @@ ruleDirectionCS returns [EObject current=null]
 	        }
         }
 		{
-	        newCompositeNode(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_2_1_0());
+	        newCompositeNode(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_2_1_0());
 	    }
 		ruleUnrestrictedName		{
 	        afterParserOrEnumRuleCall();
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java
index e6287bc46..0b5dacf70 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java
@@ -1756,7 +1756,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser {
                     }
                     if ( state.backtracking==0 ) {
 
-                      	        newCompositeNode(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_1_0());
+                      	        newCompositeNode(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_1_0());
 
                     }
                     pushFollow(FollowSets000.FOLLOW_13);
@@ -1816,7 +1816,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser {
                     	    }
                     	    if ( state.backtracking==0 ) {
 
-                    	      	        newCompositeNode(grammarAccess.getDirectionCSAccess().getUsesCoreDomainCrossReference_5_2_1_0());
+                    	      	        newCompositeNode(grammarAccess.getDirectionCSAccess().getUsesTypedModelCrossReference_5_2_1_0());
 
                     	    }
                     	    pushFollow(FollowSets000.FOLLOW_13);
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java
index 5cb46adda..432378f78 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java
@@ -526,7 +526,7 @@ public abstract class AbstractQVTcoreSemanticSequencer extends QVTbaseSemanticSe
 	 *         name=UnrestrictedName?
 	 *         imports+=[Package|UnrestrictedName]
 	 *         imports+=[Package|UnrestrictedName]*
-	 *         (uses+=[CoreDomain|UnrestrictedName] uses+=[CoreDomain|UnrestrictedName]*)?
+	 *         (uses+=[TypedModel|UnrestrictedName] uses+=[TypedModel|UnrestrictedName]*)?
 	 *     )
 	 */
 	protected void sequence_DirectionCS(ISerializationContext context, DirectionCS semanticObject) {
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java
index 8bedb7ecd..ab162998b 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java
@@ -299,23 +299,23 @@ public class QVTcoreGrammarAccess extends AbstractGrammarElementFinder {
 		private final Group cGroup_5 = (Group)cGroup.eContents().get(5);
 		private final Keyword cUsesKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);
 		private final Assignment cUsesAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);
-		private final CrossReference cUsesCoreDomainCrossReference_5_1_0 = (CrossReference)cUsesAssignment_5_1.eContents().get(0);
-		private final RuleCall cUsesCoreDomainUnrestrictedNameParserRuleCall_5_1_0_1 = (RuleCall)cUsesCoreDomainCrossReference_5_1_0.eContents().get(1);
+		private final CrossReference cUsesTypedModelCrossReference_5_1_0 = (CrossReference)cUsesAssignment_5_1.eContents().get(0);
+		private final RuleCall cUsesTypedModelUnrestrictedNameParserRuleCall_5_1_0_1 = (RuleCall)cUsesTypedModelCrossReference_5_1_0.eContents().get(1);
 		private final Group cGroup_5_2 = (Group)cGroup_5.eContents().get(2);
 		private final Keyword cCommaKeyword_5_2_0 = (Keyword)cGroup_5_2.eContents().get(0);
 		private final Assignment cUsesAssignment_5_2_1 = (Assignment)cGroup_5_2.eContents().get(1);
-		private final CrossReference cUsesCoreDomainCrossReference_5_2_1_0 = (CrossReference)cUsesAssignment_5_2_1.eContents().get(0);
-		private final RuleCall cUsesCoreDomainUnrestrictedNameParserRuleCall_5_2_1_0_1 = (RuleCall)cUsesCoreDomainCrossReference_5_2_1_0.eContents().get(1);
+		private final CrossReference cUsesTypedModelCrossReference_5_2_1_0 = (CrossReference)cUsesAssignment_5_2_1.eContents().get(0);
+		private final RuleCall cUsesTypedModelUnrestrictedNameParserRuleCall_5_2_1_0_1 = (RuleCall)cUsesTypedModelCrossReference_5_2_1_0.eContents().get(1);
 
 		//DirectionCS:
 		//	{DirectionCS} name=UnrestrictedName? 'imports' imports+=[pivot::Package|UnrestrictedName] (','
-		//	imports+=[pivot::Package|UnrestrictedName])* ('uses' uses+=[qvtcore::CoreDomain|UnrestrictedName] (','
-		//	uses+=[qvtcore::CoreDomain|UnrestrictedName])*)?;
+		//	imports+=[pivot::Package|UnrestrictedName])* ('uses' uses+=[qvtbase::TypedModel|UnrestrictedName] (','
+		//	uses+=[qvtbase::TypedModel|UnrestrictedName])*)?;
 		@Override public ParserRule getRule() { return rule; }
 
 		//{DirectionCS} name=UnrestrictedName? 'imports' imports+=[pivot::Package|UnrestrictedName] (','
-		//imports+=[pivot::Package|UnrestrictedName])* ('uses' uses+=[qvtcore::CoreDomain|UnrestrictedName] (','
-		//uses+=[qvtcore::CoreDomain|UnrestrictedName])*)?
+		//imports+=[pivot::Package|UnrestrictedName])* ('uses' uses+=[qvtbase::TypedModel|UnrestrictedName] (','
+		//uses+=[qvtbase::TypedModel|UnrestrictedName])*)?
 		public Group getGroup() { return cGroup; }
 
 		//{DirectionCS}
@@ -354,35 +354,35 @@ public class QVTcoreGrammarAccess extends AbstractGrammarElementFinder {
 		//UnrestrictedName
 		public RuleCall getImportsPackageUnrestrictedNameParserRuleCall_4_1_0_1() { return cImportsPackageUnrestrictedNameParserRuleCall_4_1_0_1; }
 
-		//('uses' uses+=[qvtcore::CoreDomain|UnrestrictedName] (',' uses+=[qvtcore::CoreDomain|UnrestrictedName])*)?
+		//('uses' uses+=[qvtbase::TypedModel|UnrestrictedName] (',' uses+=[qvtbase::TypedModel|UnrestrictedName])*)?
 		public Group getGroup_5() { return cGroup_5; }
 
 		//'uses'
 		public Keyword getUsesKeyword_5_0() { return cUsesKeyword_5_0; }
 
-		//uses+=[qvtcore::CoreDomain|UnrestrictedName]
+		//uses+=[qvtbase::TypedModel|UnrestrictedName]
 		public Assignment getUsesAssignment_5_1() { return cUsesAssignment_5_1; }
 
-		//[qvtcore::CoreDomain|UnrestrictedName]
-		public CrossReference getUsesCoreDomainCrossReference_5_1_0() { return cUsesCoreDomainCrossReference_5_1_0; }
+		//[qvtbase::TypedModel|UnrestrictedName]
+		public CrossReference getUsesTypedModelCrossReference_5_1_0() { return cUsesTypedModelCrossReference_5_1_0; }
 
 		//UnrestrictedName
-		public RuleCall getUsesCoreDomainUnrestrictedNameParserRuleCall_5_1_0_1() { return cUsesCoreDomainUnrestrictedNameParserRuleCall_5_1_0_1; }
+		public RuleCall getUsesTypedModelUnrestrictedNameParserRuleCall_5_1_0_1() { return cUsesTypedModelUnrestrictedNameParserRuleCall_5_1_0_1; }
 
-		//(',' uses+=[qvtcore::CoreDomain|UnrestrictedName])*
+		//(',' uses+=[qvtbase::TypedModel|UnrestrictedName])*
 		public Group getGroup_5_2() { return cGroup_5_2; }
 
 		//','
 		public Keyword getCommaKeyword_5_2_0() { return cCommaKeyword_5_2_0; }
 
-		//uses+=[qvtcore::CoreDomain|UnrestrictedName]
+		//uses+=[qvtbase::TypedModel|UnrestrictedName]
 		public Assignment getUsesAssignment_5_2_1() { return cUsesAssignment_5_2_1; }
 
-		//[qvtcore::CoreDomain|UnrestrictedName]
-		public CrossReference getUsesCoreDomainCrossReference_5_2_1_0() { return cUsesCoreDomainCrossReference_5_2_1_0; }
+		//[qvtbase::TypedModel|UnrestrictedName]
+		public CrossReference getUsesTypedModelCrossReference_5_2_1_0() { return cUsesTypedModelCrossReference_5_2_1_0; }
 
 		//UnrestrictedName
-		public RuleCall getUsesCoreDomainUnrestrictedNameParserRuleCall_5_2_1_0_1() { return cUsesCoreDomainUnrestrictedNameParserRuleCall_5_2_1_0_1; }
+		public RuleCall getUsesTypedModelUnrestrictedNameParserRuleCall_5_2_1_0_1() { return cUsesTypedModelUnrestrictedNameParserRuleCall_5_2_1_0_1; }
 	}
 
 	public class GuardPatternCSElements extends AbstractParserRuleElementFinder {
@@ -1607,8 +1607,8 @@ public class QVTcoreGrammarAccess extends AbstractGrammarElementFinder {
 
 	//DirectionCS:
 	//	{DirectionCS} name=UnrestrictedName? 'imports' imports+=[pivot::Package|UnrestrictedName] (','
-	//	imports+=[pivot::Package|UnrestrictedName])* ('uses' uses+=[qvtcore::CoreDomain|UnrestrictedName] (','
-	//	uses+=[qvtcore::CoreDomain|UnrestrictedName])*)?;
+	//	imports+=[pivot::Package|UnrestrictedName])* ('uses' uses+=[qvtbase::TypedModel|UnrestrictedName] (','
+	//	uses+=[qvtbase::TypedModel|UnrestrictedName])*)?;
 	public DirectionCSElements getDirectionCSAccess() {
 		return pDirectionCS;
 	}