Bootstrapped, regenerated all languages

41 files changed, 58 insertions, 52 deletions

diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.genmodel b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.genmodel
index 4b8ca5f..a52f056 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.genmodel
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.reference/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.reference/src-gen" forceOverwrite="true" modelName="ReferenceGrammar" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="ReferenceGrammar" basePackage="org.eclipse.xtext.reference" disposableProviderFactory="true">
     <ecorePackage href="ReferenceGrammar.ecore#/"/>
     <genClasses>
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarPackageImpl.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
index e5978b5..ccc599f 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
@@ -135,7 +135,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen
     if (isInited) return (ReferenceGrammarPackage)EPackage.Registry.INSTANCE.getEPackage(ReferenceGrammarPackage.eNS_URI);
 
     // Obtain or create and register package
-    ReferenceGrammarPackageImpl theReferenceGrammarPackage = (ReferenceGrammarPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ReferenceGrammarPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ReferenceGrammarPackageImpl());
+    ReferenceGrammarPackageImpl theReferenceGrammarPackage = (ReferenceGrammarPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReferenceGrammarPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ReferenceGrammarPackageImpl());
 
     isInited = true;
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.genmodel b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.genmodel
index f18d819..8b7b22f 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.genmodel
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.example.domainmodel/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.example.domainmodel/src-gen" forceOverwrite="true" modelName="Domainmodel" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Domainmodel" basePackage="org.eclipse.xtext.example" disposableProviderFactory="true">
     <ecorePackage href="Domainmodel.ecore#/"/>
     <genClasses>
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelPackageImpl.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelPackageImpl.java
index b58ec39..dbaf6a6 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelPackageImpl.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/impl/DomainmodelPackageImpl.java
@@ -196,7 +196,7 @@ public class DomainmodelPackageImpl extends EPackageImpl implements DomainmodelP
     if (isInited) return (DomainmodelPackage)EPackage.Registry.INSTANCE.getEPackage(DomainmodelPackage.eNS_URI);
 
     // Obtain or create and register package
-    DomainmodelPackageImpl theDomainmodelPackage = (DomainmodelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DomainmodelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DomainmodelPackageImpl());
+    DomainmodelPackageImpl theDomainmodelPackage = (DomainmodelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DomainmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DomainmodelPackageImpl());
 
     isInited = true;
 
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.genmodel b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.genmodel
index 8c525ec..f572cdb 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.genmodel
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.example.ecoredsl/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.example.ecoredsl/src-gen" forceOverwrite="true" modelName="EcoreDsl" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Ecoredsl" basePackage="org.eclipse.xtext.example" disposableProviderFactory="true">
     <ecorePackage href="EcoreDsl.ecore#/"/>
     <genClasses>
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslPackageImpl.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslPackageImpl.java
index 6b07271..3f328c3 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslPackageImpl.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslPackageImpl.java
@@ -93,7 +93,7 @@ public class EcoredslPackageImpl extends EPackageImpl implements EcoredslPackage
     if (isInited) return (EcoredslPackage)EPackage.Registry.INSTANCE.getEPackage(EcoredslPackage.eNS_URI);
 
     // Obtain or create and register package
-    EcoredslPackageImpl theEcoredslPackage = (EcoredslPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EcoredslPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EcoredslPackageImpl());
+    EcoredslPackageImpl theEcoredslPackage = (EcoredslPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EcoredslPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EcoredslPackageImpl());
 
     isInited = true;
 
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.genmodel b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.genmodel
index dc6402a..4a1e615 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.genmodel
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/FowlerDsl.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.example.fowlerdsl/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.example.fowlerdsl/src-gen" forceOverwrite="true" modelName="FowlerDsl" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Fowlerdsl" basePackage="org.eclipse.xtext.example" disposableProviderFactory="true">
     <ecorePackage href="FowlerDsl.ecore#/"/>
     <genClasses>
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/fowlerdsl/impl/FowlerdslPackageImpl.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/fowlerdsl/impl/FowlerdslPackageImpl.java
index b0cc75b..b850a20 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/fowlerdsl/impl/FowlerdslPackageImpl.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/fowlerdsl/impl/FowlerdslPackageImpl.java
@@ -117,7 +117,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka
     if (isInited) return (FowlerdslPackage)EPackage.Registry.INSTANCE.getEPackage(FowlerdslPackage.eNS_URI);
 
     // Obtain or create and register package
-    FowlerdslPackageImpl theFowlerdslPackage = (FowlerdslPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof FowlerdslPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new FowlerdslPackageImpl());
+    FowlerdslPackageImpl theFowlerdslPackage = (FowlerdslPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FowlerdslPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FowlerdslPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/enums/impl/EnumsPackageImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/enums/impl/EnumsPackageImpl.java
index 89fbed0..73cbc3b 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/enums/impl/EnumsPackageImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/enums/impl/EnumsPackageImpl.java
@@ -87,7 +87,7 @@ public class EnumsPackageImpl extends EPackageImpl implements EnumsPackage
     if (isInited) return (EnumsPackage)EPackage.Registry.INSTANCE.getEPackage(EnumsPackage.eNS_URI);
 
     // Obtain or create and register package
-    EnumsPackageImpl theEnumsPackage = (EnumsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EnumsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EnumsPackageImpl());
+    EnumsPackageImpl theEnumsPackage = (EnumsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EnumsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EnumsPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
index 2fcf030..5417510 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" modelName="XtextGrammarTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="XtextTest" basePackage="org.eclipse.xtext" disposableProviderFactory="true">
     <ecorePackage href="XtextGrammarTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
index 4169f20..3a19c70 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" modelName="EnumRulesTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="EnumRulesTestLanguage" basePackage="org.eclipse.xtext.enumrules" disposableProviderFactory="true">
     <ecorePackage href="EnumRulesTestLanguage.ecore#/"/>
     <genEnums typeSafeEnumCompatible="false">
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java
index db07649..15a452a 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java
@@ -97,7 +97,7 @@ public class EnumRulesTestLanguagePackageImpl extends EPackageImpl implements En
     if (isInited) return (EnumRulesTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(EnumRulesTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    EnumRulesTestLanguagePackageImpl theEnumRulesTestLanguagePackage = (EnumRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EnumRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EnumRulesTestLanguagePackageImpl());
+    EnumRulesTestLanguagePackageImpl theEnumRulesTestLanguagePackage = (EnumRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EnumRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EnumRulesTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/AbstractTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/AbstractTestLanguageParsetreeConstructor.java
index fbd6201..324a8ce 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/AbstractTestLanguageParsetreeConstructor.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/AbstractTestLanguageParsetreeConstructor.java
@@ -34,11 +34,12 @@ public class AbstractTestLanguageParsetreeConstructor extends AbstractParseTreeC
 
 /************ begin Rule InheritedParserRule ****************
  *
- * org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@a9a80c (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@3b05a0 (name: ID)
+ * InheritedParserRule returns mm::AType:
+ *   "element" name=ID;
  *
  **/
 
-// org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@a9a80c (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@3b05a0 (name: ID)
+// "element" name=ID
 protected class InheritedParserRule_Group extends GroupToken {
 	
 	public InheritedParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -78,7 +79,7 @@ protected class InheritedParserRule_0_Keyword_element extends KeywordToken  {
 	}	
 }
 
-// org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@a9a80c (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@3b05a0 (name: ID)
+// name=ID
 protected class InheritedParserRule_1_Assignment_name extends AssignmentToken  {
 	
 	public InheritedParserRule_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -193,11 +194,12 @@ protected class AbstractCallOverridenParserRule_1_Assignment_elements extends As
 
 /************ begin Rule OverridableParserRule ****************
  *
- * org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@b68f70 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@3b05a0 (name: ID)
+ * OverridableParserRule returns mm::AType:
+ *   "element" name=ID;
  *
  **/
 
-// org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@b68f70 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@3b05a0 (name: ID)
+// "element" name=ID
 protected class OverridableParserRule_Group extends GroupToken {
 	
 	public OverridableParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -237,7 +239,7 @@ protected class OverridableParserRule_0_Keyword_element extends KeywordToken  {
 	}	
 }
 
-// org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@b68f70 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@3b05a0 (name: ID)
+// name=ID
 protected class OverridableParserRule_1_Assignment_name extends AssignmentToken  {
 	
 	public OverridableParserRule_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -428,11 +430,12 @@ protected class AbstractCallExtendedParserRule_1_Assignment_elements extends Ass
 
 /************ begin Rule ExtendableParserRule ****************
  *
- * org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@53fcab (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@3b05a0 (name: ID)
+ * ExtendableParserRule returns mm::AType:
+ *   "element" name=ID;
  *
  **/
 
-// org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@53fcab (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@3b05a0 (name: ID)
+// "element" name=ID
 protected class ExtendableParserRule_Group extends GroupToken {
 	
 	public ExtendableParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -472,7 +475,7 @@ protected class ExtendableParserRule_0_Keyword_element extends KeywordToken  {
 	}	
 }
 
-// org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Error serializing CrossRefs: Unable to create a string represenation for reference 'AbstractRule' using org.eclipse.xtext.xtext.XtextLinkingService EReference: rule Context:org.eclipse.xtext.impl.RuleCallImpl@53fcab (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@3b05a0 (name: ID)
+// name=ID
 protected class ExtendableParserRule_1_Assignment_name extends AssignmentToken  {
 	
 	public ExtendableParserRule_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
index 27976b1..63a7fde 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" modelName="KeywordsTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="KeywordsTestLanguage" basePackage="org.eclipse.xtext.parser.keywords" disposableProviderFactory="true">
     <ecorePackage href="KeywordsTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java
index f088083..e6700f1 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java
@@ -84,7 +84,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key
     if (isInited) return (KeywordsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(KeywordsTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    KeywordsTestLanguagePackageImpl theKeywordsTestLanguagePackage = (KeywordsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof KeywordsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new KeywordsTestLanguagePackageImpl());
+    KeywordsTestLanguagePackageImpl theKeywordsTestLanguagePackage = (KeywordsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof KeywordsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new KeywordsTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel
index bed07d1..e5feb43 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" modelName="ContentAssistTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="ContentAssistTestLanguage" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="ContentAssistTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
index 9f171b1..3d383ea 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" modelName="ReferenceGrammarTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="ReferenceGrammar" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="ReferenceGrammarTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
index 868f30b..fbce1c4 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" modelName="TreeTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="TreeTestLanguage" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="TreeTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java
index 2215ab3..b706aa1 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java
@@ -117,7 +117,7 @@ public class ContentAssistTestLanguagePackageImpl extends EPackageImpl implement
     if (isInited) return (ContentAssistTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(ContentAssistTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    ContentAssistTestLanguagePackageImpl theContentAssistTestLanguagePackage = (ContentAssistTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ContentAssistTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ContentAssistTestLanguagePackageImpl());
+    ContentAssistTestLanguagePackageImpl theContentAssistTestLanguagePackage = (ContentAssistTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ContentAssistTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ContentAssistTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
index c9bb579..1bebc1b 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
@@ -133,7 +133,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen
     if (isInited) return (ReferenceGrammarPackage)EPackage.Registry.INSTANCE.getEPackage(ReferenceGrammarPackage.eNS_URI);
 
     // Obtain or create and register package
-    ReferenceGrammarPackageImpl theReferenceGrammarPackage = (ReferenceGrammarPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ReferenceGrammarPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ReferenceGrammarPackageImpl());
+    ReferenceGrammarPackageImpl theReferenceGrammarPackage = (ReferenceGrammarPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReferenceGrammarPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ReferenceGrammarPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java
index 9d76ec2..03a1a2c 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java
@@ -93,7 +93,7 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes
     if (isInited) return (TreeTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(TreeTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    TreeTestLanguagePackageImpl theTreeTestLanguagePackage = (TreeTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TreeTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TreeTestLanguagePackageImpl());
+    TreeTestLanguagePackageImpl theTreeTestLanguagePackage = (TreeTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TreeTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TreeTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.genmodel b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.genmodel
index 6545de5..eba950e 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/TwoContextsTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.common.tests/src-gen" forceOverwrite="true" modelName="TwoContextsTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="TwoContexts" basePackage="org.eclipse.xtext.ui.common.editor.contentassist.impl" disposableProviderFactory="true">
     <ecorePackage href="TwoContextsTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/TwoContextsPackageImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/TwoContextsPackageImpl.java
index c605b34..065d636 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/TwoContextsPackageImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/twoContexts/impl/TwoContextsPackageImpl.java
@@ -93,7 +93,7 @@ public class TwoContextsPackageImpl extends EPackageImpl implements TwoContextsP
     if (isInited) return (TwoContextsPackage)EPackage.Registry.INSTANCE.getEPackage(TwoContextsPackage.eNS_URI);
 
     // Obtain or create and register package
-    TwoContextsPackageImpl theTwoContextsPackage = (TwoContextsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TwoContextsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TwoContextsPackageImpl());
+    TwoContextsPackageImpl theTwoContextsPackage = (TwoContextsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TwoContextsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TwoContextsPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java
index 6e3f9b9..950782b 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java
@@ -261,7 +261,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka
     if (isInited) return (XtextTestPackage)EPackage.Registry.INSTANCE.getEPackage(XtextTestPackage.eNS_URI);
 
     // Obtain or create and register package
-    XtextTestPackageImpl theXtextTestPackage = (XtextTestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof XtextTestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new XtextTestPackageImpl());
+    XtextTestPackageImpl theXtextTestPackage = (XtextTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XtextTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XtextTestPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.genmodel b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.genmodel
index 8342388..94c4f1c 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/TestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.integration.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.ui.integration.tests/src-gen" forceOverwrite="true" modelName="TestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Foo" basePackage="org.eclipse.xtext.ui.integration" disposableProviderFactory="true">
     <ecorePackage href="TestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/foo/impl/FooPackageImpl.java b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/foo/impl/FooPackageImpl.java
index b3a891e..722a7e1 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/foo/impl/FooPackageImpl.java
+++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/foo/impl/FooPackageImpl.java
@@ -93,7 +93,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage
     if (isInited) return (FooPackage)EPackage.Registry.INSTANCE.getEPackage(FooPackage.eNS_URI);
 
     // Obtain or create and register package
-    FooPackageImpl theFooPackage = (FooPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof FooPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new FooPackageImpl());
+    FooPackageImpl theFooPackage = (FooPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FooPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FooPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
index 78cccfe..f3ce3a3 100644
--- a/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
@@ -46,5 +46,11 @@ Export-Package: org.eclipse.xtext,
  org.eclipse.xtext.testlanguages.parseTreeConstruction,

  org.eclipse.xtext.testlanguages.parser.antlr,

  org.eclipse.xtext.testlanguages.referenceGrammar,

- org.eclipse.xtext.testlanguages.treeTestLanguage

-

+ org.eclipse.xtext.testlanguages.treeTestLanguage,

+ org.eclipse.xtext.enumrules.enumRulesTestLanguage,

+ org.eclipse.xtext.enumrules,

+ org.eclipse.xtext.enumrules.parser.packrat,

+ org.eclipse.xtext.enumrules.parser.packrat.consumers,

+ org.eclipse.xtext.enumrules.parseTreeConstruction,

+ org.eclipse.xtext.enumrules.parser.antlr

+Bundle-Activator: org.eclipse.xtext.xtend.XtendTestsActivator

diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/enums/impl/EnumsPackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/enums/impl/EnumsPackageImpl.java
index 89fbed0..73cbc3b 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/enums/impl/EnumsPackageImpl.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/enums/impl/EnumsPackageImpl.java
@@ -87,7 +87,7 @@ public class EnumsPackageImpl extends EPackageImpl implements EnumsPackage
     if (isInited) return (EnumsPackage)EPackage.Registry.INSTANCE.getEPackage(EnumsPackage.eNS_URI);
 
     // Obtain or create and register package
-    EnumsPackageImpl theEnumsPackage = (EnumsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EnumsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EnumsPackageImpl());
+    EnumsPackageImpl theEnumsPackage = (EnumsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EnumsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EnumsPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
index dce86d2..2e8edb9 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" modelName="XtextGrammarTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="XtextTest" basePackage="org.eclipse.xtext" disposableProviderFactory="true">
     <ecorePackage href="XtextGrammarTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageUiModule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageUiModule.java
index ebaab2b..e6ed2a7 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageUiModule.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/AbstractEnumRulesTestLanguageUiModule.java
@@ -11,16 +11,13 @@ import org.eclipse.xtext.ui.common.service.DefaultUIModule;
  */
 public abstract class AbstractEnumRulesTestLanguageUiModule extends DefaultUIModule {
 	
-	// foo
 	
 	
-	@Override
 	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
 	}
 
 	
-	@Override
 	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
index f1b14f1..832292f 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" modelName="EnumRulesTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="EnumRulesTestLanguage" basePackage="org.eclipse.xtext.enumrules" disposableProviderFactory="true">
     <ecorePackage href="EnumRulesTestLanguage.ecore#/"/>
     <genEnums typeSafeEnumCompatible="false">
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java
index db07649..15a452a 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java
@@ -97,7 +97,7 @@ public class EnumRulesTestLanguagePackageImpl extends EPackageImpl implements En
     if (isInited) return (EnumRulesTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(EnumRulesTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    EnumRulesTestLanguagePackageImpl theEnumRulesTestLanguagePackage = (EnumRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EnumRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EnumRulesTestLanguagePackageImpl());
+    EnumRulesTestLanguagePackageImpl theEnumRulesTestLanguagePackage = (EnumRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EnumRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EnumRulesTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
index ee841e3..dae4f17 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" modelName="KeywordsTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="KeywordsTestLanguage" basePackage="org.eclipse.xtext.parser.keywords" disposableProviderFactory="true">
     <ecorePackage href="KeywordsTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java
index f088083..e6700f1 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java
@@ -84,7 +84,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key
     if (isInited) return (KeywordsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(KeywordsTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    KeywordsTestLanguagePackageImpl theKeywordsTestLanguagePackage = (KeywordsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof KeywordsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new KeywordsTestLanguagePackageImpl());
+    KeywordsTestLanguagePackageImpl theKeywordsTestLanguagePackage = (KeywordsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof KeywordsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new KeywordsTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel
index 1d42462..4889ce3 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" modelName="ContentAssistTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="ContentAssistTestLanguage" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="ContentAssistTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
index 6f6e21c..0951e31 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" modelName="ReferenceGrammarTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="ReferenceGrammar" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="ReferenceGrammarTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
index 2639aa0..bcf57a2 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="../org.eclipse.xtext.xtend.tests/src-gen" forceOverwrite="true" modelName="TreeTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="TreeTestLanguage" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="TreeTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java
index 2215ab3..b706aa1 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java
@@ -117,7 +117,7 @@ public class ContentAssistTestLanguagePackageImpl extends EPackageImpl implement
     if (isInited) return (ContentAssistTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(ContentAssistTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    ContentAssistTestLanguagePackageImpl theContentAssistTestLanguagePackage = (ContentAssistTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ContentAssistTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ContentAssistTestLanguagePackageImpl());
+    ContentAssistTestLanguagePackageImpl theContentAssistTestLanguagePackage = (ContentAssistTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ContentAssistTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ContentAssistTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
index c9bb579..1bebc1b 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
@@ -133,7 +133,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen
     if (isInited) return (ReferenceGrammarPackage)EPackage.Registry.INSTANCE.getEPackage(ReferenceGrammarPackage.eNS_URI);
 
     // Obtain or create and register package
-    ReferenceGrammarPackageImpl theReferenceGrammarPackage = (ReferenceGrammarPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ReferenceGrammarPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ReferenceGrammarPackageImpl());
+    ReferenceGrammarPackageImpl theReferenceGrammarPackage = (ReferenceGrammarPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReferenceGrammarPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ReferenceGrammarPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java
index 9d76ec2..03a1a2c 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java
@@ -93,7 +93,7 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes
     if (isInited) return (TreeTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(TreeTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    TreeTestLanguagePackageImpl theTreeTestLanguagePackage = (TreeTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TreeTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TreeTestLanguagePackageImpl());
+    TreeTestLanguagePackageImpl theTreeTestLanguagePackage = (TreeTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TreeTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TreeTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java
index 6e3f9b9..950782b 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java
@@ -261,7 +261,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka
     if (isInited) return (XtextTestPackage)EPackage.Registry.INSTANCE.getEPackage(XtextTestPackage.eNS_URI);
 
     // Obtain or create and register package
-    XtextTestPackageImpl theXtextTestPackage = (XtextTestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof XtextTestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new XtextTestPackageImpl());
+    XtextTestPackageImpl theXtextTestPackage = (XtextTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XtextTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XtextTestPackageImpl());
 
     isInited = true;