Fix: https://bugs.eclipse.org/bugs/show_bug.cgi?id=272566

117 files changed, 5021 insertions, 116 deletions

diff --git a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
index 7f20c36..7ba2235 100644
--- a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
@@ -150,5 +150,6 @@ Export-Package: org.eclipse.xtext,
  org.eclipse.xtext.xtext.ecoreInference.parser.packrat,

  org.eclipse.xtext.xtext.ecoreInference.parser.packrat.consumers,

  org.eclipse.xtext.xtext.ecoreInference.parseTreeConstruction,

- org.eclipse.xtext.xtext.ecoreInference.parser.antlr

+ org.eclipse.xtext.xtext.ecoreInference.parser.antlr,

+ org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage

 

diff --git a/tests/org.eclipse.xtext.generator.tests/plugin.xml_gen b/tests/org.eclipse.xtext.generator.tests/plugin.xml_gen
index 1575402..908fc73 100644
--- a/tests/org.eclipse.xtext.generator.tests/plugin.xml_gen
+++ b/tests/org.eclipse.xtext.generator.tests/plugin.xml_gen
@@ -332,4 +332,13 @@
   </extension>
 
 
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <package 
+       uri = "http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest" 
+       class = "org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage"
+       genModel = "org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel" /> 
+	
+  </extension>
+
+
 </plugin>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
index 7881197..e7efda8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.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.generator.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.generator.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.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.genmodel
index 7f5406d..ed47075 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="ImportUriTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="ImportedURI" basePackage="org.eclipse.xtext.crossrefs" disposableProviderFactory="true">
     <ecorePackage href="ImportUriTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.genmodel
index faeb999..3ebe279 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/LangATestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="LangATestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="LangATestLanguage" basePackage="org.eclipse.xtext.crossrefs" disposableProviderFactory="true">
     <ecorePackage href="LangATestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/importedURI/impl/ImportedURIPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/importedURI/impl/ImportedURIPackageImpl.java
index f85e44e..e3262cc 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/importedURI/impl/ImportedURIPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/importedURI/impl/ImportedURIPackageImpl.java
@@ -101,7 +101,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP
     if (isInited) return (ImportedURIPackage)EPackage.Registry.INSTANCE.getEPackage(ImportedURIPackage.eNS_URI);
 
     // Obtain or create and register package
-    ImportedURIPackageImpl theImportedURIPackage = (ImportedURIPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ImportedURIPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ImportedURIPackageImpl());
+    ImportedURIPackageImpl theImportedURIPackage = (ImportedURIPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ImportedURIPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ImportedURIPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/langATestLanguage/impl/LangATestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/langATestLanguage/impl/LangATestLanguagePackageImpl.java
index 3f38c1e..3a656be 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/langATestLanguage/impl/LangATestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/langATestLanguage/impl/LangATestLanguagePackageImpl.java
@@ -101,7 +101,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT
     if (isInited) return (LangATestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(LangATestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    LangATestLanguagePackageImpl theLangATestLanguagePackage = (LangATestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LangATestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LangATestLanguagePackageImpl());
+    LangATestLanguagePackageImpl theLangATestLanguagePackage = (LangATestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LangATestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LangATestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/LazyLinkingTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/LazyLinkingTestLanguage.genmodel
index ca791f2..7422ce5 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/LazyLinkingTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/LazyLinkingTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="LazyLinkingTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="LazyLinking" basePackage="org.eclipse.xtext.crossrefs.lazy" disposableProviderFactory="true">
     <ecorePackage href="LazyLinkingTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java
index 35e9aee..6b3e968 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java
@@ -101,7 +101,7 @@ public class LazyLinkingPackageImpl extends EPackageImpl implements LazyLinkingP
     if (isInited) return (LazyLinkingPackage)EPackage.Registry.INSTANCE.getEPackage(LazyLinkingPackage.eNS_URI);
 
     // Obtain or create and register package
-    LazyLinkingPackageImpl theLazyLinkingPackage = (LazyLinkingPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LazyLinkingPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LazyLinkingPackageImpl());
+    LazyLinkingPackageImpl theLazyLinkingPackage = (LazyLinkingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LazyLinkingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LazyLinkingPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.genmodel
index 8a3c78c..a5deb1c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="DummyTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="DummyLang" basePackage="org.eclipse.xtext.dummy" disposableProviderFactory="true">
     <ecorePackage href="DummyTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangPackageImpl.java
index 7ab3cf4..d63fd83 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangPackageImpl.java
@@ -93,7 +93,7 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka
     if (isInited) return (DummyLangPackage)EPackage.Registry.INSTANCE.getEPackage(DummyLangPackage.eNS_URI);
 
     // Obtain or create and register package
-    DummyLangPackageImpl theDummyLangPackage = (DummyLangPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DummyLangPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DummyLangPackageImpl());
+    DummyLangPackageImpl theDummyLangPackage = (DummyLangPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DummyLangPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DummyLangPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
index ec9669f..9fdcf07 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.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.generator.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.generator.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.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java
index 7fd7805..42fe0a6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java
@@ -95,7 +95,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.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.genmodel
index 94a7f08..d8ab740 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="lowerCaseNamedTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="LowerCaseNamedTestLanguage" basePackage="org.eclipse.xtext.generator" disposableProviderFactory="true">
     <ecorePackage href="lowerCaseNamedTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage/impl/LowerCaseNamedTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage/impl/LowerCaseNamedTestLanguagePackageImpl.java
index 8a89c43..9cb7f1e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage/impl/LowerCaseNamedTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/generator/lowerCaseNamedTestLanguage/impl/LowerCaseNamedTestLanguagePackageImpl.java
@@ -84,7 +84,7 @@ public class LowerCaseNamedTestLanguagePackageImpl extends EPackageImpl implemen
     if (isInited) return (LowerCaseNamedTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(LowerCaseNamedTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    LowerCaseNamedTestLanguagePackageImpl theLowerCaseNamedTestLanguagePackage = (LowerCaseNamedTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LowerCaseNamedTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LowerCaseNamedTestLanguagePackageImpl());
+    LowerCaseNamedTestLanguagePackageImpl theLowerCaseNamedTestLanguagePackage = (LowerCaseNamedTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LowerCaseNamedTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LowerCaseNamedTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.genmodel
index d536bcc..2f6c1cf 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="BaseInheritanceTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="BaseInheritanceTest" basePackage="org.eclipse.xtext.grammarinheritance" disposableProviderFactory="true">
     <ecorePackage href="BaseInheritanceTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.genmodel
index 86b96ca..e8084e0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="ConcreteTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Foo" basePackage="org.eclipse.xtext.grammarinheritance" disposableProviderFactory="true">
     <ecorePackage href="ConcreteTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.genmodel
index 28fbf91..76e7c9b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="InheritanceTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="InheritanceTest" basePackage="org.eclipse.xtext.grammarinheritance" disposableProviderFactory="true">
     <ecorePackage href="InheritanceTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestPackageImpl.java
index 908bc57..7d60468 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestPackageImpl.java
@@ -84,7 +84,7 @@ public class BaseInheritanceTestPackageImpl extends EPackageImpl implements Base
     if (isInited) return (BaseInheritanceTestPackage)EPackage.Registry.INSTANCE.getEPackage(BaseInheritanceTestPackage.eNS_URI);
 
     // Obtain or create and register package
-    BaseInheritanceTestPackageImpl theBaseInheritanceTestPackage = (BaseInheritanceTestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof BaseInheritanceTestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new BaseInheritanceTestPackageImpl());
+    BaseInheritanceTestPackageImpl theBaseInheritanceTestPackage = (BaseInheritanceTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BaseInheritanceTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BaseInheritanceTestPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooPackageImpl.java
index b2cd501..500146b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooPackageImpl.java
@@ -143,7 +143,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.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestPackageImpl.java
index b7f0487..4587de2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestPackageImpl.java
@@ -95,7 +95,7 @@ public class InheritanceTestPackageImpl extends EPackageImpl implements Inherita
     if (isInited) return (InheritanceTestPackage)EPackage.Registry.INSTANCE.getEPackage(InheritanceTestPackage.eNS_URI);
 
     // Obtain or create and register package
-    InheritanceTestPackageImpl theInheritanceTestPackage = (InheritanceTestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof InheritanceTestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new InheritanceTestPackageImpl());
+    InheritanceTestPackageImpl theInheritanceTestPackage = (InheritanceTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InheritanceTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InheritanceTestPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/AbstractTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/AbstractTestLanguageParsetreeConstructor.java
index 74c78af..324a8ce 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/AbstractTestLanguageParsetreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.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@ffe5fb (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@2d4b9c (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@ffe5fb (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@2d4b9c (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@ffe5fb (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@2d4b9c (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@a5cc97 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@2d4b9c (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@a5cc97 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@2d4b9c (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@a5cc97 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@2d4b9c (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@7cc86f (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@2d4b9c (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@7cc86f (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@2d4b9c (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@7cc86f (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@2d4b9c (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.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/ConcreteTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/ConcreteTestLanguageParsetreeConstructor.java
index 2a7454f..0d3f8a7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/ConcreteTestLanguageParsetreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parseTreeConstruction/ConcreteTestLanguageParsetreeConstructor.java
@@ -41,11 +41,12 @@ public class ConcreteTestLanguageParsetreeConstructor extends AbstractParseTreeC
 
 /************ begin Rule RootRule ****************
  *
- * 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@e46f7b (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@4712c3 (name: OverridableParserRule2) (definesHiddenTokens: false)
+ * RootRule:
+ *   ConcreteParserRule|CallOverridenParserRule|CallExtendedParserRule|OverridableParserRule2;
  *
  **/
 
-// 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@e46f7b (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@4712c3 (name: OverridableParserRule2) (definesHiddenTokens: false)
+// ConcreteParserRule|CallOverridenParserRule|CallExtendedParserRule|OverridableParserRule2
 protected class RootRule_Alternatives extends AlternativesToken {
 
 	public RootRule_Alternatives(IInstanceDescription curr, AbstractToken pred) {
@@ -128,7 +129,7 @@ protected class RootRule_2_RuleCall_CallExtendedParserRule extends RuleCallToken
 	}
 }
 
-// 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@e46f7b (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@4712c3 (name: OverridableParserRule2) (definesHiddenTokens: false)
+// OverridableParserRule2
 protected class RootRule_3_RuleCall_OverridableParserRule2 extends RuleCallToken {
 	
 	public RootRule_3_RuleCall_OverridableParserRule2(IInstanceDescription curr, AbstractToken pred) {
@@ -283,11 +284,12 @@ protected class ConcreteParserRule_3_Assignment_elements extends AssignmentToken
 
 /************ 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@8704f7 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+ * OverridableParserRule returns mm::AType:
+ *   "overriddenelement" 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@8704f7 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// "overriddenelement" name=ID
 protected class OverridableParserRule_Group extends GroupToken {
 	
 	public OverridableParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -327,7 +329,7 @@ protected class OverridableParserRule_0_Keyword_overriddenelement extends Keywor
 	}	
 }
 
-// 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@8704f7 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// name=ID
 protected class OverridableParserRule_1_Assignment_name extends AssignmentToken  {
 	
 	public OverridableParserRule_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -401,11 +403,12 @@ protected class CallOverridenParserRule_Assignment_call extends AssignmentToken
 
 /************ begin Rule OverridableParserRule2 ****************
  *
- * 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@2136c9 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+ * OverridableParserRule2 returns AType2:
+ *   "overridden other element" name=ID "-" age=INT;
  *
  **/
 
-// 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@2136c9 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// "overridden other element" name=ID "-" age=INT
 protected class OverridableParserRule2_Group extends GroupToken {
 	
 	public OverridableParserRule2_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -453,7 +456,7 @@ protected class OverridableParserRule2_0_Keyword_overriddenotherelement extends
 	}	
 }
 
-// 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@2136c9 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// name=ID
 protected class OverridableParserRule2_1_Assignment_name extends AssignmentToken  {
 	
 	public OverridableParserRule2_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -614,11 +617,12 @@ protected class ExtendableParserRule_2_RuleCall_Subrule3 extends RuleCallToken {
 
 /************ begin Rule Subrule1 ****************
  *
- * 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@50b208 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+ * Subrule1:
+ *   "subrule1" name=ID sub1=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@50b208 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// "subrule1" name=ID sub1=ID
 protected class Subrule1_Group extends GroupToken {
 	
 	public Subrule1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -662,7 +666,7 @@ protected class Subrule1_0_Keyword_subrule1 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@50b208 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// name=ID
 protected class Subrule1_1_Assignment_name extends AssignmentToken  {
 	
 	public Subrule1_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -687,7 +691,7 @@ protected class Subrule1_1_Assignment_name extends AssignmentToken  {
 	}
 }
 
-// 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@d83a41 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// sub1=ID
 protected class Subrule1_2_Assignment_sub1 extends AssignmentToken  {
 	
 	public Subrule1_2_Assignment_sub1(IInstanceDescription curr, AbstractToken pred) {
@@ -718,11 +722,12 @@ protected class Subrule1_2_Assignment_sub1 extends AssignmentToken  {
 
 /************ begin Rule Subrule2 ****************
  *
- * 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@ed7712 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+ * Subrule2:
+ *   "subrule3" name=ID sub2=STRING;
  *
  **/
 
-// 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@ed7712 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// "subrule3" name=ID sub2=STRING
 protected class Subrule2_Group extends GroupToken {
 	
 	public Subrule2_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -766,7 +771,7 @@ protected class Subrule2_0_Keyword_subrule3 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@ed7712 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// name=ID
 protected class Subrule2_1_Assignment_name extends AssignmentToken  {
 	
 	public Subrule2_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -822,11 +827,12 @@ protected class Subrule2_2_Assignment_sub2 extends AssignmentToken  {
 
 /************ begin Rule Subrule3 ****************
  *
- * 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@673120 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+ * Subrule3:
+ *   "subrule3" name=ID sub1=INT;
  *
  **/
 
-// 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@673120 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// "subrule3" name=ID sub1=INT
 protected class Subrule3_Group extends GroupToken {
 	
 	public Subrule3_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -870,7 +876,7 @@ protected class Subrule3_0_Keyword_subrule3 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@673120 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// name=ID
 protected class Subrule3_1_Assignment_name extends AssignmentToken  {
 	
 	public Subrule3_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -969,11 +975,12 @@ protected class CallExtendedParserRule_Assignment_call extends AssignmentToken
 
 /************ 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@e0b8ce (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (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@e0b8ce (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// "element" name=ID
 protected class InheritedParserRule_Group extends GroupToken {
 	
 	public InheritedParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1013,7 +1020,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@e0b8ce (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@bd7c0 (name: ID)
+// name=ID
 protected class InheritedParserRule_1_Assignment_name extends AssignmentToken  {
 	
 	public InheritedParserRule_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -1044,11 +1051,12 @@ protected class InheritedParserRule_1_Assignment_name extends AssignmentToken  {
 
 /************ begin Rule AbstractCallOverridenParserRule ****************
  *
- * 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@db4fd5 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@29a916 (name: OverridableParserRule) (definesHiddenTokens: false)
+ * AbstractCallOverridenParserRule returns mm::AModel:
+ *   "overridemodel" (elements+=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@db4fd5 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@29a916 (name: OverridableParserRule) (definesHiddenTokens: false)
+// "overridemodel" (elements+=OverridableParserRule)*
 protected class AbstractCallOverridenParserRule_Group extends GroupToken {
 	
 	public AbstractCallOverridenParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1088,7 +1096,7 @@ protected class AbstractCallOverridenParserRule_0_Keyword_overridemodel extends
 	}	
 }
 
-// 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@db4fd5 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@29a916 (name: OverridableParserRule) (definesHiddenTokens: false)
+// (elements+=OverridableParserRule)*
 protected class AbstractCallOverridenParserRule_1_Assignment_elements extends AssignmentToken  {
 	
 	public AbstractCallOverridenParserRule_1_Assignment_elements(IInstanceDescription curr, AbstractToken pred) {
@@ -1127,11 +1135,12 @@ protected class AbstractCallOverridenParserRule_1_Assignment_elements extends As
 
 /************ begin Rule AbstractCallExtendedParserRule ****************
  *
- * 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@c05404 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@20ff6f (name: ExtendableParserRule) (definesHiddenTokens: false)
+ * AbstractCallExtendedParserRule returns mm::AModel:
+ *   "extendedmodel" (elements+=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@c05404 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@20ff6f (name: ExtendableParserRule) (definesHiddenTokens: false)
+// "extendedmodel" (elements+=ExtendableParserRule)*
 protected class AbstractCallExtendedParserRule_Group extends GroupToken {
 	
 	public AbstractCallExtendedParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1171,7 +1180,7 @@ protected class AbstractCallExtendedParserRule_0_Keyword_extendedmodel extends K
 	}	
 }
 
-// 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@c05404 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@20ff6f (name: ExtendableParserRule) (definesHiddenTokens: false)
+// (elements+=ExtendableParserRule)*
 protected class AbstractCallExtendedParserRule_1_Assignment_elements extends AssignmentToken  {
 	
 	public AbstractCallExtendedParserRule_1_Assignment_elements(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
index 318cb0a..dbc84ba 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
@@ -436,7 +436,8 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess {
 		return getInheritedParserRuleAccess().getRule();
 	}
 
-	//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@db4fd5 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@29a916 (name: OverridableParserRule) (definesHiddenTokens: false)
+	//AbstractCallOverridenParserRule returns mm::AModel:
+	//  "overridemodel" (elements+=OverridableParserRule)*;
 	public AbstractTestLanguageGrammarAccess.AbstractCallOverridenParserRuleElements getAbstractCallOverridenParserRuleAccess() {
 		return gaAbstractTestLanguage.getAbstractCallOverridenParserRuleAccess();
 	}
@@ -445,7 +446,8 @@ public class ConcreteTestLanguageGrammarAccess implements IGrammarAccess {
 		return getAbstractCallOverridenParserRuleAccess().getRule();
 	}
 
-	//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@c05404 (cardinality: null) Target:org.eclipse.xtext.impl.ParserRuleImpl@20ff6f (name: ExtendableParserRule) (definesHiddenTokens: false)
+	//AbstractCallExtendedParserRule returns mm::AModel:
+	//  "extendedmodel" (elements+=ExtendableParserRule)*;
 	public AbstractTestLanguageGrammarAccess.AbstractCallExtendedParserRuleElements getAbstractCallExtendedParserRuleAccess() {
 		return gaAbstractTestLanguage.getAbstractCallExtendedParserRuleAccess();
 	}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.genmodel
index 13f6ac7..0f6d4ab 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="MetamodelRefTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="AnotherSimpleTest" basePackage="org.eclipse.xtext.metamodelreferencing.tests" disposableProviderFactory="true">
     <ecorePackage href="MetamodelRefTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.genmodel
index 3c21581..bd35c9c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="MultiGenMMTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="SimpleTest" basePackage="org.eclipse.xtext.metamodelreferencing.tests" disposableProviderFactory="true">
     <ecorePackage href="MultiGenMMTestLanguage.ecore#/0"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestPackageImpl.java
index 87b022a..f1d5a83 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestPackageImpl.java
@@ -87,7 +87,7 @@ public class AnotherSimpleTestPackageImpl extends EPackageImpl implements Anothe
     if (isInited) return (AnotherSimpleTestPackage)EPackage.Registry.INSTANCE.getEPackage(AnotherSimpleTestPackage.eNS_URI);
 
     // Obtain or create and register package
-    AnotherSimpleTestPackageImpl theAnotherSimpleTestPackage = (AnotherSimpleTestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof AnotherSimpleTestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new AnotherSimpleTestPackageImpl());
+    AnotherSimpleTestPackageImpl theAnotherSimpleTestPackage = (AnotherSimpleTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AnotherSimpleTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AnotherSimpleTestPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestPackageImpl.java
index 6d656dd..cccc74b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestPackageImpl.java
@@ -88,7 +88,7 @@ public class OtherTestPackageImpl extends EPackageImpl implements OtherTestPacka
     if (isInited) return (OtherTestPackage)EPackage.Registry.INSTANCE.getEPackage(OtherTestPackage.eNS_URI);
 
     // Obtain or create and register package
-    OtherTestPackageImpl theOtherTestPackage = (OtherTestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof OtherTestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new OtherTestPackageImpl());
+    OtherTestPackageImpl theOtherTestPackage = (OtherTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof OtherTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new OtherTestPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestPackageImpl.java
index 0059ee6..681e1eb 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestPackageImpl.java
@@ -89,7 +89,7 @@ public class SimpleTestPackageImpl extends EPackageImpl implements SimpleTestPac
     if (isInited) return (SimpleTestPackage)EPackage.Registry.INSTANCE.getEPackage(SimpleTestPackage.eNS_URI);
 
     // Obtain or create and register package
-    SimpleTestPackageImpl theSimpleTestPackage = (SimpleTestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SimpleTestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SimpleTestPackageImpl());
+    SimpleTestPackageImpl theSimpleTestPackage = (SimpleTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SimpleTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SimpleTestPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.genmodel
index f285b84..6e7fcf9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="DatatypeRulesTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="DatatypeRulesTestLanguage" basePackage="org.eclipse.xtext.parser.datatyperules" disposableProviderFactory="true">
     <ecorePackage href="DatatypeRulesTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguagePackageImpl.java
index 867fe11..65186e6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguagePackageImpl.java
@@ -93,7 +93,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement
     if (isInited) return (DatatypeRulesTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(DatatypeRulesTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    DatatypeRulesTestLanguagePackageImpl theDatatypeRulesTestLanguagePackage = (DatatypeRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DatatypeRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DatatypeRulesTestLanguagePackageImpl());
+    DatatypeRulesTestLanguagePackageImpl theDatatypeRulesTestLanguagePackage = (DatatypeRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DatatypeRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DatatypeRulesTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.genmodel
index 1bfe888..8784fd9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="EpatchTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="EpatchTestLanguage" basePackage="org.eclipse.xtext.parser.epatch" disposableProviderFactory="true">
     <ecorePackage href="EpatchTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguagePackageImpl.java
index c303d0d..3a4049c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguagePackageImpl.java
@@ -245,7 +245,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc
     if (isInited) return (EpatchTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(EpatchTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    EpatchTestLanguagePackageImpl theEpatchTestLanguagePackage = (EpatchTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EpatchTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EpatchTestLanguagePackageImpl());
+    EpatchTestLanguagePackageImpl theEpatchTestLanguagePackage = (EpatchTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EpatchTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EpatchTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
index 5f0d0e6..bc5e0a3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.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.generator.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.generator.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.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java
index f088083..e6700f1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.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.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.genmodel
index 5b87258..185a153 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="HiddenTerminalsTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="HiddenTerminalsTestLanguage" basePackage="org.eclipse.xtext.parser.terminalrules" disposableProviderFactory="true">
     <ecorePackage href="HiddenTerminalsTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.genmodel
index 514cb0e..1689e1a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="TerminalRulesTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="TerminalRulesTestLanguage" basePackage="org.eclipse.xtext.parser.terminalrules" disposableProviderFactory="true">
     <ecorePackage href="TerminalRulesTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel
index 5eac329..e6c61ca 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="XtextTerminalsTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="XtextTerminalsTestLanguage" basePackage="org.eclipse.xtext.parser.terminalrules" disposableProviderFactory="true">
     <ecorePackage href="XtextTerminalsTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguagePackageImpl.java
index bc3a005..b20ed87 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguagePackageImpl.java
@@ -149,7 +149,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme
     if (isInited) return (HiddenTerminalsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(HiddenTerminalsTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    HiddenTerminalsTestLanguagePackageImpl theHiddenTerminalsTestLanguagePackage = (HiddenTerminalsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof HiddenTerminalsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new HiddenTerminalsTestLanguagePackageImpl());
+    HiddenTerminalsTestLanguagePackageImpl theHiddenTerminalsTestLanguagePackage = (HiddenTerminalsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HiddenTerminalsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HiddenTerminalsTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguagePackageImpl.java
index f305606..32bc52a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguagePackageImpl.java
@@ -84,7 +84,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement
     if (isInited) return (TerminalRulesTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(TerminalRulesTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    TerminalRulesTestLanguagePackageImpl theTerminalRulesTestLanguagePackage = (TerminalRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TerminalRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TerminalRulesTestLanguagePackageImpl());
+    TerminalRulesTestLanguagePackageImpl theTerminalRulesTestLanguagePackage = (TerminalRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TerminalRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TerminalRulesTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java
index 16569a6..e406dcc 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java
@@ -261,7 +261,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen
     if (isInited) return (XtextTerminalsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(XtextTerminalsTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    XtextTerminalsTestLanguagePackageImpl theXtextTerminalsTestLanguagePackage = (XtextTerminalsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof XtextTerminalsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new XtextTerminalsTestLanguagePackageImpl());
+    XtextTerminalsTestLanguagePackageImpl theXtextTerminalsTestLanguagePackage = (XtextTerminalsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XtextTerminalsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XtextTerminalsTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.genmodel
index 001f863..9430526 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="FormatterTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Formattertestlanguage" basePackage="org.eclipse.xtext.parsetree.formatter" disposableProviderFactory="true">
     <ecorePackage href="FormatterTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java
index e968ab0..82ac0ae 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java
@@ -109,7 +109,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo
     if (isInited) return (FormattertestlanguagePackage)EPackage.Registry.INSTANCE.getEPackage(FormattertestlanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    FormattertestlanguagePackageImpl theFormattertestlanguagePackage = (FormattertestlanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof FormattertestlanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new FormattertestlanguagePackageImpl());
+    FormattertestlanguagePackageImpl theFormattertestlanguagePackage = (FormattertestlanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FormattertestlanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FormattertestlanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.genmodel
index 0e32ca8..eac6285 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="ComplexReconstrTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Complexrewritetest" basePackage="org.eclipse.xtext.parsetree.reconstr" disposableProviderFactory="true">
     <ecorePackage href="ComplexReconstrTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.genmodel
index e75951d..d2bade3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="SerializationBug269362TestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="SerializationBug269362TestLanguage" basePackage="org.eclipse.xtext.parsetree.reconstr" disposableProviderFactory="true">
     <ecorePackage href="SerializationBug269362TestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.genmodel
index b9d808b..a4cd710 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="SimpleReconstrTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Simplerewritetest" basePackage="org.eclipse.xtext.parsetree.reconstr" disposableProviderFactory="true">
     <ecorePackage href="SimpleReconstrTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestPackageImpl.java
index fbb592f..ae38194 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestPackageImpl.java
@@ -234,7 +234,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl
     if (isInited) return (ComplexrewritetestPackage)EPackage.Registry.INSTANCE.getEPackage(ComplexrewritetestPackage.eNS_URI);
 
     // Obtain or create and register package
-    ComplexrewritetestPackageImpl theComplexrewritetestPackage = (ComplexrewritetestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ComplexrewritetestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ComplexrewritetestPackageImpl());
+    ComplexrewritetestPackageImpl theComplexrewritetestPackage = (ComplexrewritetestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ComplexrewritetestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ComplexrewritetestPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguagePackageImpl.java
index 2105bb6..2a9e33d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguagePackageImpl.java
@@ -84,7 +84,7 @@ public class SerializationBug269362TestLanguagePackageImpl extends EPackageImpl
     if (isInited) return (SerializationBug269362TestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(SerializationBug269362TestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    SerializationBug269362TestLanguagePackageImpl theSerializationBug269362TestLanguagePackage = (SerializationBug269362TestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SerializationBug269362TestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SerializationBug269362TestLanguagePackageImpl());
+    SerializationBug269362TestLanguagePackageImpl theSerializationBug269362TestLanguagePackage = (SerializationBug269362TestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SerializationBug269362TestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SerializationBug269362TestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/simplerewritetest/impl/SimplerewritetestPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/simplerewritetest/impl/SimplerewritetestPackageImpl.java
index fd0cc29..5b0ca71 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/simplerewritetest/impl/SimplerewritetestPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/simplerewritetest/impl/SimplerewritetestPackageImpl.java
@@ -148,7 +148,7 @@ public class SimplerewritetestPackageImpl extends EPackageImpl implements Simple
     if (isInited) return (SimplerewritetestPackage)EPackage.Registry.INSTANCE.getEPackage(SimplerewritetestPackage.eNS_URI);
 
     // Obtain or create and register package
-    SimplerewritetestPackageImpl theSimplerewritetestPackage = (SimplerewritetestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SimplerewritetestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SimplerewritetestPackageImpl());
+    SimplerewritetestPackageImpl theSimplerewritetestPackage = (SimplerewritetestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SimplerewritetestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SimplerewritetestPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.genmodel
index a28295f..9521ab8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="TransientValuesTest" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Transientvaluestest" basePackage="org.eclipse.xtext.parsetree.transientvalues" disposableProviderFactory="true">
     <ecorePackage href="TransientValuesTest.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestPackageImpl.java
index 74f2e31..3414bbb 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestPackageImpl.java
@@ -108,7 +108,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran
     if (isInited) return (TransientvaluestestPackage)EPackage.Registry.INSTANCE.getEPackage(TransientvaluestestPackage.eNS_URI);
 
     // Obtain or create and register package
-    TransientvaluestestPackageImpl theTransientvaluestestPackage = (TransientvaluestestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TransientvaluestestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TransientvaluestestPackageImpl());
+    TransientvaluestestPackageImpl theTransientvaluestestPackage = (TransientvaluestestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TransientvaluestestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TransientvaluestestPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.genmodel
index 1d44167..070af32 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="ActionTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="ActionLang" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="ActionTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel
index 3f2c932..52547a3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ContentAssistTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.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.generator.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.generator.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.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.genmodel
index 139d5d4..a9d8ead 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="FowlerDslTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Fowlerdsl" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="FowlerDslTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.genmodel
index facc7ba..b9a822e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LexerTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="LexerTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="LexerLang" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="LexerTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.genmodel
index 9063dcc..06ca120 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="LookaheadTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="LookaheadLang" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="LookaheadTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.genmodel
index f303ec0..8845fba 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="OptionalEmptyTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="OptionalEmpty" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="OptionalEmptyTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.genmodel
index dd2b215..56a877c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="PartialParserTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="PartialParserTestLanguage" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="PartialParserTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
index 7d9a89b..97bee26 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.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.generator.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.generator.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.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.genmodel
index ed67c3d..d610a1d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="SimpleExpressionsTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="SimpleExpressions" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="SimpleExpressionsTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.genmodel
index a42c987..a2b8cbe 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="TestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="TestLang" basePackage="org.eclipse.xtext.testlanguages" disposableProviderFactory="true">
     <ecorePackage href="TestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
index 89d2556..1c10f6a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.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.generator.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.generator.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.generator.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangPackageImpl.java
index 2be6b2c..8e9a156 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangPackageImpl.java
@@ -101,7 +101,7 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac
     if (isInited) return (ActionLangPackage)EPackage.Registry.INSTANCE.getEPackage(ActionLangPackage.eNS_URI);
 
     // Obtain or create and register package
-    ActionLangPackageImpl theActionLangPackage = (ActionLangPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ActionLangPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ActionLangPackageImpl());
+    ActionLangPackageImpl theActionLangPackage = (ActionLangPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ActionLangPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ActionLangPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java
index 2215ab3..b706aa1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.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.generator.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslPackageImpl.java
index fe459f5..7a31c74 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/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.generator.tests/src-gen/org/eclipse/xtext/testlanguages/lexerLang/impl/LexerLangPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/lexerLang/impl/LexerLangPackageImpl.java
index 49a9f1e..650a550 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/lexerLang/impl/LexerLangPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/lexerLang/impl/LexerLangPackageImpl.java
@@ -93,7 +93,7 @@ public class LexerLangPackageImpl extends EPackageImpl implements LexerLangPacka
     if (isInited) return (LexerLangPackage)EPackage.Registry.INSTANCE.getEPackage(LexerLangPackage.eNS_URI);
 
     // Obtain or create and register package
-    LexerLangPackageImpl theLexerLangPackage = (LexerLangPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LexerLangPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LexerLangPackageImpl());
+    LexerLangPackageImpl theLexerLangPackage = (LexerLangPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LexerLangPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LexerLangPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangPackageImpl.java
index 2bd6cec..8779050 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangPackageImpl.java
@@ -133,7 +133,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL
     if (isInited) return (LookaheadLangPackage)EPackage.Registry.INSTANCE.getEPackage(LookaheadLangPackage.eNS_URI);
 
     // Obtain or create and register package
-    LookaheadLangPackageImpl theLookaheadLangPackage = (LookaheadLangPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LookaheadLangPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LookaheadLangPackageImpl());
+    LookaheadLangPackageImpl theLookaheadLangPackage = (LookaheadLangPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LookaheadLangPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LookaheadLangPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyPackageImpl.java
index 3fdd2be..c6327af 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyPackageImpl.java
@@ -93,7 +93,7 @@ public class OptionalEmptyPackageImpl extends EPackageImpl implements OptionalEm
     if (isInited) return (OptionalEmptyPackage)EPackage.Registry.INSTANCE.getEPackage(OptionalEmptyPackage.eNS_URI);
 
     // Obtain or create and register package
-    OptionalEmptyPackageImpl theOptionalEmptyPackage = (OptionalEmptyPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof OptionalEmptyPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new OptionalEmptyPackageImpl());
+    OptionalEmptyPackageImpl theOptionalEmptyPackage = (OptionalEmptyPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof OptionalEmptyPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new OptionalEmptyPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/LexerTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/LexerTestLanguageParsetreeConstructor.java
index e6ab856..7f4f515 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/LexerTestLanguageParsetreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parseTreeConstruction/LexerTestLanguageParsetreeConstructor.java
@@ -73,11 +73,12 @@ protected class Model_Assignment_children extends AssignmentToken  {
 
 /************ begin Rule Element ****************
  *
- * 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@9a5367 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@86bc70 (name: STRING)
+ * Element:
+ *   name=ID h=STRING;
  *
  **/
 
-// 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@9a5367 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@86bc70 (name: STRING)
+// name=ID h=STRING
 protected class Element_Group extends GroupToken {
 	
 	public Element_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -130,7 +131,7 @@ protected class Element_0_Assignment_name extends AssignmentToken  {
 	}
 }
 
-// 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@9a5367 (cardinality: null) Target:org.eclipse.xtext.impl.TerminalRuleImpl@86bc70 (name: STRING)
+// h=STRING
 protected class Element_1_Assignment_h extends AssignmentToken  {
 	
 	public Element_1_Assignment_h(IInstanceDescription curr, AbstractToken pred) {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguagePackageImpl.java
index 6679b75..2eac0e2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguagePackageImpl.java
@@ -157,7 +157,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement
     if (isInited) return (PartialParserTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(PartialParserTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    PartialParserTestLanguagePackageImpl thePartialParserTestLanguagePackage = (PartialParserTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof PartialParserTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new PartialParserTestLanguagePackageImpl());
+    PartialParserTestLanguagePackageImpl thePartialParserTestLanguagePackage = (PartialParserTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PartialParserTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PartialParserTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
index c9bb579..1bebc1b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.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.generator.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsPackageImpl.java
index 6cd44ea..4d9ae49 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsPackageImpl.java
@@ -109,7 +109,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple
     if (isInited) return (SimpleExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(SimpleExpressionsPackage.eNS_URI);
 
     // Obtain or create and register package
-    SimpleExpressionsPackageImpl theSimpleExpressionsPackage = (SimpleExpressionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SimpleExpressionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SimpleExpressionsPackageImpl());
+    SimpleExpressionsPackageImpl theSimpleExpressionsPackage = (SimpleExpressionsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SimpleExpressionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SimpleExpressionsPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangPackageImpl.java
index 1941273..b6382f4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangPackageImpl.java
@@ -125,7 +125,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage
     if (isInited) return (TestLangPackage)EPackage.Registry.INSTANCE.getEPackage(TestLangPackage.eNS_URI);
 
     // Obtain or create and register package
-    TestLangPackageImpl theTestLangPackage = (TestLangPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TestLangPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TestLangPackageImpl());
+    TestLangPackageImpl theTestLangPackage = (TestLangPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TestLangPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TestLangPackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java
index 9d76ec2..03a1a2c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.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.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel
index 548990d..f8e3971 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="Bug250313" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="Bug250313" basePackage="org.eclipse.xtext.valueconverter" disposableProviderFactory="true">
     <ecorePackage href="Bug250313.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java
index 763103d..5074fb2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java
@@ -109,7 +109,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa
     if (isInited) return (Bug250313Package)EPackage.Registry.INSTANCE.getEPackage(Bug250313Package.eNS_URI);
 
     // Obtain or create and register package
-    Bug250313PackageImpl theBug250313Package = (Bug250313PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Bug250313PackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new Bug250313PackageImpl());
+    Bug250313PackageImpl theBug250313Package = (Bug250313PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug250313PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug250313PackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractUnassignedRuleCallTestLanguageRuntimeModule.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractUnassignedRuleCallTestLanguageRuntimeModule.java
new file mode 100644
index 0000000..67a9651
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/AbstractUnassignedRuleCallTestLanguageRuntimeModule.java
@@ -0,0 +1,86 @@
+
+/*
+ * generated by Xtext
+ */
+package org.eclipse.xtext.xtext.ecoreInference;
+
+import org.eclipse.xtext.Constants;
+import org.eclipse.xtext.service.DefaultRuntimeModule;
+
+import com.google.inject.Binder;
+import com.google.inject.name.Names;
+
+/**
+ * Manual modifications go to {org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguageRuntimeModule}
+ */
+public abstract class AbstractUnassignedRuleCallTestLanguageRuntimeModule extends DefaultRuntimeModule {
+	
+	@Override
+	public void configure(Binder binder) {
+		super.configure(binder);
+		binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance(
+			"org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage");
+	}
+	
+	
+	
+	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
+		return org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess.class;
+	}
+
+	
+	public Class<? extends org.eclipse.xtext.parser.packrat.IPackratParser> bindIPackratParser() {
+		return org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguagePackratParser.class;
+	}
+
+	
+	public Class<? extends org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor> bindIParseTreeConstructor() {
+		return org.eclipse.xtext.xtext.ecoreInference.parseTreeConstruction.UnassignedRuleCallTestLanguageParsetreeConstructor.class;
+	}
+
+	
+	public Class<? extends org.eclipse.xtend.expression.ExecutionContext> bindExecutionContext() {
+		return org.eclipse.xtext.xtend.InjectableExecutionContext.class;
+	}
+
+	
+	public Class<? extends org.eclipse.xtend.expression.ResourceManager> bindResourceManager() {
+		return org.eclipse.xtext.xtend.InjectableResourceManager.class;
+	}
+
+	
+	public java.lang.ClassLoader bindClassLoader() {
+		return getClass().getClassLoader();
+	}
+
+	@org.eclipse.xtext.service.SingletonBinding(eager=true)
+	public Class<? extends org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguageCheckValidator> bindUnassignedRuleCallTestLanguageCheckValidator() {
+		return org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguageCheckValidator.class;
+	}
+
+	
+	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
+		return org.eclipse.xtext.xtext.ecoreInference.parser.antlr.UnassignedRuleCallTestLanguageParser.class;
+	}
+
+	
+	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+
+	
+	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.xtext.ecoreInference.parser.antlr.UnassignedRuleCallTestLanguageAntlrTokenFileProvider.class;
+	}
+
+	
+	public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
+		return org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageLexer.class;
+	}
+
+	
+	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
+	}
+
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel
index ea3a8f8..d9c6716 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.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.generator.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.generator.tests/src-gen" forceOverwrite="true" modelName="MultiValueFeatureTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
   <genPackages prefix="MultiValueFeatureTestLanguage" basePackage="org.eclipse.xtext.xtext.ecoreInference" disposableProviderFactory="true">
     <ecorePackage href="MultiValueFeatureTestLanguage.ecore#/"/>
     <genClasses>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.ecore
new file mode 100644
index 0000000..50f1cbb
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.ecore
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ASCII"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="unassignedRuleCallTestLanguage" nsURI="http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest" nsPrefix="unassignedRuleCallTestLanguage">
+  <eClassifiers xsi:type="ecore:EClass" name="Model">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="modelFeatures" eType="//ModelFeatures" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ModelFeatures">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel
new file mode 100644
index 0000000..de38201
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel
@@ -0,0 +1,18 @@
+<?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.generator.tests/src-gen" forceOverwrite="true" modelName="UnassignedRuleCallTestLanguage" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" bundleManifest="false" complianceLevel="5.0" copyrightFields="false">
+  <genPackages prefix="UnassignedRuleCallTestLanguage" basePackage="org.eclipse.xtext.xtext.ecoreInference" disposableProviderFactory="true">
+    <ecorePackage href="UnassignedRuleCallTestLanguage.ecore#/"/>
+    <genClasses>
+      <ecoreClass href="UnassignedRuleCallTestLanguage.ecore#//Model"/>
+      <genFeatures property="None" children="true" createChild="true">
+        <ecoreFeature xsi:type="ecore:EReference" href="UnassignedRuleCallTestLanguage.ecore#//Model/modelFeatures"/>
+      </genFeatures>
+    </genClasses>
+    <genClasses>
+      <ecoreClass href="UnassignedRuleCallTestLanguage.ecore#//ModelFeatures"/>
+      <genFeatures createChild="false">
+        <ecoreFeature xsi:type="ecore:EAttribute" href="UnassignedRuleCallTestLanguage.ecore#//ModelFeatures/name"/>
+      </genFeatures>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xmi
new file mode 100644
index 0000000..24afe71
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xmi
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI 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:xtext="http://www.eclipse.org/2008/Xtext">
+  <xtext:Grammar name="org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage" usedGrammars="/1">
+    <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="unassignedRuleCallTestLanguage">
+      <ePackage href="http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest#/"/>
+    </metamodelDeclarations>
+    <rules xsi:type="xtext:ParserRule" name="Model">
+      <type metamodel="/0/@metamodelDeclarations.0">
+        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest#//Model"/>
+      </type>
+      <alternatives xsi:type="xtext:Group">
+        <tokens xsi:type="xtext:Keyword" value="model"/>
+        <tokens xsi:type="xtext:RuleCall" cardinality="+" rule="/1/@rules.1"/>
+        <tokens xsi:type="xtext:Assignment" feature="modelFeatures" operator="=">
+          <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.1"/>
+        </tokens>
+      </alternatives>
+    </rules>
+    <rules xsi:type="xtext:ParserRule" name="ModelFeatures">
+      <type metamodel="/0/@metamodelDeclarations.0">
+        <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest#//ModelFeatures"/>
+      </type>
+      <alternatives xsi:type="xtext:Group">
+        <tokens xsi:type="xtext:Keyword" value="feature"/>
+        <tokens xsi:type="xtext:Assignment" feature="name" operator="=">
+          <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/>
+        </tokens>
+        <tokens xsi:type="xtext:RuleCall" rule="/0/@rules.2"/>
+        <tokens xsi:type="xtext:Keyword" value=";"/>
+      </alternatives>
+    </rules>
+    <rules xsi:type="xtext:ParserRule" name="DataTypeRule">
+      <type metamodel="/1/@metamodelDeclarations.0">
+        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      </type>
+      <alternatives xsi:type="xtext:Group">
+        <tokens xsi:type="xtext:RuleCall" rule="/1/@rules.1"/>
+        <tokens xsi:type="xtext:Keyword" value="keyword"/>
+        <tokens xsi:type="xtext:RuleCall" rule="/1/@rules.1"/>
+        <tokens xsi:type="xtext:RuleCall" cardinality="?" rule="/1/@rules.2"/>
+      </alternatives>
+    </rules>
+  </xtext:Grammar>
+  <xtext:Grammar name="org.eclipse.xtext.common.Terminals" definesHiddenTokens="true" hiddenTokens="/1/@rules.5 /1/@rules.3 /1/@rules.4">
+    <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">
+      <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>
+    </metamodelDeclarations>
+    <rules xsi:type="xtext:TerminalRule" name="ID">
+      <type metamodel="/1/@metamodelDeclarations.0">
+        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      </type>
+      <alternatives xsi:type="xtext:Group">
+        <tokens xsi:type="xtext:Keyword" cardinality="?" value="^"/>
+        <tokens xsi:type="xtext:Alternatives">
+          <groups xsi:type="xtext:CharacterRange">
+            <left value="a"/>
+            <right value="z"/>
+          </groups>
+          <groups xsi:type="xtext:CharacterRange">
+            <left value="A"/>
+            <right value="Z"/>
+          </groups>
+          <groups xsi:type="xtext:Keyword" value="_"/>
+        </tokens>
+        <tokens xsi:type="xtext:Alternatives" cardinality="*">
+          <groups xsi:type="xtext:CharacterRange">
+            <left value="a"/>
+            <right value="z"/>
+          </groups>
+          <groups xsi:type="xtext:CharacterRange">
+            <left value="A"/>
+            <right value="Z"/>
+          </groups>
+          <groups xsi:type="xtext:Keyword" value="_"/>
+          <groups xsi:type="xtext:CharacterRange">
+            <left value="0"/>
+            <right value="9"/>
+          </groups>
+        </tokens>
+      </alternatives>
+    </rules>
+    <rules xsi:type="xtext:TerminalRule" name="INT">
+      <type metamodel="/1/@metamodelDeclarations.0">
+        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      </type>
+      <alternatives xsi:type="xtext:CharacterRange" cardinality="+">
+        <left value="0"/>
+        <right value="9"/>
+      </alternatives>
+    </rules>
+    <rules xsi:type="xtext:TerminalRule" name="STRING">
+      <type metamodel="/1/@metamodelDeclarations.0">
+        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      </type>
+      <alternatives xsi:type="xtext:Alternatives">
+        <groups xsi:type="xtext:Group">
+          <tokens xsi:type="xtext:Keyword" value="&quot;"/>
+          <tokens xsi:type="xtext:Alternatives" cardinality="*">
+            <groups xsi:type="xtext:Group">
+              <tokens xsi:type="xtext:Keyword" value="\"/>
+              <tokens xsi:type="xtext:Alternatives">
+                <groups xsi:type="xtext:Keyword" value="b"/>
+                <groups xsi:type="xtext:Keyword" value="t"/>
+                <groups xsi:type="xtext:Keyword" value="n"/>
+                <groups xsi:type="xtext:Keyword" value="f"/>
+                <groups xsi:type="xtext:Keyword" value="r"/>
+                <groups xsi:type="xtext:Keyword" value="&quot;"/>
+                <groups xsi:type="xtext:Keyword" value="'"/>
+                <groups xsi:type="xtext:Keyword" value="\"/>
+              </tokens>
+            </groups>
+            <groups xsi:type="xtext:NegatedToken">
+              <terminal xsi:type="xtext:Alternatives">
+                <groups xsi:type="xtext:Keyword" value="\"/>
+                <groups xsi:type="xtext:Keyword" value="&quot;"/>
+              </terminal>
+            </groups>
+          </tokens>
+          <tokens xsi:type="xtext:Keyword" value="&quot;"/>
+        </groups>
+        <groups xsi:type="xtext:Group">
+          <tokens xsi:type="xtext:Keyword" value="'"/>
+          <tokens xsi:type="xtext:Alternatives" cardinality="*">
+            <groups xsi:type="xtext:Group">
+              <tokens xsi:type="xtext:Keyword" value="\"/>
+              <tokens xsi:type="xtext:Alternatives">
+                <groups xsi:type="xtext:Keyword" value="b"/>
+                <groups xsi:type="xtext:Keyword" value="t"/>
+                <groups xsi:type="xtext:Keyword" value="n"/>
+                <groups xsi:type="xtext:Keyword" value="f"/>
+                <groups xsi:type="xtext:Keyword" value="r"/>
+                <groups xsi:type="xtext:Keyword" value="&quot;"/>
+                <groups xsi:type="xtext:Keyword" value="'"/>
+                <groups xsi:type="xtext:Keyword" value="\"/>
+              </tokens>
+            </groups>
+            <groups xsi:type="xtext:NegatedToken">
+              <terminal xsi:type="xtext:Alternatives">
+                <groups xsi:type="xtext:Keyword" value="\"/>
+                <groups xsi:type="xtext:Keyword" value="'"/>
+              </terminal>
+            </groups>
+          </tokens>
+          <tokens xsi:type="xtext:Keyword" value="'"/>
+        </groups>
+      </alternatives>
+    </rules>
+    <rules xsi:type="xtext:TerminalRule" name="ML_COMMENT">
+      <type metamodel="/1/@metamodelDeclarations.0">
+        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      </type>
+      <alternatives xsi:type="xtext:Group">
+        <tokens xsi:type="xtext:Keyword" value="/*"/>
+        <tokens xsi:type="xtext:UntilToken">
+          <terminal xsi:type="xtext:Keyword" value="*/"/>
+        </tokens>
+      </alternatives>
+    </rules>
+    <rules xsi:type="xtext:TerminalRule" name="SL_COMMENT">
+      <type metamodel="/1/@metamodelDeclarations.0">
+        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      </type>
+      <alternatives xsi:type="xtext:Group">
+        <tokens xsi:type="xtext:Keyword" value="//"/>
+        <tokens xsi:type="xtext:NegatedToken" cardinality="*">
+          <terminal xsi:type="xtext:Alternatives">
+            <groups xsi:type="xtext:Keyword" value="&#xA;"/>
+            <groups xsi:type="xtext:Keyword" value="&#xD;"/>
+          </terminal>
+        </tokens>
+        <tokens xsi:type="xtext:Group" cardinality="?">
+          <tokens xsi:type="xtext:Keyword" cardinality="?" value="&#xD;"/>
+          <tokens xsi:type="xtext:Keyword" value="&#xA;"/>
+        </tokens>
+      </alternatives>
+    </rules>
+    <rules xsi:type="xtext:TerminalRule" name="WS">
+      <type metamodel="/1/@metamodelDeclarations.0">
+        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      </type>
+      <alternatives xsi:type="xtext:Alternatives" cardinality="+">
+        <groups xsi:type="xtext:Keyword" value=" "/>
+        <groups xsi:type="xtext:Keyword" value="&#x9;"/>
+        <groups xsi:type="xtext:Keyword" value="&#xD;"/>
+        <groups xsi:type="xtext:Keyword" value="&#xA;"/>
+      </alternatives>
+    </rules>
+    <rules xsi:type="xtext:TerminalRule" name="ANY_OTHER">
+      <type metamodel="/1/@metamodelDeclarations.0">
+        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      </type>
+      <alternatives xsi:type="xtext:Wildcard"/>
+    </rules>
+  </xtext:Grammar>
+</xmi:XMI>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageCheckValidator.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageCheckValidator.java
new file mode 100644
index 0000000..5ec2a8b
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageCheckValidator.java
@@ -0,0 +1,24 @@
+
+package org.eclipse.xtext.xtext.ecoreInference;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.validator.CheckType;
+
+public class UnassignedRuleCallTestLanguageCheckValidator extends org.eclipse.xtext.check.AbstractCheckValidator {
+
+	public UnassignedRuleCallTestLanguageCheckValidator() {
+		addCheckFile("org::eclipse::xtext::xtext::ecoreInference::UnassignedRuleCallTestLanguageChecks", CheckType.FAST);
+	}
+	
+	@Override
+	protected List<? extends EPackage> getEPackages() {
+	    List<EPackage> result = new ArrayList<EPackage>();
+	    
+	    result.add(org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage.eINSTANCE);
+	    
+		return result;
+	}
+	
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetup.java
new file mode 100644
index 0000000..57f0ec7
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageStandaloneSetup.java
@@ -0,0 +1,44 @@
+package org.eclipse.xtext.xtext.ecoreInference;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.EcoreUtil2;
+import org.eclipse.xtext.ISetup;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.resource.IResourceFactory;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * Generated from StandaloneSetup.xpt!
+ */
+public class UnassignedRuleCallTestLanguageStandaloneSetup implements ISetup {
+
+	public static void doSetup() {
+		new UnassignedRuleCallTestLanguageStandaloneSetup().createInjectorAndDoEMFRegistration();
+	}
+
+	public Injector createInjectorAndDoEMFRegistration() {
+		org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
+
+		Injector injector = createInjector();
+		register(injector);
+		return injector;
+	}
+	
+	public Injector createInjector() {
+		return Guice.createInjector(new org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguageRuntimeModule());
+	}
+	
+	public void register(Injector injector) {
+	if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest")) {
+		EPackage.Registry.INSTANCE.put("http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest", org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage.eINSTANCE);
+	}
+	//TODO registration of EValidators should be added here, too
+
+		org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
+		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("unassignedrulecalltestlanguage", resourceFactory);
+		
+
+	}
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java
index f1f464e..1e198ca 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java
@@ -84,7 +84,7 @@ public class MultiValueFeatureTestLanguagePackageImpl extends EPackageImpl imple
     if (isInited) return (MultiValueFeatureTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(MultiValueFeatureTestLanguagePackage.eNS_URI);
 
     // Obtain or create and register package
-    MultiValueFeatureTestLanguagePackageImpl theMultiValueFeatureTestLanguagePackage = (MultiValueFeatureTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof MultiValueFeatureTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new MultiValueFeatureTestLanguagePackageImpl());
+    MultiValueFeatureTestLanguagePackageImpl theMultiValueFeatureTestLanguagePackage = (MultiValueFeatureTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MultiValueFeatureTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MultiValueFeatureTestLanguagePackageImpl());
 
     isInited = true;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parseTreeConstruction/UnassignedRuleCallTestLanguageParsetreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parseTreeConstruction/UnassignedRuleCallTestLanguageParsetreeConstructor.java
new file mode 100644
index 0000000..3665d55
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parseTreeConstruction/UnassignedRuleCallTestLanguageParsetreeConstructor.java
@@ -0,0 +1,253 @@
+/*
+* generated by Xtext
+*/
+package org.eclipse.xtext.xtext.ecoreInference.parseTreeConstruction;
+
+//import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.parsetree.reconstr.IInstanceDescription;
+import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor;
+import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor.AbstractToken.Solution;
+import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess;
+
+import com.google.inject.Inject;
+
+public class UnassignedRuleCallTestLanguageParsetreeConstructor extends AbstractParseTreeConstructor {
+		
+	@Inject
+	private UnassignedRuleCallTestLanguageGrammarAccess grammarAccess;
+	
+	@Override
+	protected Solution internalSerialize(EObject obj) {
+		IInstanceDescription inst = getDescr(obj);
+		Solution s;
+		if(inst.isInstanceOf(grammarAccess.getModelRule().getType().getClassifier()) && (s = new Model_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getModelFeaturesRule().getType().getClassifier()) && (s = new ModelFeatures_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		return null;
+	}
+	
+
+/************ begin Rule Model ****************
+ *
+ * Model:
+ *   "model" INT+ modelFeatures=ModelFeatures;
+ *
+ **/
+
+// "model" INT+ modelFeatures=ModelFeatures
+protected class Model_Group extends GroupToken {
+	
+	public Model_Group(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	@Override
+	public Group getGrammarElement() {
+		return grammarAccess.getModelAccess().getGroup();
+	}
+
+	@Override
+	protected Solution createSolution() {	
+		Solution s1 = new Model_2_Assignment_modelFeatures(current, this).firstSolution();
+		while(s1 != null) {
+			Solution s2 = new Model_1_RuleCall_INT(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			while(s2 != null) {
+				Solution s3 = new Model_0_Keyword_model(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				if(s3 != null) {
+					last = s3.getPredecessor();
+					return s3;
+				} else {
+					s2 = s2.getPredecessor().nextSolution(this,s2);
+				}
+			}
+			s1 = s1.getPredecessor().nextSolution(this,s1);
+		}
+		return null;
+	}
+}
+
+// "model"
+protected class Model_0_Keyword_model extends KeywordToken  {
+	
+	public Model_0_Keyword_model(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Keyword getGrammarElement() {
+		return grammarAccess.getModelAccess().getModelKeyword_0();
+	}	
+}
+
+// INT+
+protected class Model_1_RuleCall_INT extends RuleCallToken {
+	
+	public Model_1_RuleCall_INT(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, IS_MANY, IS_REQUIRED);
+	}
+	
+	@Override
+	public RuleCall getGrammarElement() {
+		return grammarAccess.getModelAccess().getINTTerminalRuleCall_1();
+	}
+	
+	@Override
+	protected Solution createSolution() {
+		// FIXME: terminal or datatype rule call
+		return null;
+	}
+}
+
+// modelFeatures=ModelFeatures
+protected class Model_2_Assignment_modelFeatures extends AssignmentToken  {
+	
+	public Model_2_Assignment_modelFeatures(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	@Override
+	public Assignment getGrammarElement() {
+		return grammarAccess.getModelAccess().getModelFeaturesAssignment_2();
+	}
+	
+	@Override
+	protected Solution createSolution() {
+		if((value = current.getConsumable("modelFeatures",IS_REQUIRED)) == null) return null;
+		IInstanceDescription obj = current.cloneAndConsume("modelFeatures");
+
+		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
+			IInstanceDescription param = getDescr((EObject)value);
+			if(param.isInstanceOf(grammarAccess.getModelFeaturesRule().getType().getClassifier())) {
+				Solution s = new ModelFeatures_Group(param, this).firstSolution();
+				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
+				if(s != null) {
+					type = AssignmentType.PRC; 
+					return new Solution(obj,s.getPredecessor());
+				} 
+			}
+		}
+
+		return null;
+	}
+}
+
+
+/************ end Rule Model ****************/
+
+
+/************ begin Rule ModelFeatures ****************
+ *
+ * ModelFeatures:
+ *   "feature" name=ID DataTypeRule ";";
+ *
+ **/
+
+// "feature" name=ID DataTypeRule ";"
+protected class ModelFeatures_Group extends GroupToken {
+	
+	public ModelFeatures_Group(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	@Override
+	public Group getGrammarElement() {
+		return grammarAccess.getModelFeaturesAccess().getGroup();
+	}
+
+	@Override
+	protected Solution createSolution() {	
+		Solution s1 = new ModelFeatures_3_Keyword(current, this).firstSolution();
+		while(s1 != null) {
+			Solution s2 = new ModelFeatures_2_RuleCall_DataTypeRule(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			while(s2 != null) {
+				Solution s3 = new ModelFeatures_1_Assignment_name(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new ModelFeatures_0_Keyword_feature(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					if(s4 != null) {
+						last = s4.getPredecessor();
+						return s4;
+					} else {
+						s3 = s3.getPredecessor().nextSolution(this,s3);
+					}
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
+			}
+			s1 = s1.getPredecessor().nextSolution(this,s1);
+		}
+		return null;
+	}
+}
+
+// "feature"
+protected class ModelFeatures_0_Keyword_feature extends KeywordToken  {
+	
+	public ModelFeatures_0_Keyword_feature(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Keyword getGrammarElement() {
+		return grammarAccess.getModelFeaturesAccess().getFeatureKeyword_0();
+	}	
+}
+
+// name=ID
+protected class ModelFeatures_1_Assignment_name extends AssignmentToken  {
+	
+	public ModelFeatures_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	@Override
+	public Assignment getGrammarElement() {
+		return grammarAccess.getModelFeaturesAccess().getNameAssignment_1();
+	}
+	
+	@Override
+	protected Solution createSolution() {
+		if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
+		IInstanceDescription obj = current.cloneAndConsume("name");
+		if(Boolean.TRUE.booleanValue()) { // org::eclipse::xtext::impl::RuleCallImpl FIXME: check if value is valid for lexer rule
+			type = AssignmentType.LRC;
+			element = grammarAccess.getModelFeaturesAccess().getNameIDTerminalRuleCall_1_0();
+			return new Solution(obj);
+		}
+		return null;
+	}
+}
+
+// DataTypeRule
+protected class ModelFeatures_2_RuleCall_DataTypeRule extends RuleCallToken {
+	
+	public ModelFeatures_2_RuleCall_DataTypeRule(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	@Override
+	public RuleCall getGrammarElement() {
+		return grammarAccess.getModelFeaturesAccess().getDataTypeRuleParserRuleCall_2();
+	}
+	
+	@Override
+	protected Solution createSolution() {
+		// FIXME: terminal or datatype rule call
+		return null;
+	}
+}
+
+// ";"
+protected class ModelFeatures_3_Keyword extends KeywordToken  {
+	
+	public ModelFeatures_3_Keyword(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Keyword getGrammarElement() {
+		return grammarAccess.getModelFeaturesAccess().getSemicolonKeyword_3();
+	}	
+}
+
+
+/************ end Rule ModelFeatures ****************/
+
+
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageAntlrTokenFileProvider.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageAntlrTokenFileProvider.java
new file mode 100644
index 0000000..da7037e
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageAntlrTokenFileProvider.java
@@ -0,0 +1,15 @@
+/*
+* generated by Xtext
+*/
+package org.eclipse.xtext.xtext.ecoreInference.parser.antlr;
+
+import java.io.InputStream;
+import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
+
+public class UnassignedRuleCallTestLanguageAntlrTokenFileProvider implements IAntlrTokenFileProvider {
+	
+	public InputStream getAntlrTokenFile() {
+		ClassLoader classLoader = getClass().getClassLoader();
+    	return classLoader.getResourceAsStream("org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.tokens");
+	}
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageParser.java
new file mode 100644
index 0000000..a93a3e1
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/UnassignedRuleCallTestLanguageParser.java
@@ -0,0 +1,56 @@
+/*
+* generated by Xtext
+*/
+package org.eclipse.xtext.xtext.ecoreInference.parser.antlr;
+
+import org.antlr.runtime.ANTLRInputStream;
+import org.eclipse.xtext.parser.antlr.ITokenDefProvider;
+import org.eclipse.xtext.parser.IParseResult;
+import org.eclipse.xtext.parser.ParseException;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+
+import com.google.inject.Inject;
+
+import org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageLexer;
+import org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageParser;
+
+import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess;
+
+public class UnassignedRuleCallTestLanguageParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
+	
+	@Inject 
+    protected ITokenDefProvider antlrTokenDefProvider;
+	
+	@Inject
+	private UnassignedRuleCallTestLanguageGrammarAccess grammarAccess;
+	
+	@Override
+	protected IParseResult parse(String ruleName, ANTLRInputStream in) {
+		org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageLexer lexer = new org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageLexer(in);
+		XtextTokenStream stream = new XtextTokenStream(lexer, antlrTokenDefProvider);
+		stream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
+		org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageParser parser = new org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal.InternalUnassignedRuleCallTestLanguageParser(
+				stream, getElementFactory(), grammarAccess);
+		parser.setTokenTypeMap(antlrTokenDefProvider.getTokenDefMap());
+		try {
+			if(ruleName != null)
+				return parser.parse(ruleName);
+			return parser.parse();
+		} catch (Exception re) {
+			throw new ParseException(re.getMessage(),re);
+		}
+	}
+	
+	@Override 
+	protected String getDefaultRuleName() {
+		return "Model";
+	}
+	
+	public UnassignedRuleCallTestLanguageGrammarAccess getGrammarAccess() {
+		return this.grammarAccess;
+	}
+	
+	public void setGrammarAccess(UnassignedRuleCallTestLanguageGrammarAccess grammarAccess) {
+		this.grammarAccess = grammarAccess;
+	}
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g
new file mode 100644
index 0000000..46b2400
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g
@@ -0,0 +1,231 @@
+/*
+* generated by Xtext
+*/
+grammar InternalUnassignedRuleCallTestLanguage;
+
+options {
+	superClass=AbstractInternalAntlrParser;
+}
+
+@lexer::header {
+package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal;
+
+// Hack: Use our own Lexer superclass by means of import. 
+// Currently there is no other way to specify the superclass for the lexer.
+import org.eclipse.xtext.parser.antlr.Lexer;
+}
+
+@parser::header {
+package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal; 
+
+import java.io.InputStream;
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.parser.*;
+import org.eclipse.xtext.parser.impl.*;
+import org.eclipse.xtext.parsetree.*;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
+import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
+import org.eclipse.xtext.conversion.ValueConverterException;
+import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess;
+
+}
+
+@parser::members {
+ 
+ 	private UnassignedRuleCallTestLanguageGrammarAccess grammarAccess;
+ 	
+    public InternalUnassignedRuleCallTestLanguageParser(TokenStream input, IAstFactory factory, UnassignedRuleCallTestLanguageGrammarAccess grammarAccess) {
+        super(input, factory, grammarAccess.getGrammar());
+        this.grammarAccess = grammarAccess;
+    }
+    
+    @Override
+    protected InputStream getTokenFile() {
+    	ClassLoader classLoader = getClass().getClassLoader();
+    	return classLoader.getResourceAsStream("org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.tokens");
+    }
+    
+    @Override
+    protected String getFirstRuleName() {
+    	return "Model";	
+   	} 
+}
+
+@rulecatch { 
+    catch (RecognitionException re) { 
+        recover(input,re); 
+        appendSkippedTokens();
+    } 
+}
+
+
+
+
+// Entry rule entryRuleModel
+entryRuleModel returns [EObject current=null] :
+	{ currentNode = createCompositeNode(grammarAccess.getModelRule(), currentNode); }
+	 iv_ruleModel=ruleModel 
+	 { $current=$iv_ruleModel.current; } 
+	 EOF 
+;
+
+// Rule Model
+ruleModel returns [EObject current=null] 
+    @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+    }
+    @after { resetLookahead(); 
+    	lastConsumedNode = currentNode;
+    }:
+('model' 
+    {
+        createLeafNode(grammarAccess.getModelAccess().getModelKeyword_0(), null); 
+    }
+(RULE_INT
+    { 
+    createLeafNode(grammarAccess.getModelAccess().getINTTerminalRuleCall_1(), null); 
+    }
+)+(	
+	
+	    
+	    { 
+	        currentNode=createCompositeNode(grammarAccess.getModelAccess().getModelFeaturesModelFeaturesParserRuleCall_2_0(), currentNode); 
+	    }
+	    lv_modelFeatures_2=ruleModelFeatures 
+	    {
+	        if ($current==null) {
+	            $current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
+	            associateNodeWithAstElement(currentNode.getParent(), $current);
+	        }
+	        
+	        try {
+	       		set($current, "modelFeatures", lv_modelFeatures_2, "ModelFeatures", currentNode);
+	        } catch (ValueConverterException vce) {
+				handleValueConverterException(vce);
+	        }
+	        currentNode = currentNode.getParent();
+	    }
+	
+));
+
+
+
+
+
+// Entry rule entryRuleModelFeatures
+entryRuleModelFeatures returns [EObject current=null] :
+	{ currentNode = createCompositeNode(grammarAccess.getModelFeaturesRule(), currentNode); }
+	 iv_ruleModelFeatures=ruleModelFeatures 
+	 { $current=$iv_ruleModelFeatures.current; } 
+	 EOF 
+;
+
+// Rule ModelFeatures
+ruleModelFeatures returns [EObject current=null] 
+    @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+    }
+    @after { resetLookahead(); 
+    	lastConsumedNode = currentNode;
+    }:
+('feature' 
+    {
+        createLeafNode(grammarAccess.getModelFeaturesAccess().getFeatureKeyword_0(), null); 
+    }
+(	
+	
+	    lv_name_1=	RULE_ID
+	{
+		createLeafNode(grammarAccess.getModelFeaturesAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
+	}
+ 
+	    {
+	        if ($current==null) {
+	            $current = factory.create(grammarAccess.getModelFeaturesRule().getType().getClassifier());
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+	        
+	        try {
+	       		set($current, "name", lv_name_1, "ID", lastConsumedNode);
+	        } catch (ValueConverterException vce) {
+				handleValueConverterException(vce);
+	        }
+	    }
+	
+)ruleDataTypeRule';' 
+    {
+        createLeafNode(grammarAccess.getModelFeaturesAccess().getSemicolonKeyword_3(), null); 
+    }
+);
+
+
+
+
+
+// Entry rule entryRuleDataTypeRule
+entryRuleDataTypeRule returns [String current=null] :
+	{ currentNode = createCompositeNode(grammarAccess.getDataTypeRuleRule(), currentNode); } 
+	 iv_ruleDataTypeRule=ruleDataTypeRule 
+	 { $current=$iv_ruleDataTypeRule.current.getText(); }  
+	 EOF 
+;
+
+// Rule DataTypeRule
+ruleDataTypeRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 
+    @init { setCurrentLookahead(); resetLookahead(); 
+    }
+    @after { resetLookahead(); 
+	    lastConsumedNode = currentNode;
+	    lastConsumedDatatypeToken = $current;
+    }:
+(    this_INT_0=RULE_INT    {
+		$current.merge(this_INT_0);
+    }
+
+    { 
+    createLeafNode(grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_0(), null); 
+    }
+
+	kw='keyword' 
+    {
+        $current.merge(kw);
+        createLeafNode(grammarAccess.getDataTypeRuleAccess().getKeywordKeyword_1(), null); 
+    }
+    this_INT_2=RULE_INT    {
+		$current.merge(this_INT_2);
+    }
+
+    { 
+    createLeafNode(grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_2(), null); 
+    }
+(    this_STRING_3=RULE_STRING    {
+		$current.merge(this_STRING_3);
+    }
+
+    { 
+    createLeafNode(grammarAccess.getDataTypeRuleAccess().getSTRINGTerminalRuleCall_3(), null); 
+    }
+)?)
+    ;
+
+
+
+
+
+RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+
+RULE_INT : ('0'..'9')+;
+
+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
+
+RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
+
+RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
+
+RULE_WS : (' '|'\t'|'\r'|'\n')+;
+
+RULE_ANY_OTHER : .;
+
+
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.tokens b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.tokens
new file mode 100644
index 0000000..67c265f
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.tokens
@@ -0,0 +1,11 @@
+RULE_ML_COMMENT=7
+RULE_ID=5
+RULE_WS=9
+RULE_INT=4
+RULE_STRING=6
+RULE_ANY_OTHER=10
+RULE_SL_COMMENT=8
+'keyword'=14
+';'=13
+'model'=11
+'feature'=12
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageLexer.java
new file mode 100644
index 0000000..b577a1c
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageLexer.java
@@ -0,0 +1,894 @@
+package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal;
+
+// Hack: Use our own Lexer superclass by means of import. 
+// Currently there is no other way to specify the superclass for the lexer.
+import org.eclipse.xtext.parser.antlr.Lexer;
+
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+
+public class InternalUnassignedRuleCallTestLanguageLexer extends Lexer {
+    public static final int RULE_ML_COMMENT=7;
+    public static final int T14=14;
+    public static final int RULE_ID=5;
+    public static final int RULE_WS=9;
+    public static final int T11=11;
+    public static final int EOF=-1;
+    public static final int RULE_INT=4;
+    public static final int RULE_STRING=6;
+    public static final int T12=12;
+    public static final int Tokens=15;
+    public static final int RULE_ANY_OTHER=10;
+    public static final int RULE_SL_COMMENT=8;
+    public static final int T13=13;
+    public InternalUnassignedRuleCallTestLanguageLexer() {;} 
+    public InternalUnassignedRuleCallTestLanguageLexer(CharStream input) {
+        super(input);
+    }
+    public String getGrammarFileName() { return "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g"; }
+
+    // $ANTLR start T11
+    public final void mT11() throws RecognitionException {
+        try {
+            int _type = T11;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:10:5: ( 'model' )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:10:7: 'model'
+            {
+            match("model"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T11
+
+    // $ANTLR start T12
+    public final void mT12() throws RecognitionException {
+        try {
+            int _type = T12;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:11:5: ( 'feature' )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:11:7: 'feature'
+            {
+            match("feature"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T12
+
+    // $ANTLR start T13
+    public final void mT13() throws RecognitionException {
+        try {
+            int _type = T13;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:12:5: ( ';' )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:12:7: ';'
+            {
+            match(';'); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T13
+
+    // $ANTLR start T14
+    public final void mT14() throws RecognitionException {
+        try {
+            int _type = T14;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:13:5: ( 'keyword' )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:13:7: 'keyword'
+            {
+            match("keyword"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T14
+
+    // $ANTLR start RULE_ID
+    public final void mRULE_ID() throws RecognitionException {
+        try {
+            int _type = RULE_ID;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:217:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:217:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:217:11: ( '^' )?
+            int alt1=2;
+            int LA1_0 = input.LA(1);
+
+            if ( (LA1_0=='^') ) {
+                alt1=1;
+            }
+            switch (alt1) {
+                case 1 :
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:217:11: '^'
+                    {
+                    match('^'); 
+
+                    }
+                    break;
+
+            }
+
+            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse =
+                    new MismatchedSetException(null,input);
+                recover(mse);    throw mse;
+            }
+
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:217:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            loop2:
+            do {
+                int alt2=2;
+                int LA2_0 = input.LA(1);
+
+                if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='Z')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='z')) ) {
+                    alt2=1;
+                }
+
+
+                switch (alt2) {
+            	case 1 :
+            	    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:
+            	    {
+            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+            	        input.consume();
+
+            	    }
+            	    else {
+            	        MismatchedSetException mse =
+            	            new MismatchedSetException(null,input);
+            	        recover(mse);    throw mse;
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop2;
+                }
+            } while (true);
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_ID
+
+    // $ANTLR start RULE_INT
+    public final void mRULE_INT() throws RecognitionException {
+        try {
+            int _type = RULE_INT;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:219:10: ( ( '0' .. '9' )+ )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:219:12: ( '0' .. '9' )+
+            {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:219:12: ( '0' .. '9' )+
+            int cnt3=0;
+            loop3:
+            do {
+                int alt3=2;
+                int LA3_0 = input.LA(1);
+
+                if ( ((LA3_0>='0' && LA3_0<='9')) ) {
+                    alt3=1;
+                }
+
+
+                switch (alt3) {
+            	case 1 :
+            	    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:219:13: '0' .. '9'
+            	    {
+            	    matchRange('0','9'); 
+
+            	    }
+            	    break;
+
+            	default :
+            	    if ( cnt3 >= 1 ) break loop3;
+                        EarlyExitException eee =
+                            new EarlyExitException(3, input);
+                        throw eee;
+                }
+                cnt3++;
+            } while (true);
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_INT
+
+    // $ANTLR start RULE_STRING
+    public final void mRULE_STRING() throws RecognitionException {
+        try {
+            int _type = RULE_STRING;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            int alt6=2;
+            int LA6_0 = input.LA(1);
+
+            if ( (LA6_0=='\"') ) {
+                alt6=1;
+            }
+            else if ( (LA6_0=='\'') ) {
+                alt6=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("221:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+
+                throw nvae;
+            }
+            switch (alt6) {
+                case 1 :
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    {
+                    match('\"'); 
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+                    loop4:
+                    do {
+                        int alt4=3;
+                        int LA4_0 = input.LA(1);
+
+                        if ( (LA4_0=='\\') ) {
+                            alt4=1;
+                        }
+                        else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFE')) ) {
+                            alt4=2;
+                        }
+
+
+                        switch (alt4) {
+                    	case 1 :
+                    	    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+                    	    {
+                    	    match('\\'); 
+                    	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
+                    	        input.consume();
+
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse =
+                    	            new MismatchedSetException(null,input);
+                    	        recover(mse);    throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+                    	case 2 :
+                    	    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:62: ~ ( ( '\\\\' | '\"' ) )
+                    	    {
+                    	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
+                    	        input.consume();
+
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse =
+                    	            new MismatchedSetException(null,input);
+                    	        recover(mse);    throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    break loop4;
+                        }
+                    } while (true);
+
+                    match('\"'); 
+
+                    }
+                    break;
+                case 2 :
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    {
+                    match('\''); 
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    loop5:
+                    do {
+                        int alt5=3;
+                        int LA5_0 = input.LA(1);
+
+                        if ( (LA5_0=='\\') ) {
+                            alt5=1;
+                        }
+                        else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
+                            alt5=2;
+                        }
+
+
+                        switch (alt5) {
+                    	case 1 :
+                    	    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+                    	    {
+                    	    match('\\'); 
+                    	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
+                    	        input.consume();
+
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse =
+                    	            new MismatchedSetException(null,input);
+                    	        recover(mse);    throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+                    	case 2 :
+                    	    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:221:129: ~ ( ( '\\\\' | '\\'' ) )
+                    	    {
+                    	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
+                    	        input.consume();
+
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse =
+                    	            new MismatchedSetException(null,input);
+                    	        recover(mse);    throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    break loop5;
+                        }
+                    } while (true);
+
+                    match('\''); 
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_STRING
+
+    // $ANTLR start RULE_ML_COMMENT
+    public final void mRULE_ML_COMMENT() throws RecognitionException {
+        try {
+            int _type = RULE_ML_COMMENT;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:223:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:223:19: '/*' ( options {greedy=false; } : . )* '*/'
+            {
+            match("/*"); 
+
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:223:24: ( options {greedy=false; } : . )*
+            loop7:
+            do {
+                int alt7=2;
+                int LA7_0 = input.LA(1);
+
+                if ( (LA7_0=='*') ) {
+                    int LA7_1 = input.LA(2);
+
+                    if ( (LA7_1=='/') ) {
+                        alt7=2;
+                    }
+                    else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFE')) ) {
+                        alt7=1;
+                    }
+
+
+                }
+                else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFE')) ) {
+                    alt7=1;
+                }
+
+
+                switch (alt7) {
+            	case 1 :
+            	    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:223:52: .
+            	    {
+            	    matchAny(); 
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop7;
+                }
+            } while (true);
+
+            match("*/"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_ML_COMMENT
+
+    // $ANTLR start RULE_SL_COMMENT
+    public final void mRULE_SL_COMMENT() throws RecognitionException {
+        try {
+            int _type = RULE_SL_COMMENT;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:225:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:225:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            {
+            match("//"); 
+
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:225:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            loop8:
+            do {
+                int alt8=2;
+                int LA8_0 = input.LA(1);
+
+                if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFE')) ) {
+                    alt8=1;
+                }
+
+
+                switch (alt8) {
+            	case 1 :
+            	    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:225:24: ~ ( ( '\\n' | '\\r' ) )
+            	    {
+            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) {
+            	        input.consume();
+
+            	    }
+            	    else {
+            	        MismatchedSetException mse =
+            	            new MismatchedSetException(null,input);
+            	        recover(mse);    throw mse;
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop8;
+                }
+            } while (true);
+
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:225:40: ( ( '\\r' )? '\\n' )?
+            int alt10=2;
+            int LA10_0 = input.LA(1);
+
+            if ( (LA10_0=='\n'||LA10_0=='\r') ) {
+                alt10=1;
+            }
+            switch (alt10) {
+                case 1 :
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:225:41: ( '\\r' )? '\\n'
+                    {
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:225:41: ( '\\r' )?
+                    int alt9=2;
+                    int LA9_0 = input.LA(1);
+
+                    if ( (LA9_0=='\r') ) {
+                        alt9=1;
+                    }
+                    switch (alt9) {
+                        case 1 :
+                            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:225:41: '\\r'
+                            {
+                            match('\r'); 
+
+                            }
+                            break;
+
+                    }
+
+                    match('\n'); 
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_SL_COMMENT
+
+    // $ANTLR start RULE_WS
+    public final void mRULE_WS() throws RecognitionException {
+        try {
+            int _type = RULE_WS;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:227:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:227:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:227:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            int cnt11=0;
+            loop11:
+            do {
+                int alt11=2;
+                int LA11_0 = input.LA(1);
+
+                if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {
+                    alt11=1;
+                }
+
+
+                switch (alt11) {
+            	case 1 :
+            	    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:
+            	    {
+            	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
+            	        input.consume();
+
+            	    }
+            	    else {
+            	        MismatchedSetException mse =
+            	            new MismatchedSetException(null,input);
+            	        recover(mse);    throw mse;
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    if ( cnt11 >= 1 ) break loop11;
+                        EarlyExitException eee =
+                            new EarlyExitException(11, input);
+                        throw eee;
+                }
+                cnt11++;
+            } while (true);
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_WS
+
+    // $ANTLR start RULE_ANY_OTHER
+    public final void mRULE_ANY_OTHER() throws RecognitionException {
+        try {
+            int _type = RULE_ANY_OTHER;
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:229:16: ( . )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:229:18: .
+            {
+            matchAny(); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_ANY_OTHER
+
+    public void mTokens() throws RecognitionException {
+        // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt12=11;
+        int LA12_0 = input.LA(1);
+
+        if ( (LA12_0=='m') ) {
+            int LA12_1 = input.LA(2);
+
+            if ( (LA12_1=='o') ) {
+                int LA12_13 = input.LA(3);
+
+                if ( (LA12_13=='d') ) {
+                    int LA12_23 = input.LA(4);
+
+                    if ( (LA12_23=='e') ) {
+                        int LA12_26 = input.LA(5);
+
+                        if ( (LA12_26=='l') ) {
+                            int LA12_29 = input.LA(6);
+
+                            if ( ((LA12_29>='0' && LA12_29<='9')||(LA12_29>='A' && LA12_29<='Z')||LA12_29=='_'||(LA12_29>='a' && LA12_29<='z')) ) {
+                                alt12=5;
+                            }
+                            else {
+                                alt12=1;}
+                        }
+                        else {
+                            alt12=5;}
+                    }
+                    else {
+                        alt12=5;}
+                }
+                else {
+                    alt12=5;}
+            }
+            else {
+                alt12=5;}
+        }
+        else if ( (LA12_0=='f') ) {
+            int LA12_2 = input.LA(2);
+
+            if ( (LA12_2=='e') ) {
+                int LA12_15 = input.LA(3);
+
+                if ( (LA12_15=='a') ) {
+                    int LA12_24 = input.LA(4);
+
+                    if ( (LA12_24=='t') ) {
+                        int LA12_27 = input.LA(5);
+
+                        if ( (LA12_27=='u') ) {
+                            int LA12_30 = input.LA(6);
+
+                            if ( (LA12_30=='r') ) {
+                                int LA12_33 = input.LA(7);
+
+                                if ( (LA12_33=='e') ) {
+                                    int LA12_35 = input.LA(8);
+
+                                    if ( ((LA12_35>='0' && LA12_35<='9')||(LA12_35>='A' && LA12_35<='Z')||LA12_35=='_'||(LA12_35>='a' && LA12_35<='z')) ) {
+                                        alt12=5;
+                                    }
+                                    else {
+                                        alt12=2;}
+                                }
+                                else {
+                                    alt12=5;}
+                            }
+                            else {
+                                alt12=5;}
+                        }
+                        else {
+                            alt12=5;}
+                    }
+                    else {
+                        alt12=5;}
+                }
+                else {
+                    alt12=5;}
+            }
+            else {
+                alt12=5;}
+        }
+        else if ( (LA12_0==';') ) {
+            alt12=3;
+        }
+        else if ( (LA12_0=='k') ) {
+            int LA12_4 = input.LA(2);
+
+            if ( (LA12_4=='e') ) {
+                int LA12_17 = input.LA(3);
+
+                if ( (LA12_17=='y') ) {
+                    int LA12_25 = input.LA(4);
+
+                    if ( (LA12_25=='w') ) {
+                        int LA12_28 = input.LA(5);
+
+                        if ( (LA12_28=='o') ) {
+                            int LA12_31 = input.LA(6);
+
+                            if ( (LA12_31=='r') ) {
+                                int LA12_34 = input.LA(7);
+
+                                if ( (LA12_34=='d') ) {
+                                    int LA12_36 = input.LA(8);
+
+                                    if ( ((LA12_36>='0' && LA12_36<='9')||(LA12_36>='A' && LA12_36<='Z')||LA12_36=='_'||(LA12_36>='a' && LA12_36<='z')) ) {
+                                        alt12=5;
+                                    }
+                                    else {
+                                        alt12=4;}
+                                }
+                                else {
+                                    alt12=5;}
+                            }
+                            else {
+                                alt12=5;}
+                        }
+                        else {
+                            alt12=5;}
+                    }
+                    else {
+                        alt12=5;}
+                }
+                else {
+                    alt12=5;}
+            }
+            else {
+                alt12=5;}
+        }
+        else if ( (LA12_0=='^') ) {
+            int LA12_5 = input.LA(2);
+
+            if ( ((LA12_5>='A' && LA12_5<='Z')||LA12_5=='_'||(LA12_5>='a' && LA12_5<='z')) ) {
+                alt12=5;
+            }
+            else {
+                alt12=11;}
+        }
+        else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='e')||(LA12_0>='g' && LA12_0<='j')||LA12_0=='l'||(LA12_0>='n' && LA12_0<='z')) ) {
+            alt12=5;
+        }
+        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {
+            alt12=6;
+        }
+        else if ( (LA12_0=='\"') ) {
+            int LA12_8 = input.LA(2);
+
+            if ( ((LA12_8>='\u0000' && LA12_8<='\uFFFE')) ) {
+                alt12=7;
+            }
+            else {
+                alt12=11;}
+        }
+        else if ( (LA12_0=='\'') ) {
+            int LA12_9 = input.LA(2);
+
+            if ( ((LA12_9>='\u0000' && LA12_9<='\uFFFE')) ) {
+                alt12=7;
+            }
+            else {
+                alt12=11;}
+        }
+        else if ( (LA12_0=='/') ) {
+            switch ( input.LA(2) ) {
+            case '/':
+                {
+                alt12=9;
+                }
+                break;
+            case '*':
+                {
+                alt12=8;
+                }
+                break;
+            default:
+                alt12=11;}
+
+        }
+        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {
+            alt12=10;
+        }
+        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='.')||LA12_0==':'||(LA12_0>='<' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFE')) ) {
+            alt12=11;
+        }
+        else {
+            NoViableAltException nvae =
+                new NoViableAltException("1:1: Tokens : ( T11 | T12 | T13 | T14 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 12, 0, input);
+
+            throw nvae;
+        }
+        switch (alt12) {
+            case 1 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:10: T11
+                {
+                mT11(); 
+
+                }
+                break;
+            case 2 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:14: T12
+                {
+                mT12(); 
+
+                }
+                break;
+            case 3 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:18: T13
+                {
+                mT13(); 
+
+                }
+                break;
+            case 4 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:22: T14
+                {
+                mT14(); 
+
+                }
+                break;
+            case 5 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:26: RULE_ID
+                {
+                mRULE_ID(); 
+
+                }
+                break;
+            case 6 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:34: RULE_INT
+                {
+                mRULE_INT(); 
+
+                }
+                break;
+            case 7 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:43: RULE_STRING
+                {
+                mRULE_STRING(); 
+
+                }
+                break;
+            case 8 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:55: RULE_ML_COMMENT
+                {
+                mRULE_ML_COMMENT(); 
+
+                }
+                break;
+            case 9 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:71: RULE_SL_COMMENT
+                {
+                mRULE_SL_COMMENT(); 
+
+                }
+                break;
+            case 10 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:87: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 11 :
+                // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:1:95: RULE_ANY_OTHER
+                {
+                mRULE_ANY_OTHER(); 
+
+                }
+                break;
+
+        }
+
+    }
+
+
+ 
+
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageParser.java
new file mode 100644
index 0000000..181f902
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguageParser.java
@@ -0,0 +1,456 @@
+package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal; 
+
+import java.io.InputStream;
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.parser.*;
+import org.eclipse.xtext.parser.impl.*;
+import org.eclipse.xtext.parsetree.*;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
+import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
+import org.eclipse.xtext.conversion.ValueConverterException;
+import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess;
+
+
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+
+public class InternalUnassignedRuleCallTestLanguageParser extends AbstractInternalAntlrParser {
+    public static final String[] tokenNames = new String[] {
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'model'", "'feature'", "';'", "'keyword'"
+    };
+    public static final int RULE_ML_COMMENT=7;
+    public static final int RULE_ID=5;
+    public static final int RULE_WS=9;
+    public static final int EOF=-1;
+    public static final int RULE_INT=4;
+    public static final int RULE_STRING=6;
+    public static final int RULE_ANY_OTHER=10;
+    public static final int RULE_SL_COMMENT=8;
+
+        public InternalUnassignedRuleCallTestLanguageParser(TokenStream input) {
+            super(input);
+        }
+        
+
+    public String[] getTokenNames() { return tokenNames; }
+    public String getGrammarFileName() { return "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g"; }
+
+
+     
+     	private UnassignedRuleCallTestLanguageGrammarAccess grammarAccess;
+     	
+        public InternalUnassignedRuleCallTestLanguageParser(TokenStream input, IAstFactory factory, UnassignedRuleCallTestLanguageGrammarAccess grammarAccess) {
+            super(input, factory, grammarAccess.getGrammar());
+            this.grammarAccess = grammarAccess;
+        }
+        
+        @Override
+        protected InputStream getTokenFile() {
+        	ClassLoader classLoader = getClass().getClassLoader();
+        	return classLoader.getResourceAsStream("org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.tokens");
+        }
+        
+        @Override
+        protected String getFirstRuleName() {
+        	return "Model";	
+       	} 
+
+
+
+    // $ANTLR start entryRuleModel
+    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:69:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ;
+    public final EObject entryRuleModel() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleModel = null;
+
+
+        try {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:69:47: (iv_ruleModel= ruleModel EOF )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:70:2: iv_ruleModel= ruleModel EOF
+            {
+             currentNode = createCompositeNode(grammarAccess.getModelRule(), currentNode); 
+            pushFollow(FOLLOW_ruleModel_in_entryRuleModel71);
+            iv_ruleModel=ruleModel();
+            _fsp--;
+
+             current =iv_ruleModel; 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleModel81); 
+
+            }
+
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end entryRuleModel
+
+
+    // $ANTLR start ruleModel
+    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:77:1: ruleModel returns [EObject current=null] : ( 'model' ( RULE_INT )+ (lv_modelFeatures_2= ruleModelFeatures ) ) ;
+    public final EObject ruleModel() throws RecognitionException {
+        EObject current = null;
+
+        EObject lv_modelFeatures_2 = null;
+
+
+         EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+            
+        try {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:82:6: ( ( 'model' ( RULE_INT )+ (lv_modelFeatures_2= ruleModelFeatures ) ) )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:83:1: ( 'model' ( RULE_INT )+ (lv_modelFeatures_2= ruleModelFeatures ) )
+            {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:83:1: ( 'model' ( RULE_INT )+ (lv_modelFeatures_2= ruleModelFeatures ) )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:83:2: 'model' ( RULE_INT )+ (lv_modelFeatures_2= ruleModelFeatures )
+            {
+            match(input,11,FOLLOW_11_in_ruleModel115); 
+
+                    createLeafNode(grammarAccess.getModelAccess().getModelKeyword_0(), null); 
+                
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:87:1: ( RULE_INT )+
+            int cnt1=0;
+            loop1:
+            do {
+                int alt1=2;
+                int LA1_0 = input.LA(1);
+
+                if ( (LA1_0==RULE_INT) ) {
+                    alt1=1;
+                }
+
+
+                switch (alt1) {
+            	case 1 :
+            	    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:87:2: RULE_INT
+            	    {
+            	    match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleModel125); 
+            	     
+            	        createLeafNode(grammarAccess.getModelAccess().getINTTerminalRuleCall_1(), null); 
+            	        
+
+            	    }
+            	    break;
+
+            	default :
+            	    if ( cnt1 >= 1 ) break loop1;
+                        EarlyExitException eee =
+                            new EarlyExitException(1, input);
+                        throw eee;
+                }
+                cnt1++;
+            } while (true);
+
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:91:3: (lv_modelFeatures_2= ruleModelFeatures )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:94:6: lv_modelFeatures_2= ruleModelFeatures
+            {
+             
+            	        currentNode=createCompositeNode(grammarAccess.getModelAccess().getModelFeaturesModelFeaturesParserRuleCall_2_0(), currentNode); 
+            	    
+            pushFollow(FOLLOW_ruleModelFeatures_in_ruleModel160);
+            lv_modelFeatures_2=ruleModelFeatures();
+            _fsp--;
+
+
+            	        if (current==null) {
+            	            current = factory.create(grammarAccess.getModelRule().getType().getClassifier());
+            	            associateNodeWithAstElement(currentNode.getParent(), current);
+            	        }
+            	        
+            	        try {
+            	       		set(current, "modelFeatures", lv_modelFeatures_2, "ModelFeatures", currentNode);
+            	        } catch (ValueConverterException vce) {
+            				handleValueConverterException(vce);
+            	        }
+            	        currentNode = currentNode.getParent();
+            	    
+
+            }
+
+
+            }
+
+
+            }
+
+             resetLookahead(); 
+                	lastConsumedNode = currentNode;
+                
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end ruleModel
+
+
+    // $ANTLR start entryRuleModelFeatures
+    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:119:1: entryRuleModelFeatures returns [EObject current=null] : iv_ruleModelFeatures= ruleModelFeatures EOF ;
+    public final EObject entryRuleModelFeatures() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleModelFeatures = null;
+
+
+        try {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:119:55: (iv_ruleModelFeatures= ruleModelFeatures EOF )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:120:2: iv_ruleModelFeatures= ruleModelFeatures EOF
+            {
+             currentNode = createCompositeNode(grammarAccess.getModelFeaturesRule(), currentNode); 
+            pushFollow(FOLLOW_ruleModelFeatures_in_entryRuleModelFeatures197);
+            iv_ruleModelFeatures=ruleModelFeatures();
+            _fsp--;
+
+             current =iv_ruleModelFeatures; 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleModelFeatures207); 
+
+            }
+
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end entryRuleModelFeatures
+
+
+    // $ANTLR start ruleModelFeatures
+    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:127:1: ruleModelFeatures returns [EObject current=null] : ( 'feature' (lv_name_1= RULE_ID ) ruleDataTypeRule ';' ) ;
+    public final EObject ruleModelFeatures() throws RecognitionException {
+        EObject current = null;
+
+        Token lv_name_1=null;
+
+         EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+            
+        try {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:132:6: ( ( 'feature' (lv_name_1= RULE_ID ) ruleDataTypeRule ';' ) )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:133:1: ( 'feature' (lv_name_1= RULE_ID ) ruleDataTypeRule ';' )
+            {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:133:1: ( 'feature' (lv_name_1= RULE_ID ) ruleDataTypeRule ';' )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:133:2: 'feature' (lv_name_1= RULE_ID ) ruleDataTypeRule ';'
+            {
+            match(input,12,FOLLOW_12_in_ruleModelFeatures241); 
+
+                    createLeafNode(grammarAccess.getModelFeaturesAccess().getFeatureKeyword_0(), null); 
+                
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:137:1: (lv_name_1= RULE_ID )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:139:6: lv_name_1= RULE_ID
+            {
+            lv_name_1=(Token)input.LT(1);
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleModelFeatures263); 
+
+            		createLeafNode(grammarAccess.getModelFeaturesAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
+            	
+
+            	        if (current==null) {
+            	            current = factory.create(grammarAccess.getModelFeaturesRule().getType().getClassifier());
+            	            associateNodeWithAstElement(currentNode, current);
+            	        }
+            	        
+            	        try {
+            	       		set(current, "name", lv_name_1, "ID", lastConsumedNode);
+            	        } catch (ValueConverterException vce) {
+            				handleValueConverterException(vce);
+            	        }
+            	    
+
+            }
+
+            pushFollow(FOLLOW_ruleDataTypeRule_in_ruleModelFeatures280);
+            ruleDataTypeRule();
+            _fsp--;
+
+            match(input,13,FOLLOW_13_in_ruleModelFeatures281); 
+
+                    createLeafNode(grammarAccess.getModelFeaturesAccess().getSemicolonKeyword_3(), null); 
+                
+
+            }
+
+
+            }
+
+             resetLookahead(); 
+                	lastConsumedNode = currentNode;
+                
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end ruleModelFeatures
+
+
+    // $ANTLR start entryRuleDataTypeRule
+    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:168:1: entryRuleDataTypeRule returns [String current=null] : iv_ruleDataTypeRule= ruleDataTypeRule EOF ;
+    public final String entryRuleDataTypeRule() throws RecognitionException {
+        String current = null;
+
+        AntlrDatatypeRuleToken iv_ruleDataTypeRule = null;
+
+
+        try {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:168:53: (iv_ruleDataTypeRule= ruleDataTypeRule EOF )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:169:2: iv_ruleDataTypeRule= ruleDataTypeRule EOF
+            {
+             currentNode = createCompositeNode(grammarAccess.getDataTypeRuleRule(), currentNode); 
+            pushFollow(FOLLOW_ruleDataTypeRule_in_entryRuleDataTypeRule315);
+            iv_ruleDataTypeRule=ruleDataTypeRule();
+            _fsp--;
+
+             current =iv_ruleDataTypeRule.getText(); 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleDataTypeRule326); 
+
+            }
+
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end entryRuleDataTypeRule
+
+
+    // $ANTLR start ruleDataTypeRule
+    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:176:1: ruleDataTypeRule returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? ) ;
+    public final AntlrDatatypeRuleToken ruleDataTypeRule() throws RecognitionException {
+        AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+        Token this_INT_0=null;
+        Token kw=null;
+        Token this_INT_2=null;
+        Token this_STRING_3=null;
+
+         setCurrentLookahead(); resetLookahead(); 
+            
+        try {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:182:6: ( (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? ) )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:183:1: (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? )
+            {
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:183:1: (this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )? )
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:183:6: this_INT_0= RULE_INT kw= 'keyword' this_INT_2= RULE_INT (this_STRING_3= RULE_STRING )?
+            {
+            this_INT_0=(Token)input.LT(1);
+            match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDataTypeRule366); 
+
+            		current.merge(this_INT_0);
+                
+             
+                createLeafNode(grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_0(), null); 
+                
+            kw=(Token)input.LT(1);
+            match(input,14,FOLLOW_14_in_ruleDataTypeRule384); 
+
+                    current.merge(kw);
+                    createLeafNode(grammarAccess.getDataTypeRuleAccess().getKeywordKeyword_1(), null); 
+                
+            this_INT_2=(Token)input.LT(1);
+            match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleDataTypeRule399); 
+
+            		current.merge(this_INT_2);
+                
+             
+                createLeafNode(grammarAccess.getDataTypeRuleAccess().getINTTerminalRuleCall_2(), null); 
+                
+            // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:203:1: (this_STRING_3= RULE_STRING )?
+            int alt2=2;
+            int LA2_0 = input.LA(1);
+
+            if ( (LA2_0==RULE_STRING) ) {
+                alt2=1;
+            }
+            switch (alt2) {
+                case 1 :
+                    // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g:203:6: this_STRING_3= RULE_STRING
+                    {
+                    this_STRING_3=(Token)input.LT(1);
+                    match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleDataTypeRule420); 
+
+                    		current.merge(this_STRING_3);
+                        
+                     
+                        createLeafNode(grammarAccess.getDataTypeRuleAccess().getSTRINGTerminalRuleCall_3(), null); 
+                        
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+            }
+
+             resetLookahead(); 
+            	    lastConsumedNode = currentNode;
+            	    lastConsumedDatatypeToken = current;
+                
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end ruleDataTypeRule
+
+
+ 
+
+    public static final BitSet FOLLOW_ruleModel_in_entryRuleModel71 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleModel81 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_11_in_ruleModel115 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_INT_in_ruleModel125 = new BitSet(new long[]{0x0000000000001010L});
+    public static final BitSet FOLLOW_ruleModelFeatures_in_ruleModel160 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleModelFeatures_in_entryRuleModelFeatures197 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleModelFeatures207 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_12_in_ruleModelFeatures241 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleModelFeatures263 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleDataTypeRule_in_ruleModelFeatures280 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_13_in_ruleModelFeatures281 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleDataTypeRule_in_entryRuleDataTypeRule315 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleDataTypeRule326 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_INT_in_ruleDataTypeRule366 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_14_in_ruleDataTypeRule384 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_INT_in_ruleDataTypeRule399 = new BitSet(new long[]{0x0000000000000042L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleDataTypeRule420 = new BitSet(new long[]{0x0000000000000002L});
+
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage__.g
new file mode 100644
index 0000000..a5d111a
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage__.g
@@ -0,0 +1,36 @@
+lexer grammar InternalUnassignedRuleCallTestLanguage;
+@header {
+package org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal;
+
+// Hack: Use our own Lexer superclass by means of import. 
+// Currently there is no other way to specify the superclass for the lexer.
+import org.eclipse.xtext.parser.antlr.Lexer;
+}
+
+T11 : 'model' ;
+T12 : 'feature' ;
+T13 : ';' ;
+T14 : 'keyword' ;
+
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g" 217
+RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g" 219
+RULE_INT : ('0'..'9')+;
+
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g" 221
+RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
+
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g" 223
+RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
+
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g" 225
+RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
+
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g" 227
+RULE_WS : (' '|'\t'|'\r'|'\n')+;
+
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/antlr/internal/InternalUnassignedRuleCallTestLanguage.g" 229
+RULE_ANY_OTHER : .;
+
+
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/UnassignedRuleCallTestLanguageDelimiters.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/UnassignedRuleCallTestLanguageDelimiters.java
new file mode 100644
index 0000000..550e816
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/UnassignedRuleCallTestLanguageDelimiters.java
@@ -0,0 +1,31 @@
+/*
+* generated by Xtext
+*/
+package org.eclipse.xtext.xtext.ecoreInference.parser.packrat;
+
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
+import org.eclipse.xtext.parser.packrat.matching.SetBasedKeywordMatcher;
+
+public final class UnassignedRuleCallTestLanguageDelimiters {
+
+	private UnassignedRuleCallTestLanguageDelimiters() {
+		throw new UnsupportedOperationException("Utility classes may not be initialized");
+	}
+	
+    // TODO: remove hardcoded character class from template
+	public static final ICharacterClass keyword$4$Delimiter = ICharacterClass.Factory.join(
+			ICharacterClass.Factory.createRange('a', 'z'),
+			ICharacterClass.Factory.createRange('A', 'Z'),
+			ICharacterClass.Factory.create('_'),
+			ICharacterClass.Factory.createRange('0', '9')
+	);
+
+	public static final ISequenceMatcher ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+
+	public static final ICharacterClass keyword$15$Delimiter = ICharacterClass.Factory.nullClass();
+
+	public static final ISequenceMatcher ruleCall$13$Delimiter = new SetBasedKeywordMatcher(
+		"model", "feature", "keyword");
+
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/UnassignedRuleCallTestLanguagePackratParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/UnassignedRuleCallTestLanguagePackratParser.java
new file mode 100644
index 0000000..b287764
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/UnassignedRuleCallTestLanguagePackratParser.java
@@ -0,0 +1,31 @@
+/*
+* generated by Xtext
+*/
+package org.eclipse.xtext.xtext.ecoreInference.parser.packrat;
+
+import com.google.inject.Inject;
+
+import org.eclipse.xtext.parser.packrat.AbstractPackratParser;
+import org.eclipse.xtext.parser.packrat.IParseResultFactory;
+import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration.IInternalParserConfiguration;
+
+import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess;
+
+public class UnassignedRuleCallTestLanguagePackratParser extends AbstractPackratParser {
+	
+	@Inject
+	public UnassignedRuleCallTestLanguagePackratParser(IParseResultFactory parseResultFactory, UnassignedRuleCallTestLanguageGrammarAccess grammarAccess) {
+		super(parseResultFactory, grammarAccess);
+	}
+	
+	@Override
+	protected org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageParserConfiguration createParserConfiguration(IInternalParserConfiguration configuration) {
+		return new org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageParserConfiguration(configuration, getGrammarAccess());
+	}
+	
+	@Override
+	protected UnassignedRuleCallTestLanguageGrammarAccess getGrammarAccess() {
+		return (UnassignedRuleCallTestLanguageGrammarAccess)super.getGrammarAccess();
+	}
+	
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/UnassignedRuleCallTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/UnassignedRuleCallTestLanguageParserConfiguration.java
new file mode 100644
index 0000000..99772b1
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/UnassignedRuleCallTestLanguageParserConfiguration.java
@@ -0,0 +1,144 @@
+/*
+* generated by Xtext
+*/
+package org.eclipse.xtext.xtext.ecoreInference.parser.packrat;
+
+import org.eclipse.xtext.parser.packrat.AbstractParserConfiguration;
+import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
+
+import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess;
+
+import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration; 
+import org.eclipse.xtext.xtext.ecoreInference.parser.packrat.consumers.UnassignedRuleCallTestLanguageModelConsumer;
+import org.eclipse.xtext.xtext.ecoreInference.parser.packrat.consumers.UnassignedRuleCallTestLanguageModelFeaturesConsumer;
+import org.eclipse.xtext.xtext.ecoreInference.parser.packrat.consumers.UnassignedRuleCallTestLanguageDataTypeRuleConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsIDConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsINTConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsSTRINGConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsML_COMMENTConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsSL_COMMENTConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsWSConsumer;
+import org.eclipse.xtext.common.parser.packrat.consumers.TerminalsANY_OTHERConsumer;
+
+public class UnassignedRuleCallTestLanguageParserConfiguration extends AbstractParserConfiguration {
+
+	private final TerminalsParserConfiguration terminalsConfiguration; 
+    private UnassignedRuleCallTestLanguageModelConsumer modelConsumer;
+    private UnassignedRuleCallTestLanguageModelFeaturesConsumer modelFeaturesConsumer;
+    private UnassignedRuleCallTestLanguageDataTypeRuleConsumer dataTypeRuleConsumer;
+
+	private UnassignedRuleCallTestLanguageGrammarAccess grammarAccess;
+
+	public UnassignedRuleCallTestLanguageParserConfiguration(IInternalParserConfiguration configuration, UnassignedRuleCallTestLanguageGrammarAccess grammarAccess) {
+		super(configuration);
+		this.grammarAccess = grammarAccess;
+		this.terminalsConfiguration = new TerminalsParserConfiguration(configuration, null);
+	}
+
+	public UnassignedRuleCallTestLanguageModelConsumer getRootConsumer() {
+		return modelConsumer;
+	} 
+
+	public void createNonTerminalConsumers() {
+		getTerminalsConfiguration().createNonTerminalConsumers();
+		modelConsumer = new UnassignedRuleCallTestLanguageModelConsumer(
+    		this, null
+    	);
+		modelFeaturesConsumer = new UnassignedRuleCallTestLanguageModelFeaturesConsumer(
+    		this, null
+    	);
+		dataTypeRuleConsumer = new UnassignedRuleCallTestLanguageDataTypeRuleConsumer(
+    		this, null
+    	);
+	}
+	
+	public void createTerminalConsumers() {
+		getTerminalsConfiguration().createTerminalConsumers();
+	}
+	
+	public void configureConsumers() {
+		if (grammarAccess == null)
+			throw new NullPointerException("grammarAccess may not be null, you call configureConsumers");
+		getModelConsumer().setRule(grammarAccess.getModelAccess());
+		getModelFeaturesConsumer().setRule(grammarAccess.getModelFeaturesAccess());
+		getDataTypeRuleConsumer().setRule(grammarAccess.getDataTypeRuleAccess());
+		getIdConsumer().setRule(grammarAccess.getIDRule());
+		getIntConsumer().setRule(grammarAccess.getINTRule());
+		getStringConsumer().setRule(grammarAccess.getSTRINGRule());
+		getMlCommentConsumer().setRule(grammarAccess.getML_COMMENTRule());
+		getSlCommentConsumer().setRule(grammarAccess.getSL_COMMENTRule());
+		getWsConsumer().setRule(grammarAccess.getWSRule());
+		getAnyOtherConsumer().setRule(grammarAccess.getANY_OTHERRule());
+
+
+		getModelConsumer().setIntConsumer(getIntConsumer());
+		getModelConsumer().setModelFeaturesConsumer(getModelFeaturesConsumer());
+
+		getModelFeaturesConsumer().setDataTypeRuleConsumer(getDataTypeRuleConsumer());
+		getModelFeaturesConsumer().setIdConsumer(getIdConsumer());
+
+		getDataTypeRuleConsumer().setIntConsumer(getIntConsumer());
+		getDataTypeRuleConsumer().setStringConsumer(getStringConsumer());
+
+		getModelConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageDelimiters.keyword$4$Delimiter);
+		getModelConsumer().setRuleCall$3$Delimiter(org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageDelimiters.ruleCall$5$Delimiter);
+		getModelFeaturesConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageDelimiters.keyword$4$Delimiter);
+		getModelFeaturesConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageDelimiters.keyword$15$Delimiter);
+		getModelFeaturesConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageDelimiters.ruleCall$13$Delimiter);
+		getDataTypeRuleConsumer().setKeyword$3$Delimiter(org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageDelimiters.keyword$4$Delimiter);
+		getDataTypeRuleConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageDelimiters.ruleCall$5$Delimiter);
+		getDataTypeRuleConsumer().setRuleCall$4$Delimiter(org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageDelimiters.ruleCall$5$Delimiter);
+		getDataTypeRuleConsumer().setRuleCall$5$Delimiter(org.eclipse.xtext.xtext.ecoreInference.parser.packrat.UnassignedRuleCallTestLanguageDelimiters.ruleCall$5$Delimiter);
+	}
+	
+	public TerminalsParserConfiguration getTerminalsConfiguration() {
+		return terminalsConfiguration;
+	} 
+	
+    public UnassignedRuleCallTestLanguageModelConsumer getModelConsumer() {
+    	return modelConsumer;
+    }
+
+    public UnassignedRuleCallTestLanguageModelFeaturesConsumer getModelFeaturesConsumer() {
+    	return modelFeaturesConsumer;
+    }
+
+    public UnassignedRuleCallTestLanguageDataTypeRuleConsumer getDataTypeRuleConsumer() {
+    	return dataTypeRuleConsumer;
+    }
+
+    public TerminalsIDConsumer getIdConsumer() {
+    	return getTerminalsConfiguration().getIdConsumer();
+    }
+
+    public TerminalsINTConsumer getIntConsumer() {
+    	return getTerminalsConfiguration().getIntConsumer();
+    }
+
+    public TerminalsSTRINGConsumer getStringConsumer() {
+    	return getTerminalsConfiguration().getStringConsumer();
+    }
+
+    public TerminalsML_COMMENTConsumer getMlCommentConsumer() {
+    	return getTerminalsConfiguration().getMlCommentConsumer();
+    }
+
+    public TerminalsSL_COMMENTConsumer getSlCommentConsumer() {
+    	return getTerminalsConfiguration().getSlCommentConsumer();
+    }
+
+    public TerminalsWSConsumer getWsConsumer() {
+    	return getTerminalsConfiguration().getWsConsumer();
+    }
+
+    public TerminalsANY_OTHERConsumer getAnyOtherConsumer() {
+    	return getTerminalsConfiguration().getAnyOtherConsumer();
+    }
+
+
+	@Override
+	public ITerminalConsumer[] getInitialHiddenTerminals() {
+		return getTerminalsConfiguration().getInitialHiddenTerminals();
+	}
+	
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/consumers/UnassignedRuleCallTestLanguageDataTypeRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/consumers/UnassignedRuleCallTestLanguageDataTypeRuleConsumer.java
new file mode 100644
index 0000000..9ea6efc
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/consumers/UnassignedRuleCallTestLanguageDataTypeRuleConsumer.java
@@ -0,0 +1,188 @@
+/*
+* generated by Xtext
+*/
+package org.eclipse.xtext.xtext.ecoreInference.parser.packrat.consumers;
+
+import org.eclipse.emf.ecore.EClassifier;
+
+import org.eclipse.xtext.AbstractRule;
+import org.eclipse.xtext.Group;
+import org.eclipse.xtext.Keyword;
+import org.eclipse.xtext.RuleCall;
+
+import org.eclipse.xtext.parser.packrat.consumers.IElementConsumer;
+import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumerConfiguration;
+import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
+import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
+
+import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess.DataTypeRuleElements;
+
+public final class UnassignedRuleCallTestLanguageDataTypeRuleConsumer extends NonTerminalConsumer {
+
+	private DataTypeRuleElements rule;	
+
+	private ITerminalConsumer intConsumer;
+
+	private ITerminalConsumer stringConsumer;
+
+	private IElementConsumer group$1$Consumer;
+
+	private IElementConsumer ruleCall$2$Consumer;
+
+	private IElementConsumer keyword$3$Consumer;
+
+	private IElementConsumer ruleCall$4$Consumer;
+
+	private IElementConsumer ruleCall$5$Consumer;
+
+	private ICharacterClass keyword$3$Delimiter;
+
+	private ISequenceMatcher ruleCall$2$Delimiter;
+
+	private ISequenceMatcher ruleCall$4$Delimiter;
+
+	private ISequenceMatcher ruleCall$5$Delimiter;
+
+	protected class Group$1$Consumer extends GroupConsumer {
+		
+		protected Group$1$Consumer(final Group group) {
+			super(group);
+		}
+		
+		@Override
+		protected void doGetConsumers(ConsumerAcceptor acceptor) {
+			acceptor.accept(ruleCall$2$Consumer);
+			acceptor.accept(keyword$3$Consumer);
+			acceptor.accept(ruleCall$4$Consumer);
+			acceptor.accept(ruleCall$5$Consumer);
+		}
+	}
+
+	protected class RuleCall$2$Consumer extends ElementConsumer<RuleCall> {
+		
+		protected RuleCall$2$Consumer(final RuleCall ruleCall) {
+			super(ruleCall);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeTerminal(intConsumer, null, false, false, getElement(), getRuleCall$2$Delimiter(), optional);
+		}
+	}
+
+	protected class Keyword$3$Consumer extends ElementConsumer<Keyword> {
+		
+		protected Keyword$3$Consumer(final Keyword keyword) {
+			super(keyword);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeKeyword(getElement(), null, false, false, getKeyword$3$Delimiter(), optional);
+		}
+	}
+
+	protected class RuleCall$4$Consumer extends ElementConsumer<RuleCall> {
+		
+		protected RuleCall$4$Consumer(final RuleCall ruleCall) {
+			super(ruleCall);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeTerminal(intConsumer, null, false, false, getElement(), getRuleCall$4$Delimiter(), optional);
+		}
+	}
+
+	protected class RuleCall$5$Consumer extends OptionalElementConsumer<RuleCall> {
+		
+		protected RuleCall$5$Consumer(final RuleCall ruleCall) {
+			super(ruleCall);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeTerminal(stringConsumer, null, false, false, getElement(), getRuleCall$5$Delimiter(), optional);
+		}
+	}
+
+	public UnassignedRuleCallTestLanguageDataTypeRuleConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) {
+		super(configuration, hiddenTokens);
+		keyword$3$Delimiter = ICharacterClass.Factory.nullClass();
+		ruleCall$2$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+		ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+		ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+	}
+	
+	@Override
+	protected int doConsume() throws Exception {
+		return group$1$Consumer.consume();
+	}
+
+	public DataTypeRuleElements getRule() {
+		return rule;
+	}
+	
+	public void setRule(DataTypeRuleElements rule) {
+		this.rule = rule;
+		
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getINTTerminalRuleCall_0());
+		keyword$3$Consumer = new Keyword$3$Consumer(rule.getKeywordKeyword_1());
+		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.getINTTerminalRuleCall_2());
+		ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.getSTRINGTerminalRuleCall_3());
+	}
+	
+	@Override
+	protected AbstractRule getGrammarElement() {
+		return getRule().getRule();
+	}
+
+	@Override
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getClassifier();
+	}
+	
+	public void setIntConsumer(ITerminalConsumer intConsumer) {
+		this.intConsumer = intConsumer;
+	}
+	
+	public void setStringConsumer(ITerminalConsumer stringConsumer) {
+		this.stringConsumer = stringConsumer;
+	}
+	
+	public ICharacterClass getKeyword$3$Delimiter() {
+		return keyword$3$Delimiter;
+	}
+	
+	public void setKeyword$3$Delimiter(ICharacterClass characterClass) {
+		keyword$3$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+	}
+	
+	public ISequenceMatcher getRuleCall$2$Delimiter() {
+		return ruleCall$2$Delimiter;
+	}
+	
+	public void setRuleCall$2$Delimiter(ISequenceMatcher matcher) {
+		ruleCall$2$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+	}
+	
+	public ISequenceMatcher getRuleCall$4$Delimiter() {
+		return ruleCall$4$Delimiter;
+	}
+	
+	public void setRuleCall$4$Delimiter(ISequenceMatcher matcher) {
+		ruleCall$4$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+	}
+	
+	public ISequenceMatcher getRuleCall$5$Delimiter() {
+		return ruleCall$5$Delimiter;
+	}
+	
+	public void setRuleCall$5$Delimiter(ISequenceMatcher matcher) {
+		ruleCall$5$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+	}
+	
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/consumers/UnassignedRuleCallTestLanguageModelConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/consumers/UnassignedRuleCallTestLanguageModelConsumer.java
new file mode 100644
index 0000000..a1c2c23
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/consumers/UnassignedRuleCallTestLanguageModelConsumer.java
@@ -0,0 +1,167 @@
+/*
+* generated by Xtext
+*/
+package org.eclipse.xtext.xtext.ecoreInference.parser.packrat.consumers;
+
+import org.eclipse.emf.ecore.EClassifier;
+
+import org.eclipse.xtext.AbstractRule;
+import org.eclipse.xtext.Assignment;
+import org.eclipse.xtext.Group;
+import org.eclipse.xtext.Keyword;
+import org.eclipse.xtext.RuleCall;
+
+import org.eclipse.xtext.parser.packrat.consumers.IElementConsumer;
+import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumerConfiguration;
+import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
+import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
+
+import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess.ModelElements;
+
+public final class UnassignedRuleCallTestLanguageModelConsumer extends NonTerminalConsumer {
+
+	private ModelElements rule;	
+
+	private ITerminalConsumer intConsumer;
+
+	private INonTerminalConsumer modelFeaturesConsumer;
+
+	private IElementConsumer group$1$Consumer;
+
+	private IElementConsumer keyword$2$Consumer;
+
+	private IElementConsumer ruleCall$3$Consumer;
+
+	private IElementConsumer assignment$4$Consumer;
+
+	private IElementConsumer ruleCall$5$Consumer;
+
+	private ICharacterClass keyword$2$Delimiter;
+
+	private ISequenceMatcher ruleCall$3$Delimiter;
+
+	protected class Group$1$Consumer extends GroupConsumer {
+		
+		protected Group$1$Consumer(final Group group) {
+			super(group);
+		}
+		
+		@Override
+		protected void doGetConsumers(ConsumerAcceptor acceptor) {
+			acceptor.accept(keyword$2$Consumer);
+			acceptor.accept(ruleCall$3$Consumer);
+			acceptor.accept(assignment$4$Consumer);
+		}
+	}
+
+	protected class Keyword$2$Consumer extends ElementConsumer<Keyword> {
+		
+		protected Keyword$2$Consumer(final Keyword keyword) {
+			super(keyword);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeKeyword(getElement(), null, false, false, getKeyword$2$Delimiter(), optional);
+		}
+	}
+
+	protected class RuleCall$3$Consumer extends MandatoryLoopElementConsumer<RuleCall> {
+		
+		protected RuleCall$3$Consumer(final RuleCall ruleCall) {
+			super(ruleCall);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeTerminal(intConsumer, null, false, false, getElement(), getRuleCall$3$Delimiter(), optional);
+		}
+	}
+
+	protected class Assignment$4$Consumer extends AssignmentConsumer {
+		
+		protected Assignment$4$Consumer(final Assignment assignment) {
+			super(assignment);
+		}
+		
+		@Override
+		protected IElementConsumer getConsumer() {
+			return ruleCall$5$Consumer;
+		}
+	}
+
+	protected class RuleCall$5$Consumer extends ElementConsumer<RuleCall> {
+		
+		protected RuleCall$5$Consumer(final RuleCall ruleCall) {
+			super(ruleCall);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeNonTerminal(modelFeaturesConsumer, "modelFeatures", false, false, false, getElement(), optional);
+		}
+	}
+
+	public UnassignedRuleCallTestLanguageModelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) {
+		super(configuration, hiddenTokens);
+		keyword$2$Delimiter = ICharacterClass.Factory.nullClass();
+		ruleCall$3$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+	}
+	
+	@Override
+	protected int doConsume() throws Exception {
+		return group$1$Consumer.consume();
+	}
+
+	public ModelElements getRule() {
+		return rule;
+	}
+	
+	public void setRule(ModelElements rule) {
+		this.rule = rule;
+		
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getModelKeyword_0());
+		ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.getINTTerminalRuleCall_1());
+		assignment$4$Consumer = new Assignment$4$Consumer(rule.getModelFeaturesAssignment_2());
+		ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.getModelFeaturesModelFeaturesParserRuleCall_2_0());
+	}
+	
+	@Override
+	protected AbstractRule getGrammarElement() {
+		return getRule().getRule();
+	}
+
+	@Override
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getClassifier();
+	}
+	
+	public void setIntConsumer(ITerminalConsumer intConsumer) {
+		this.intConsumer = intConsumer;
+	}
+	
+	public void setModelFeaturesConsumer(INonTerminalConsumer modelFeaturesConsumer) {
+		this.modelFeaturesConsumer = modelFeaturesConsumer;
+	}
+	
+	public ICharacterClass getKeyword$2$Delimiter() {
+		return keyword$2$Delimiter;
+	}
+	
+	public void setKeyword$2$Delimiter(ICharacterClass characterClass) {
+		keyword$2$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+	}
+	
+	public ISequenceMatcher getRuleCall$3$Delimiter() {
+		return ruleCall$3$Delimiter;
+	}
+	
+	public void setRuleCall$3$Delimiter(ISequenceMatcher matcher) {
+		ruleCall$3$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+	}
+	
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/consumers/UnassignedRuleCallTestLanguageModelFeaturesConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/consumers/UnassignedRuleCallTestLanguageModelFeaturesConsumer.java
new file mode 100644
index 0000000..6cd93e0
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/parser/packrat/consumers/UnassignedRuleCallTestLanguageModelFeaturesConsumer.java
@@ -0,0 +1,194 @@
+/*
+* generated by Xtext
+*/
+package org.eclipse.xtext.xtext.ecoreInference.parser.packrat.consumers;
+
+import org.eclipse.emf.ecore.EClassifier;
+
+import org.eclipse.xtext.AbstractRule;
+import org.eclipse.xtext.Assignment;
+import org.eclipse.xtext.Group;
+import org.eclipse.xtext.Keyword;
+import org.eclipse.xtext.RuleCall;
+
+import org.eclipse.xtext.parser.packrat.consumers.IElementConsumer;
+import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumerConfiguration;
+import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
+import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
+import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
+import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
+
+import org.eclipse.xtext.xtext.ecoreInference.services.UnassignedRuleCallTestLanguageGrammarAccess.ModelFeaturesElements;
+
+public final class UnassignedRuleCallTestLanguageModelFeaturesConsumer extends NonTerminalConsumer {
+
+	private ModelFeaturesElements rule;	
+
+	private INonTerminalConsumer dataTypeRuleConsumer;
+
+	private ITerminalConsumer idConsumer;
+
+	private IElementConsumer group$1$Consumer;
+
+	private IElementConsumer keyword$2$Consumer;
+
+	private IElementConsumer assignment$3$Consumer;
+
+	private IElementConsumer ruleCall$4$Consumer;
+
+	private IElementConsumer ruleCall$5$Consumer;
+
+	private IElementConsumer keyword$6$Consumer;
+
+	private ICharacterClass keyword$2$Delimiter;
+
+	private ICharacterClass keyword$6$Delimiter;
+
+	private ISequenceMatcher ruleCall$4$Delimiter;
+
+	protected class Group$1$Consumer extends GroupConsumer {
+		
+		protected Group$1$Consumer(final Group group) {
+			super(group);
+		}
+		
+		@Override
+		protected void doGetConsumers(ConsumerAcceptor acceptor) {
+			acceptor.accept(keyword$2$Consumer);
+			acceptor.accept(assignment$3$Consumer);
+			acceptor.accept(ruleCall$5$Consumer);
+			acceptor.accept(keyword$6$Consumer);
+		}
+	}
+
+	protected class Keyword$2$Consumer extends ElementConsumer<Keyword> {
+		
+		protected Keyword$2$Consumer(final Keyword keyword) {
+			super(keyword);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeKeyword(getElement(), null, false, false, getKeyword$2$Delimiter(), optional);
+		}
+	}
+
+	protected class Assignment$3$Consumer extends AssignmentConsumer {
+		
+		protected Assignment$3$Consumer(final Assignment assignment) {
+			super(assignment);
+		}
+		
+		@Override
+		protected IElementConsumer getConsumer() {
+			return ruleCall$4$Consumer;
+		}
+	}
+
+	protected class RuleCall$4$Consumer extends ElementConsumer<RuleCall> {
+		
+		protected RuleCall$4$Consumer(final RuleCall ruleCall) {
+			super(ruleCall);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeTerminal(idConsumer, "name", false, false, getElement(), getRuleCall$4$Delimiter(), optional);
+		}
+	}
+
+	protected class RuleCall$5$Consumer extends ElementConsumer<RuleCall> {
+		
+		protected RuleCall$5$Consumer(final RuleCall ruleCall) {
+			super(ruleCall);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeNonTerminal(dataTypeRuleConsumer, null, false, true, false, getElement(), optional);
+		}
+	}
+
+	protected class Keyword$6$Consumer extends ElementConsumer<Keyword> {
+		
+		protected Keyword$6$Consumer(final Keyword keyword) {
+			super(keyword);
+		}
+		
+		@Override
+		protected int doConsume(boolean optional) throws Exception {
+			return consumeKeyword(getElement(), null, false, false, getKeyword$6$Delimiter(), optional);
+		}
+	}
+
+	public UnassignedRuleCallTestLanguageModelFeaturesConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) {
+		super(configuration, hiddenTokens);
+		keyword$2$Delimiter = ICharacterClass.Factory.nullClass();
+		keyword$6$Delimiter = ICharacterClass.Factory.nullClass();
+		ruleCall$4$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+	}
+	
+	@Override
+	protected int doConsume() throws Exception {
+		return group$1$Consumer.consume();
+	}
+
+	public ModelFeaturesElements getRule() {
+		return rule;
+	}
+	
+	public void setRule(ModelFeaturesElements rule) {
+		this.rule = rule;
+		
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getFeatureKeyword_0());
+		assignment$3$Consumer = new Assignment$3$Consumer(rule.getNameAssignment_1());
+		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.getNameIDTerminalRuleCall_1_0());
+		ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.getDataTypeRuleParserRuleCall_2());
+		keyword$6$Consumer = new Keyword$6$Consumer(rule.getSemicolonKeyword_3());
+	}
+	
+	@Override
+	protected AbstractRule getGrammarElement() {
+		return getRule().getRule();
+	}
+
+	@Override
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getClassifier();
+	}
+	
+	public void setDataTypeRuleConsumer(INonTerminalConsumer dataTypeRuleConsumer) {
+		this.dataTypeRuleConsumer = dataTypeRuleConsumer;
+	}
+	
+	public void setIdConsumer(ITerminalConsumer idConsumer) {
+		this.idConsumer = idConsumer;
+	}
+	
+	public ICharacterClass getKeyword$2$Delimiter() {
+		return keyword$2$Delimiter;
+	}
+	
+	public void setKeyword$2$Delimiter(ICharacterClass characterClass) {
+		keyword$2$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+	}
+	
+	public ICharacterClass getKeyword$6$Delimiter() {
+		return keyword$6$Delimiter;
+	}
+	
+	public void setKeyword$6$Delimiter(ICharacterClass characterClass) {
+		keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+	}
+	
+	public ISequenceMatcher getRuleCall$4$Delimiter() {
+		return ruleCall$4$Delimiter;
+	}
+	
+	public void setRuleCall$4$Delimiter(ISequenceMatcher matcher) {
+		ruleCall$4$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+	}
+	
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java
new file mode 100644
index 0000000..c2db327
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java
@@ -0,0 +1,205 @@
+/*
+* generated by Xtext
+*/
+
+package org.eclipse.xtext.xtext.ecoreInference.services;
+
+import com.google.inject.Singleton;
+import com.google.inject.Inject;
+
+import org.eclipse.xtext.*;
+
+import org.eclipse.xtext.service.GrammarProvider;
+
+import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
+
+@Singleton
+public class UnassignedRuleCallTestLanguageGrammarAccess implements IGrammarAccess {
+	
+	
+	public class ModelElements implements IParserRuleAccess {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Model");
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword cModelKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
+		private final Assignment cModelFeaturesAssignment_2 = (Assignment)cGroup.eContents().get(2);
+		private final RuleCall cModelFeaturesModelFeaturesParserRuleCall_2_0 = (RuleCall)cModelFeaturesAssignment_2.eContents().get(0);
+		
+		//Model:
+		//  "model" INT+ modelFeatures=ModelFeatures;
+		public ParserRule getRule() { return rule; }
+
+		//"model" INT+ modelFeatures=ModelFeatures
+		public Group getGroup() { return cGroup; }
+
+		//"model"
+		public Keyword getModelKeyword_0() { return cModelKeyword_0; }
+
+		//INT+
+		public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
+
+		//modelFeatures=ModelFeatures
+		public Assignment getModelFeaturesAssignment_2() { return cModelFeaturesAssignment_2; }
+
+		//ModelFeatures
+		public RuleCall getModelFeaturesModelFeaturesParserRuleCall_2_0() { return cModelFeaturesModelFeaturesParserRuleCall_2_0; }
+	}
+
+	public class ModelFeaturesElements implements IParserRuleAccess {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ModelFeatures");
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword cFeatureKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
+		private final RuleCall cDataTypeRuleParserRuleCall_2 = (RuleCall)cGroup.eContents().get(2);
+		private final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);
+		
+		//ModelFeatures:
+		//  "feature" name=ID DataTypeRule ";";
+		public ParserRule getRule() { return rule; }
+
+		//"feature" name=ID DataTypeRule ";"
+		public Group getGroup() { return cGroup; }
+
+		//"feature"
+		public Keyword getFeatureKeyword_0() { return cFeatureKeyword_0; }
+
+		//name=ID
+		public Assignment getNameAssignment_1() { return cNameAssignment_1; }
+
+		//ID
+		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
+
+		//DataTypeRule
+		public RuleCall getDataTypeRuleParserRuleCall_2() { return cDataTypeRuleParserRuleCall_2; }
+
+		//";"
+		public Keyword getSemicolonKeyword_3() { return cSemicolonKeyword_3; }
+	}
+
+	public class DataTypeRuleElements implements IParserRuleAccess {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DataTypeRule");
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final RuleCall cINTTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
+		private final Keyword cKeywordKeyword_1 = (Keyword)cGroup.eContents().get(1);
+		private final RuleCall cINTTerminalRuleCall_2 = (RuleCall)cGroup.eContents().get(2);
+		private final RuleCall cSTRINGTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);
+		
+		//DataTypeRule returns ecore::EString:
+		//  INT "keyword" INT STRING?;
+		public ParserRule getRule() { return rule; }
+
+		//INT "keyword" INT STRING?
+		public Group getGroup() { return cGroup; }
+
+		//INT
+		public RuleCall getINTTerminalRuleCall_0() { return cINTTerminalRuleCall_0; }
+
+		//"keyword"
+		public Keyword getKeywordKeyword_1() { return cKeywordKeyword_1; }
+
+		//INT
+		public RuleCall getINTTerminalRuleCall_2() { return cINTTerminalRuleCall_2; }
+
+		//STRING?
+		public RuleCall getSTRINGTerminalRuleCall_3() { return cSTRINGTerminalRuleCall_3; }
+	}
+	
+	
+	private ModelElements pModel;
+	private ModelFeaturesElements pModelFeatures;
+	private DataTypeRuleElements pDataTypeRule;
+	
+	private final GrammarProvider grammarProvider;
+
+	private TerminalsGrammarAccess gaTerminals;
+
+	@Inject
+	public UnassignedRuleCallTestLanguageGrammarAccess(GrammarProvider grammarProvider,
+		TerminalsGrammarAccess gaTerminals) {
+		this.grammarProvider = grammarProvider;
+		this.gaTerminals = gaTerminals;
+	}
+	
+	public Grammar getGrammar() {	
+		return grammarProvider.getGrammar(this);
+	}
+	
+
+	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+		return gaTerminals;
+	}
+
+	
+	//Model:
+	//  "model" INT+ modelFeatures=ModelFeatures;
+	public ModelElements getModelAccess() {
+		return (pModel != null) ? pModel : (pModel = new ModelElements());
+	}
+	
+	public ParserRule getModelRule() {
+		return getModelAccess().getRule();
+	}
+
+	//ModelFeatures:
+	//  "feature" name=ID DataTypeRule ";";
+	public ModelFeaturesElements getModelFeaturesAccess() {
+		return (pModelFeatures != null) ? pModelFeatures : (pModelFeatures = new ModelFeaturesElements());
+	}
+	
+	public ParserRule getModelFeaturesRule() {
+		return getModelFeaturesAccess().getRule();
+	}
+
+	//DataTypeRule returns ecore::EString:
+	//  INT "keyword" INT STRING?;
+	public DataTypeRuleElements getDataTypeRuleAccess() {
+		return (pDataTypeRule != null) ? pDataTypeRule : (pDataTypeRule = new DataTypeRuleElements());
+	}
+	
+	public ParserRule getDataTypeRuleRule() {
+		return getDataTypeRuleAccess().getRule();
+	}
+
+	//terminal ID:
+	//  "^" ? ( "a" .. "z" | "A" .. "Z" | "_" ) ( "a" .. "z" | "A" .. "Z" | "_" | "0" .. "9" ) *;
+	public TerminalRule getIDRule() {
+		return gaTerminals.getIDRule();
+	} 
+
+	//terminal INT returns ecore::EInt:
+	//  "0" .. "9" +;
+	public TerminalRule getINTRule() {
+		return gaTerminals.getINTRule();
+	} 
+
+	//terminal STRING:
+	//  "\"" ( "\\" ( "b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\" ) | ! ( "\\" | "\"" ) ) * "\"" | "\'" ( "\\" ( "b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\" ) | ! ( "\\" | "\'" ) ) * "\'";
+	public TerminalRule getSTRINGRule() {
+		return gaTerminals.getSTRINGRule();
+	} 
+
+	//terminal ML_COMMENT:
+	//  "/*" -> "*/";
+	public TerminalRule getML_COMMENTRule() {
+		return gaTerminals.getML_COMMENTRule();
+	} 
+
+	//terminal SL_COMMENT:
+	//  "//" ! ( "\n" | "\r" ) * ( "\r" ? "\n" ) ?;
+	public TerminalRule getSL_COMMENTRule() {
+		return gaTerminals.getSL_COMMENTRule();
+	} 
+
+	//terminal WS:
+	//  ( " " | "\t" | "\r" | "\n" ) +;
+	public TerminalRule getWSRule() {
+		return gaTerminals.getWSRule();
+	} 
+
+	//terminal ANY_OTHER:
+	//  .;
+	public TerminalRule getANY_OTHERRule() {
+		return gaTerminals.getANY_OTHERRule();
+	} 
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java
new file mode 100644
index 0000000..2dc9157
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ */
+package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Model</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model#getModelFeatures <em>Model Features</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage#getModel()
+ * @model
+ * @generated
+ */
+public interface Model extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Model Features</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Model Features</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Model Features</em>' containment reference.
+   * @see #setModelFeatures(ModelFeatures)
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage#getModel_ModelFeatures()
+   * @model containment="true"
+   * @generated
+   */
+  ModelFeatures getModelFeatures();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model#getModelFeatures <em>Model Features</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Model Features</em>' containment reference.
+   * @see #getModelFeatures()
+   * @generated
+   */
+  void setModelFeatures(ModelFeatures value);
+
+} // Model
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java
new file mode 100644
index 0000000..fb22158
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ */
+package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Model Features</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage#getModelFeatures()
+ * @model
+ * @generated
+ */
+public interface ModelFeatures extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage#getModelFeatures_Name()
+   * @model
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+
+} // ModelFeatures
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguageFactory.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguageFactory.java
new file mode 100644
index 0000000..ea04bdf
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguageFactory.java
@@ -0,0 +1,55 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ */
+package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage
+ * @generated
+ */
+public interface UnassignedRuleCallTestLanguageFactory extends EFactory
+{
+  /**
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  UnassignedRuleCallTestLanguageFactory eINSTANCE = org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.UnassignedRuleCallTestLanguageFactoryImpl.init();
+
+  /**
+   * Returns a new object of class '<em>Model</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Model</em>'.
+   * @generated
+   */
+  Model createModel();
+
+  /**
+   * Returns a new object of class '<em>Model Features</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Model Features</em>'.
+   * @generated
+   */
+  ModelFeatures createModelFeatures();
+
+  /**
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the package supported by this factory.
+   * @generated
+   */
+  UnassignedRuleCallTestLanguagePackage getUnassignedRuleCallTestLanguagePackage();
+
+} //UnassignedRuleCallTestLanguageFactory
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguagePackage.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguagePackage.java
new file mode 100644
index 0000000..0e83ca6
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/UnassignedRuleCallTestLanguagePackage.java
@@ -0,0 +1,222 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ */
+package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguageFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface UnassignedRuleCallTestLanguagePackage extends EPackage
+{
+  /**
+   * The package name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNAME = "unassignedRuleCallTestLanguage";
+
+  /**
+   * The package namespace URI.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNS_URI = "http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest";
+
+  /**
+   * The package namespace name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNS_PREFIX = "unassignedRuleCallTestLanguage";
+
+  /**
+   * The singleton instance of the package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  UnassignedRuleCallTestLanguagePackage eINSTANCE = org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.UnassignedRuleCallTestLanguagePackageImpl.init();
+
+  /**
+   * The meta object id for the '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.ModelImpl <em>Model</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.ModelImpl
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.UnassignedRuleCallTestLanguagePackageImpl#getModel()
+   * @generated
+   */
+  int MODEL = 0;
+
+  /**
+   * The feature id for the '<em><b>Model Features</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MODEL__MODEL_FEATURES = 0;
+
+  /**
+   * The number of structural features of the '<em>Model</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MODEL_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.ModelFeaturesImpl <em>Model Features</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.ModelFeaturesImpl
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.UnassignedRuleCallTestLanguagePackageImpl#getModelFeatures()
+   * @generated
+   */
+  int MODEL_FEATURES = 1;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MODEL_FEATURES__NAME = 0;
+
+  /**
+   * The number of structural features of the '<em>Model Features</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MODEL_FEATURES_FEATURE_COUNT = 1;
+
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model <em>Model</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Model</em>'.
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model
+   * @generated
+   */
+  EClass getModel();
+
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model#getModelFeatures <em>Model Features</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Model Features</em>'.
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model#getModelFeatures()
+   * @see #getModel()
+   * @generated
+   */
+  EReference getModel_ModelFeatures();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures <em>Model Features</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Model Features</em>'.
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures
+   * @generated
+   */
+  EClass getModelFeatures();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures#getName <em>Name</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures#getName()
+   * @see #getModelFeatures()
+   * @generated
+   */
+  EAttribute getModelFeatures_Name();
+
+  /**
+   * Returns the factory that creates the instances of the model.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the factory that creates the instances of the model.
+   * @generated
+   */
+  UnassignedRuleCallTestLanguageFactory getUnassignedRuleCallTestLanguageFactory();
+
+  /**
+   * <!-- begin-user-doc -->
+   * Defines literals for the meta objects that represent
+   * <ul>
+   *   <li>each class,</li>
+   *   <li>each feature of each class,</li>
+   *   <li>each enum,</li>
+   *   <li>and each data type</li>
+   * </ul>
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  interface Literals
+  {
+    /**
+     * The meta object literal for the '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.ModelImpl <em>Model</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.ModelImpl
+     * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.UnassignedRuleCallTestLanguagePackageImpl#getModel()
+     * @generated
+     */
+    EClass MODEL = eINSTANCE.getModel();
+
+    /**
+     * The meta object literal for the '<em><b>Model Features</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference MODEL__MODEL_FEATURES = eINSTANCE.getModel_ModelFeatures();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.ModelFeaturesImpl <em>Model Features</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.ModelFeaturesImpl
+     * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.UnassignedRuleCallTestLanguagePackageImpl#getModelFeatures()
+     * @generated
+     */
+    EClass MODEL_FEATURES = eINSTANCE.getModelFeatures();
+
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute MODEL_FEATURES__NAME = eINSTANCE.getModelFeatures_Name();
+
+  }
+
+} //UnassignedRuleCallTestLanguagePackage
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java
new file mode 100644
index 0000000..ea4d3c3
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ */
+package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures;
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Model Features</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.ModelFeaturesImpl#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ModelFeaturesImpl extends MinimalEObjectImpl.Container implements ModelFeatures
+{
+  /**
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected static final String NAME_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected String name = NAME_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ModelFeaturesImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return UnassignedRuleCallTestLanguagePackage.Literals.MODEL_FEATURES;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setName(String newName)
+  {
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, UnassignedRuleCallTestLanguagePackage.MODEL_FEATURES__NAME, oldName, name));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL_FEATURES__NAME:
+        return getName();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL_FEATURES__NAME:
+        setName((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL_FEATURES__NAME:
+        setName(NAME_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL_FEATURES__NAME:
+        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (name: ");
+    result.append(name);
+    result.append(')');
+    return result.toString();
+  }
+
+} //ModelFeaturesImpl
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java
new file mode 100644
index 0000000..1d616f7
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java
@@ -0,0 +1,197 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ */
+package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model;
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures;
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Model</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl.ModelImpl#getModelFeatures <em>Model Features</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ModelImpl extends MinimalEObjectImpl.Container implements Model
+{
+  /**
+   * The cached value of the '{@link #getModelFeatures() <em>Model Features</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getModelFeatures()
+   * @generated
+   * @ordered
+   */
+  protected ModelFeatures modelFeatures;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ModelImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return UnassignedRuleCallTestLanguagePackage.Literals.MODEL;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public ModelFeatures getModelFeatures()
+  {
+    return modelFeatures;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetModelFeatures(ModelFeatures newModelFeatures, NotificationChain msgs)
+  {
+    ModelFeatures oldModelFeatures = modelFeatures;
+    modelFeatures = newModelFeatures;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UnassignedRuleCallTestLanguagePackage.MODEL__MODEL_FEATURES, oldModelFeatures, newModelFeatures);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setModelFeatures(ModelFeatures newModelFeatures)
+  {
+    if (newModelFeatures != modelFeatures)
+    {
+      NotificationChain msgs = null;
+      if (modelFeatures != null)
+        msgs = ((InternalEObject)modelFeatures).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UnassignedRuleCallTestLanguagePackage.MODEL__MODEL_FEATURES, null, msgs);
+      if (newModelFeatures != null)
+        msgs = ((InternalEObject)newModelFeatures).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UnassignedRuleCallTestLanguagePackage.MODEL__MODEL_FEATURES, null, msgs);
+      msgs = basicSetModelFeatures(newModelFeatures, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, UnassignedRuleCallTestLanguagePackage.MODEL__MODEL_FEATURES, newModelFeatures, newModelFeatures));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL__MODEL_FEATURES:
+        return basicSetModelFeatures(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL__MODEL_FEATURES:
+        return getModelFeatures();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL__MODEL_FEATURES:
+        setModelFeatures((ModelFeatures)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL__MODEL_FEATURES:
+        setModelFeatures((ModelFeatures)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL__MODEL_FEATURES:
+        return modelFeatures != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+} //ModelImpl
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java
new file mode 100644
index 0000000..e1b0159
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java
@@ -0,0 +1,121 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ */
+package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UnassignedRuleCallTestLanguageFactoryImpl extends EFactoryImpl implements UnassignedRuleCallTestLanguageFactory
+{
+  /**
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static UnassignedRuleCallTestLanguageFactory init()
+  {
+    try
+    {
+      UnassignedRuleCallTestLanguageFactory theUnassignedRuleCallTestLanguageFactory = (UnassignedRuleCallTestLanguageFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest"); 
+      if (theUnassignedRuleCallTestLanguageFactory != null)
+      {
+        return theUnassignedRuleCallTestLanguageFactory;
+      }
+    }
+    catch (Exception exception)
+    {
+      EcorePlugin.INSTANCE.log(exception);
+    }
+    return new UnassignedRuleCallTestLanguageFactoryImpl();
+  }
+
+  /**
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public UnassignedRuleCallTestLanguageFactoryImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EObject create(EClass eClass)
+  {
+    switch (eClass.getClassifierID())
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL: return createModel();
+      case UnassignedRuleCallTestLanguagePackage.MODEL_FEATURES: return createModelFeatures();
+      default:
+        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Model createModel()
+  {
+    ModelImpl model = new ModelImpl();
+    return model;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public ModelFeatures createModelFeatures()
+  {
+    ModelFeaturesImpl modelFeatures = new ModelFeaturesImpl();
+    return modelFeatures;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public UnassignedRuleCallTestLanguagePackage getUnassignedRuleCallTestLanguagePackage()
+  {
+    return (UnassignedRuleCallTestLanguagePackage)getEPackage();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @deprecated
+   * @generated
+   */
+  @Deprecated
+  public static UnassignedRuleCallTestLanguagePackage getPackage()
+  {
+    return UnassignedRuleCallTestLanguagePackage.eINSTANCE;
+  }
+
+} //UnassignedRuleCallTestLanguageFactoryImpl
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java
new file mode 100644
index 0000000..409b19c
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java
@@ -0,0 +1,230 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ */
+package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model;
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures;
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguageFactory;
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl implements UnassignedRuleCallTestLanguagePackage
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass modelEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass modelFeaturesEClass = null;
+
+  /**
+   * Creates an instance of the model <b>Package</b>, registered with
+   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+   * package URI value.
+   * <p>Note: the correct way to create the package is via the static
+   * factory method {@link #init init()}, which also performs
+   * initialization of the package, or returns the registered package,
+   * if one already exists.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.ecore.EPackage.Registry
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage#eNS_URI
+   * @see #init()
+   * @generated
+   */
+  private UnassignedRuleCallTestLanguagePackageImpl()
+  {
+    super(eNS_URI, UnassignedRuleCallTestLanguageFactory.eINSTANCE);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static boolean isInited = false;
+
+  /**
+   * Creates, registers, and initializes the <b>Package</b> for this
+   * model, and for any others upon which it depends.  Simple
+   * dependencies are satisfied by calling this method on all
+   * dependent packages before doing anything else.  This method drives
+   * initialization for interdependent packages directly, in parallel
+   * with this package, itself.
+   * <p>Of this package and its interdependencies, all packages which
+   * have not yet been registered by their URI values are first created
+   * and registered.  The packages are then initialized in two steps:
+   * meta-model objects for all of the packages are created before any
+   * are initialized, since one package's meta-model objects may refer to
+   * those of another.
+   * <p>Invocation of this method will not affect any packages that have
+   * already been initialized.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #eNS_URI
+   * @see #createPackageContents()
+   * @see #initializePackageContents()
+   * @generated
+   */
+  public static UnassignedRuleCallTestLanguagePackage init()
+  {
+    if (isInited) return (UnassignedRuleCallTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(UnassignedRuleCallTestLanguagePackage.eNS_URI);
+
+    // Obtain or create and register package
+    UnassignedRuleCallTestLanguagePackageImpl theUnassignedRuleCallTestLanguagePackage = (UnassignedRuleCallTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UnassignedRuleCallTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UnassignedRuleCallTestLanguagePackageImpl());
+
+    isInited = true;
+
+    // Create package meta-data objects
+    theUnassignedRuleCallTestLanguagePackage.createPackageContents();
+
+    // Initialize created meta-data
+    theUnassignedRuleCallTestLanguagePackage.initializePackageContents();
+
+    // Mark meta-data to indicate it can't be changed
+    theUnassignedRuleCallTestLanguagePackage.freeze();
+
+    return theUnassignedRuleCallTestLanguagePackage;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getModel()
+  {
+    return modelEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getModel_ModelFeatures()
+  {
+    return (EReference)modelEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getModelFeatures()
+  {
+    return modelFeaturesEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getModelFeatures_Name()
+  {
+    return (EAttribute)modelFeaturesEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public UnassignedRuleCallTestLanguageFactory getUnassignedRuleCallTestLanguageFactory()
+  {
+    return (UnassignedRuleCallTestLanguageFactory)getEFactoryInstance();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private boolean isCreated = false;
+
+  /**
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void createPackageContents()
+  {
+    if (isCreated) return;
+    isCreated = true;
+
+    // Create classes and their features
+    modelEClass = createEClass(MODEL);
+    createEReference(modelEClass, MODEL__MODEL_FEATURES);
+
+    modelFeaturesEClass = createEClass(MODEL_FEATURES);
+    createEAttribute(modelFeaturesEClass, MODEL_FEATURES__NAME);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private boolean isInitialized = false;
+
+  /**
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void initializePackageContents()
+  {
+    if (isInitialized) return;
+    isInitialized = true;
+
+    // Initialize package
+    setName(eNAME);
+    setNsPrefix(eNS_PREFIX);
+    setNsURI(eNS_URI);
+
+    // Create type parameters
+
+    // Set bounds for type parameters
+
+    // Add supertypes to classes
+
+    // Initialize classes and features; add operations and parameters
+    initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getModel_ModelFeatures(), this.getModelFeatures(), null, "modelFeatures", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(modelFeaturesEClass, ModelFeatures.class, "ModelFeatures", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getModelFeatures_Name(), ecorePackage.getEString(), "name", null, 0, 1, ModelFeatures.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    // Create resource
+    createResource(eNS_URI);
+  }
+
+} //UnassignedRuleCallTestLanguagePackageImpl
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageAdapterFactory.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageAdapterFactory.java
new file mode 100644
index 0000000..9fa88e9
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageAdapterFactory.java
@@ -0,0 +1,155 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ */
+package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage
+ * @generated
+ */
+public class UnassignedRuleCallTestLanguageAdapterFactory extends AdapterFactoryImpl
+{
+  /**
+   * The cached model package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected static UnassignedRuleCallTestLanguagePackage modelPackage;
+
+  /**
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public UnassignedRuleCallTestLanguageAdapterFactory()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = UnassignedRuleCallTestLanguagePackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * Returns whether this factory is applicable for the type of the object.
+   * <!-- begin-user-doc -->
+   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+   * <!-- end-user-doc -->
+   * @return whether this factory is applicable for the type of the object.
+   * @generated
+   */
+  @Override
+  public boolean isFactoryForType(Object object)
+  {
+    if (object == modelPackage)
+    {
+      return true;
+    }
+    if (object instanceof EObject)
+    {
+      return ((EObject)object).eClass().getEPackage() == modelPackage;
+    }
+    return false;
+  }
+
+  /**
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected UnassignedRuleCallTestLanguageSwitch<Adapter> modelSwitch =
+    new UnassignedRuleCallTestLanguageSwitch<Adapter>()
+    {
+      @Override
+      public Adapter caseModel(Model object)
+      {
+        return createModelAdapter();
+      }
+      @Override
+      public Adapter caseModelFeatures(ModelFeatures object)
+      {
+        return createModelFeaturesAdapter();
+      }
+      @Override
+      public Adapter defaultCase(EObject object)
+      {
+        return createEObjectAdapter();
+      }
+    };
+
+  /**
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param target the object to adapt.
+   * @return the adapter for the <code>target</code>.
+   * @generated
+   */
+  @Override
+  public Adapter createAdapter(Notifier target)
+  {
+    return modelSwitch.doSwitch((EObject)target);
+  }
+
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model <em>Model</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model
+   * @generated
+   */
+  public Adapter createModelAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures <em>Model Features</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.ModelFeatures
+   * @generated
+   */
+  public Adapter createModelFeaturesAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @generated
+   */
+  public Adapter createEObjectAdapter()
+  {
+    return null;
+  }
+
+} //UnassignedRuleCallTestLanguageAdapterFactory
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageSwitch.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageSwitch.java
new file mode 100644
index 0000000..b28318d
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/util/UnassignedRuleCallTestLanguageSwitch.java
@@ -0,0 +1,164 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ */
+package org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.util;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.UnassignedRuleCallTestLanguagePackage
+ * @generated
+ */
+public class UnassignedRuleCallTestLanguageSwitch<T>
+{
+  /**
+   * The cached model package
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected static UnassignedRuleCallTestLanguagePackage modelPackage;
+
+  /**
+   * Creates an instance of the switch.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public UnassignedRuleCallTestLanguageSwitch()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = UnassignedRuleCallTestLanguagePackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  public T doSwitch(EObject theEObject)
+  {
+    return doSwitch(theEObject.eClass(), theEObject);
+  }
+
+  /**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  protected T doSwitch(EClass theEClass, EObject theEObject)
+  {
+    if (theEClass.eContainer() == modelPackage)
+    {
+      return doSwitch(theEClass.getClassifierID(), theEObject);
+    }
+    else
+    {
+      List<EClass> eSuperTypes = theEClass.getESuperTypes();
+      return
+        eSuperTypes.isEmpty() ?
+          defaultCase(theEObject) :
+          doSwitch(eSuperTypes.get(0), theEObject);
+    }
+  }
+
+  /**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  protected T doSwitch(int classifierID, EObject theEObject)
+  {
+    switch (classifierID)
+    {
+      case UnassignedRuleCallTestLanguagePackage.MODEL:
+      {
+        Model model = (Model)theEObject;
+        T result = caseModel(model);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case UnassignedRuleCallTestLanguagePackage.MODEL_FEATURES:
+      {
+        ModelFeatures modelFeatures = (ModelFeatures)theEObject;
+        T result = caseModelFeatures(modelFeatures);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      default: return defaultCase(theEObject);
+    }
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Model</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Model</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseModel(Model object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Model Features</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Model Features</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseModelFeatures(ModelFeatures object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch, but this is the last case anyway.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+   * @generated
+   */
+  public T defaultCase(EObject object)
+  {
+    return null;
+  }
+
+} //UnassignedRuleCallTestLanguageSwitch
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java
index 6e3f9b9..950782b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java
+++ b/tests/org.eclipse.xtext.generator.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.generator.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe
index 8103ae5..3f0721c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe
@@ -130,6 +130,9 @@
 		<language uri="classpath:/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.xtext">
 			<fragment file="${standardFragments}"/>
 		</language>
+		<language uri="classpath:/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xtext">
+			<fragment file="${standardFragments}"/>
+		</language>
 	</component>
 	
 	
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/PluginTestSuite.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/PluginTestSuite.java
index 4366480..5bb02b1 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/PluginTestSuite.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/generator/PluginTestSuite.java
@@ -88,6 +88,7 @@ public class PluginTestSuite {
 		suite.addTestSuite(org.eclipse.xtext.xtext.ecoreInference.ResourceTests.class);
 		suite.addTestSuite(org.eclipse.xtext.xtext.ecoreInference.TypeHierarchyHelperTests.class);
 		suite.addTestSuite(org.eclipse.xtext.xtext.ecoreInference.Xtext2EcoreTransformerTest.class);
+		suite.addTestSuite(org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTest.class);
 		suite.addTestSuite(org.eclipse.xtext.valueconverter.Bug250313.Antlr.class);
 		suite.addTestSuite(org.eclipse.xtext.valueconverter.Bug250313.Packrat.class);
 		suite.addTestSuite(org.eclipse.xtext.xtext.ExceptionTest.class);
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java
new file mode 100644
index 0000000..7200f8f
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTest.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.xtext.xtext.ecoreInference;
+
+import org.eclipse.xtext.junit.AbstractXtextTests;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.Model;
+
+/**
+ * @author Sebastian Zarnekow - Initial contribution and API
+ */
+public class UnassignedRuleCallTest extends AbstractXtextTests {
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		with(UnassignedRuleCallTestLanguageStandaloneSetup.class);
+	}
+	
+	public void testParseModel_01() throws Exception {
+		String modelAsText = "model 7 feature Zonk 1 keyword 1;";
+		Model model = (Model) getModel(modelAsText);
+		assertNotNull(model);
+		assertNotNull(model.getModelFeatures());
+		assertEquals("Zonk", model.getModelFeatures().getName());
+	}
+	
+	public void testParseModel_02() throws Exception {
+		String modelAsText = "model 7 13 feature Foo 1 keyword 1 'bar';";
+		Model model = (Model) getModel(modelAsText);
+		assertNotNull(model);
+		assertNotNull(model.getModelFeatures());
+		assertEquals("Foo", model.getModelFeatures().getName());
+	}
+	
+	public void testParseModel_03() throws Exception {
+		String modelAsText = "model 7 feature Zonk 1 keyword 1;";
+		XtextResource resource = getResourceFromString(modelAsText);
+		assertTrue(resource.getErrors().isEmpty());
+	}
+	
+	public void testParseModel_04() throws Exception {
+		String modelAsText = "model 7 13 137 feature Foo 1 keyword 1 'bar';";
+		XtextResource resource = getResourceFromString(modelAsText);
+		assertTrue(resource.getErrors().isEmpty());
+	}
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xtext b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xtext
new file mode 100644
index 0000000..42ef7d0
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.xtext
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2009 itemis AG (http://www.itemis.eu) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+grammar org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage with org.eclipse.xtext.common.Terminals
+
+generate unassignedRuleCallTestLanguage "http://www.eclipse.org/2009/tmf/xtext/UnassignedRuleCallTest"
+ 
+Model:
+  'model' INT+ modelFeatures=ModelFeatures
+;
+
+ModelFeatures:
+  'feature' name = ID DataTypeRule ';'
+;
+
+DataTypeRule:
+  INT 'keyword' INT STRING?
+;
\ No newline at end of file
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageChecks.chk b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageChecks.chk
new file mode 100644
index 0000000..6aff49f
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageChecks.chk
@@ -0,0 +1,6 @@
+/*
+ * this check file is used to specify constraints for the derived metamodels
+ * example:
+ * context Entity WARNING "Entity names should start with a capital" :
+ *    name.toFirstUpper() == name;
+ */
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageRuntimeModule.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageRuntimeModule.java
new file mode 100644
index 0000000..d59a193
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguageRuntimeModule.java
@@ -0,0 +1,11 @@
+/*
+ * generated by Xtext
+ */
+package org.eclipse.xtext.xtext.ecoreInference;
+
+/**
+ * Use this class to register components to be used within the IDE.
+ */
+public class UnassignedRuleCallTestLanguageRuntimeModule extends org.eclipse.xtext.xtext.ecoreInference.AbstractUnassignedRuleCallTestLanguageRuntimeModule {
+
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.java
index 1a09562..7f7ce0d 100755
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/xtext/ecoreInference/Xtext2EcoreTransformerTest.java
@@ -943,4 +943,67 @@ public class Xtext2EcoreTransformerTest extends AbstractGeneratorTest {
 			fail(d.getMessage());
 		}
 	}
+	
+	/**
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=272566
+	 */
+	public void testBug_272566_1() throws Exception {
+		with(new XtextStandaloneSetup());
+		String grammar = "grammar test with org.eclipse.xtext.common.Terminals\n" +
+				"generate test 'http://test'\n" +
+				"Model:\n" +
+				"   test=Test\n" +
+				";\n" +
+				"\n" +
+				"Test:\n" +
+				"   \"keyword\" WS name=ID\n" +
+				";";
+		XtextResource resource = getResourceFromString(grammar);
+		assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty());
+	}
+	
+	/**
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=272566
+	 */
+	public void testBug_272566_2() throws Exception {
+		with(new XtextStandaloneSetup());
+		String grammar = "grammar test with org.eclipse.xtext.common.Terminals\n" +
+				"generate test 'http://test'\n" +
+				"Model:\n" +
+				"   test=Test\n" +
+				";\n" +
+				"\n" +
+				"Test:\n" +
+				"   \"keyword\" FooBar name=ID\n" +
+				";\n" +
+				"FooBar:\n" +
+				"	'zonk' WS WS INT WS" +
+				";";
+		XtextResource resource = getResourceFromString(grammar);
+		assertTrue(resource.getErrors().toString(), resource.getErrors().isEmpty());
+	}
+	
+	/**
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=272566
+	 */
+	public void testBug_272566_3() throws Exception {
+		with(new XtextStandaloneSetup());
+		String grammar = "grammar test with org.eclipse.xtext.common.Terminals\n" +
+				"generate test 'http://test'\n" +
+				"Model:\n" +
+				"   test=Test\n" +
+				";\n" +
+				"\n" +
+				"Test:\n" +
+				"   \"keyword\" MyEnum name=ID\n" +
+				";\n" +
+				"enum MyEnum:\n" +
+				"	A | B" +
+				";";
+		XtextResource resource = getResourceFromString(grammar);
+		assertFalse(resource.getErrors().toString(), resource.getErrors().isEmpty());
+		for(Diagnostic d: resource.getErrors()) {
+			assertFalse(d instanceof ExceptionDiagnostic);
+		}
+	}
 }