WIP: make dependency to org.antlr.gen optional and extract all antlr.gen dependencies into a separate plugin

55 files changed, 664 insertions, 665 deletions

diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposalProvider.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposalProvider.java
index d5637c2..109d709 100644
--- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposalProvider.java
+++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposalProvider.java
@@ -25,153 +25,153 @@ public class GenReferenceGrammarProposalProvider extends AbstractJavaProposalPro
 	
 	
 			
-	public List<? extends ICompletionProposal> completeSpielplatzGroesse(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Groesse(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzGroesse feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Groesse feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.singletonList(createCompletionProposal(assignment, "1", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzBeschreibung(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Beschreibung(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzBeschreibung feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Beschreibung feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "\"SpielplatzBeschreibung\"", contentAssistContext));		
+		return Collections.singletonList(createCompletionProposal(assignment, "\"Spielplatz_Beschreibung\"", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzKinder(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Kinder(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzKinder feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Kinder feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzErzieher(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Erzieher(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzErzieher feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Erzieher feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzSpielzeuge(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Spielzeuge(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzSpielzeuge feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Spielzeuge feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzFamilie(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Familie(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzFamilie feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Familie feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzTypes(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Types(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzTypes feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Types feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeKindName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeKind_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeKindName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeKind_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "KindName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Kind_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeKindAge(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeKind_Age(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeKindAge feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeKind_Age feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.singletonList(createCompletionProposal(assignment, "1", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeErwachsenerName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeErwachsener_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeErwachsenerName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeErwachsener_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "ErwachsenerName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Erwachsener_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeErwachsenerAge(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeErwachsener_Age(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeErwachsenerAge feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeErwachsener_Age feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.singletonList(createCompletionProposal(assignment, "1", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielzeugName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielzeug_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielzeugName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielzeug_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "SpielzeugName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Spielzeug_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielzeugFarbe(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielzeug_Farbe(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielzeugFarbe feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielzeug_Farbe feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeFamilieName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFamilie_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFamilieName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFamilie_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeFamilieMutter(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFamilie_Mutter(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFamilieMutter feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFamilie_Mutter feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeFamilieVater(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFamilie_Vater(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFamilieVater feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFamilie_Vater feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeFamilieKinder(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFamilie_Kinder(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFamilieKinder feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFamilie_Kinder feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
@@ -179,22 +179,22 @@ public class GenReferenceGrammarProposalProvider extends AbstractJavaProposalPro
 	}
 			
 			
-	public List<? extends ICompletionProposal> completeFarbeWert(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFarbe_Wert(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFarbeWert feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFarbe_Wert feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeCustomTypeParserRuleName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeCustomTypeParserRule_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeCustomTypeParserRuleName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeCustomTypeParserRule_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "CustomTypeParserRuleName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "CustomTypeParserRule_Name", contentAssistContext));
 	}
     
 			
@@ -212,9 +212,9 @@ public class GenReferenceGrammarProposalProvider extends AbstractJavaProposalPro
 			
 			
 			
-	public List<? extends ICompletionProposal> completeReferenceModelCustomType(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeReferenceModel_CustomType(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeReferenceModelCustomType '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
+			logger.debug("completeReferenceModel_CustomType '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
 					+ "' for model '" + contentAssistContext.getModel() + "' and prefix '" + contentAssistContext.getMatchString() + "'");
 		}
 		return Collections.emptyList();
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeConfig.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeConfig.java
index 2c2a9c0..a5c5de1 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeConfig.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractReferenceGrammarRuntimeConfig extends AbstractServ
 		return org.eclipse.xtext.reference.parser.packrat.ReferenceGrammarPackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.reference.parser.antlr.ReferenceGrammarParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.reference.parser.antlr.ReferenceGrammarAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.reference.services.ReferenceGrammarResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractReferenceGrammarRuntimeConfig extends AbstractServ
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.reference.parser.antlr.ReferenceGrammarParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.reference.parser.antlr.ReferenceGrammarAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.reference.parser.antlr.internal.InternalReferenceGrammarLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractReferenceGrammarRuntimeConfig extends AbstractServ
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
index e234417..c70d0ae 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
@@ -16,12 +16,12 @@
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Person">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/>
   <eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/>
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
index 72c221a..57709a4 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
@@ -24,25 +24,25 @@ T24 : 'GELB' ;
 T25 : 'GRÜN' ;
 T26 : 'type' ;
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 722
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 722
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 724
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 724
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 726
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 726
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 728
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 728
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 730
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 730
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 732
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 732
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 734
+// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 734
 RULE_ANY_OTHER : .;
 
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposalProvider.java b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposalProvider.java
index e0ceb9b..1323ef7 100644
--- a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposalProvider.java
+++ b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposalProvider.java
@@ -25,144 +25,144 @@ public class GenDomainmodelProposalProvider extends AbstractJavaProposalProvider
 	
 	
 			
-	public List<? extends ICompletionProposal> completeFileImports(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFile_Imports(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFileImports feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFile_Imports feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeFileNamedElements(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFile_NamedElements(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFileNamedElements feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFile_NamedElements feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeImportImportURI(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeImport_ImportURI(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeImportImportURI feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeImport_ImportURI feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "\"ImportImportURI\"", contentAssistContext));		
+		return Collections.singletonList(createCompletionProposal(assignment, "\"Import_ImportURI\"", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completePackageName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completePackage_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completePackageName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completePackage_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completePackageNamedElements(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completePackage_NamedElements(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completePackageNamedElements feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completePackage_NamedElements feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeDataTypeName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeDataType_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeDataTypeName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeDataType_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "DataTypeName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "DataType_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeEntityName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeEntity_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeEntityName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeEntity_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "EntityName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Entity_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeEntitySuperType(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeEntity_SuperType(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeEntitySuperType feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeEntity_SuperType feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeEntityFeatures(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeEntity_Features(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeEntityFeatures feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeEntity_Features feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeAttributeName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAttribute_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeAttributeName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAttribute_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "AttributeName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Attribute_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeAttributeType(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAttribute_Type(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeAttributeType feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAttribute_Type feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeReferenceName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeReference_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeReferenceName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeReference_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "ReferenceName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Reference_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeReferenceType(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeReference_Type(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeReferenceType feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeReference_Type feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeReferenceOpposite(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeReference_Opposite(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeReferenceOpposite feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeReference_Opposite feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeOperationName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeOperation_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeOperationName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeOperation_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "OperationName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Operation_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeOperationParams(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeOperation_Params(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeOperationParams feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeOperation_Params feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
@@ -170,36 +170,36 @@ public class GenDomainmodelProposalProvider extends AbstractJavaProposalProvider
 	}
 			
 			
-	public List<? extends ICompletionProposal> completeOperationType(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeOperation_Type(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeOperationType feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeOperation_Type feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeParameterName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeParameter_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeParameterName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeParameter_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "ParameterName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Parameter_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeParameterType(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeParameter_Type(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeParameterType feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeParameter_Type feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeTypeRefReferenced(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTypeRef_Referenced(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTypeRefReferenced feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTypeRef_Referenced feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
@@ -229,9 +229,9 @@ public class GenDomainmodelProposalProvider extends AbstractJavaProposalProvider
 			
 			
 			
-	public List<? extends ICompletionProposal> completeEcoreEString(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeEcore_EString(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeEcoreEString '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
+			logger.debug("completeEcore_EString '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
 					+ "' for model '" + contentAssistContext.getModel() + "' and prefix '" + contentAssistContext.getMatchString() + "'");
 		}
 		return Collections.emptyList();
diff --git a/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
index 9816b7e..1ea7b76 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
@@ -6,10 +6,9 @@ Bundle-Version: 1.0.0
 Bundle-SymbolicName: org.eclipse.xtext.example.domainmodel; singleton:=true
 Eclipse-RegisterBuddy: org.eclipse.xtext.log4j
 Bundle-ActivationPolicy: lazy
-Require-Bundle:  org.eclipse.xtext.log4j;bundle-version="1.2.15",
+Require-Bundle: org.eclipse.xtext.log4j;bundle-version="1.2.15",
  org.eclipse.xtext,
  org.eclipse.xtext.generator,
- org.antlr.gen,
  org.eclipse.xtend,
  org.eclipse.xtend.typesystem.emf,
  org.eclipse.xpand,
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeConfig.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeConfig.java
index 99e1f58..8412843 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeConfig.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractDomainmodelRuntimeConfig extends AbstractServiceRe
 		return org.eclipse.xtext.example.parser.packrat.DomainmodelPackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.example.parser.antlr.DomainmodelParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.example.parser.antlr.DomainmodelAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.example.services.DomainmodelResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractDomainmodelRuntimeConfig extends AbstractServiceRe
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.example.parser.antlr.DomainmodelParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.example.parser.antlr.DomainmodelAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.example.parser.antlr.internal.InternalDomainmodelLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractDomainmodelRuntimeConfig extends AbstractServiceRe
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g
index 9d8acc3..b170841 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g
@@ -24,25 +24,25 @@ T24 : ',' ;
 T25 : ')' ;
 T26 : '.' ;
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1020
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1020
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1022
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1022
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1024
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1024
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1026
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1026
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1028
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1028
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1030
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1030
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1032
+// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1032
 RULE_ANY_OTHER : .;
 
 
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslProposalProvider.java b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslProposalProvider.java
index ba50c0e..fbd4387 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslProposalProvider.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslProposalProvider.java
@@ -25,117 +25,117 @@ public class GenFowlerDslProposalProvider extends AbstractJavaProposalProvider {
 	
 	
 			
-	public List<? extends ICompletionProposal> completeStatemachineEvents(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeStatemachine_Events(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeStatemachineEvents feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeStatemachine_Events feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeStatemachineCommands(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeStatemachine_Commands(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeStatemachineCommands feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeStatemachine_Commands feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeStatemachineStates(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeStatemachine_States(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeStatemachineStates feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeStatemachine_States feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeEventResetting(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeEvent_Resetting(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeEventResetting feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeEvent_Resetting feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeEventName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeEvent_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeEventName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeEvent_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "EventName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Event_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeEventCode(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeEvent_Code(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeEventCode feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeEvent_Code feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "EventCode", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Event_Code", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeCommandName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeCommand_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeCommandName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeCommand_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "CommandName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Command_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeCommandCode(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeCommand_Code(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeCommandCode feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeCommand_Code feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "CommandCode", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Command_Code", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeStateName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeState_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeStateName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeState_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "StateName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "State_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeStateActions(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeState_Actions(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeStateActions feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeState_Actions feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeStateTransitions(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeState_Transitions(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeStateTransitions feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeState_Transitions feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeTransitionEvent(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTransition_Event(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTransitionEvent feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTransition_Event feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeTransitionState(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTransition_State(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTransitionState feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTransition_State feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/AbstractFowlerDslRuntimeConfig.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/AbstractFowlerDslRuntimeConfig.java
index b9ba979..d0a420b 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/AbstractFowlerDslRuntimeConfig.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/AbstractFowlerDslRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractFowlerDslRuntimeConfig extends AbstractServiceRegi
 		return org.eclipse.xtext.example.parser.packrat.FowlerDslPackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.example.parser.antlr.FowlerDslParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.example.parser.antlr.FowlerDslAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.example.services.FowlerDslResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractFowlerDslRuntimeConfig extends AbstractServiceRegi
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.example.parser.antlr.FowlerDslParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.example.parser.antlr.FowlerDslAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.example.parser.antlr.internal.InternalFowlerDslLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractFowlerDslRuntimeConfig extends AbstractServiceRegi
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g
index 6e0d9b4..c78cd9b 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g
@@ -17,25 +17,25 @@ T17 : '{' ;
 T18 : '}' ;
 T19 : '=>' ;
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 476
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 476
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 478
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 478
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 480
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 480
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 482
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 482
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 484
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 484
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 486
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 486
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 488
+// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 488
 RULE_ANY_OTHER : .;
 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeConfig.java
index cafd681..9ee0bf2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/AbstractXtextGrammarTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractXtextGrammarTestLanguageRuntimeConfig extends Abst
 		return org.eclipse.xtext.parser.packrat.XtextGrammarTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.parser.antlr.XtextGrammarTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.parser.antlr.XtextGrammarTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.services.XtextGrammarTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractXtextGrammarTestLanguageRuntimeConfig extends Abst
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.parser.antlr.XtextGrammarTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.parser.antlr.XtextGrammarTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.parser.antlr.internal.InternalXtextGrammarTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractXtextGrammarTestLanguageRuntimeConfig extends Abst
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
index 050e1ba..30c6432 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
@@ -14,18 +14,18 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="rules" unique="false" upperBound="-1" eType="//AbstractRule" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractRule">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias">
-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage">
       <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GeneratedMetamodel" eSuperTypes="//AbstractMetamodelDeclaration">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractImportUriTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractImportUriTestLanguageRuntimeConfig.java
index feed193..e39d99f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractImportUriTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractImportUriTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractImportUriTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.crossrefs.parser.packrat.ImportUriTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.crossrefs.parser.antlr.ImportUriTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.crossrefs.parser.antlr.ImportUriTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.crossrefs.services.ImportUriTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractImportUriTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.crossrefs.parser.antlr.ImportUriTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.crossrefs.parser.antlr.ImportUriTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.crossrefs.parser.antlr.internal.InternalImportUriTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractImportUriTestLanguageRuntimeConfig extends Abstrac
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractLangATestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractLangATestLanguageRuntimeConfig.java
index 1988e5c..60291e6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractLangATestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/AbstractLangATestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractLangATestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.crossrefs.parser.packrat.LangATestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.crossrefs.parser.antlr.LangATestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.crossrefs.parser.antlr.LangATestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.crossrefs.services.LangATestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractLangATestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.crossrefs.parser.antlr.LangATestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.crossrefs.parser.antlr.LangATestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.crossrefs.parser.antlr.internal.InternalLangATestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractLangATestLanguageRuntimeConfig extends AbstractSer
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeConfig.java
index fdc97e6..709336e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/AbstractDummyTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractDummyTestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.dummy.parser.packrat.DummyTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.dummy.parser.antlr.DummyTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.dummy.parser.antlr.DummyTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.dummy.services.DummyTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractDummyTestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.dummy.parser.antlr.DummyTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.dummy.parser.antlr.DummyTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.dummy.parser.antlr.internal.InternalDummyTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractDummyTestLanguageRuntimeConfig extends AbstractSer
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeConfig.java
index 38422d2..5914e99 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractConcreteTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractConcreteTestLanguageRuntimeConfig extends Abstract
 		return org.eclipse.xtext.grammarinheritance.parser.packrat.ConcreteTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.grammarinheritance.parser.antlr.ConcreteTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.grammarinheritance.parser.antlr.ConcreteTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.grammarinheritance.services.ConcreteTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractConcreteTestLanguageRuntimeConfig extends Abstract
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.grammarinheritance.parser.antlr.ConcreteTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.grammarinheritance.parser.antlr.ConcreteTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.grammarinheritance.parser.antlr.internal.InternalConcreteTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractConcreteTestLanguageRuntimeConfig extends Abstract
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeConfig.java
index dd4133b..e21f84a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMetamodelRefTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractMetamodelRefTestLanguageRuntimeConfig extends Abst
 		return org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.MetamodelRefTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MetamodelRefTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MetamodelRefTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractMetamodelRefTestLanguageRuntimeConfig extends Abst
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MetamodelRefTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MetamodelRefTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.internal.InternalMetamodelRefTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractMetamodelRefTestLanguageRuntimeConfig extends Abst
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeConfig.java
index ffd550d..f8687c5 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/AbstractMultiGenMMTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractMultiGenMMTestLanguageRuntimeConfig extends Abstra
 		return org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.MultiGenMMTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MultiGenMMTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MultiGenMMTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.metamodelreferencing.tests.services.MultiGenMMTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractMultiGenMMTestLanguageRuntimeConfig extends Abstra
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MultiGenMMTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.MultiGenMMTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.internal.InternalMultiGenMMTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractMultiGenMMTestLanguageRuntimeConfig extends Abstra
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g
index 32de776..79ef5cc 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g
@@ -41,25 +41,25 @@ T41 : '..' ;
 T42 : '[' ;
 T43 : ']' ;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2219
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2219
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2221
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2221
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2223
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2223
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2225
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2225
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2227
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2227
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2229
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2229
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2231
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2231
 RULE_ANY_OTHER : .;
 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeConfig.java
index afde3c5..fb7c99b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/AbstractDatatypeRulesTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractDatatypeRulesTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parser.datatyperules.parser.packrat.DatatypeRulesTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.parser.datatyperules.parser.antlr.DatatypeRulesTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.parser.datatyperules.parser.antlr.DatatypeRulesTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parser.datatyperules.services.DatatypeRulesTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractDatatypeRulesTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.parser.datatyperules.parser.antlr.DatatypeRulesTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.parser.datatyperules.parser.antlr.DatatypeRulesTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.parser.datatyperules.parser.antlr.internal.InternalDatatypeRulesTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractDatatypeRulesTestLanguageRuntimeConfig extends Abs
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeConfig.java
index caae30d..87974b6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractTerminalRulesTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractTerminalRulesTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parser.terminalrules.parser.packrat.TerminalRulesTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.parser.terminalrules.parser.antlr.TerminalRulesTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.parser.terminalrules.parser.antlr.TerminalRulesTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parser.terminalrules.services.TerminalRulesTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractTerminalRulesTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.parser.terminalrules.parser.antlr.TerminalRulesTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.parser.terminalrules.parser.antlr.TerminalRulesTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.parser.terminalrules.parser.antlr.internal.InternalTerminalRulesTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractTerminalRulesTestLanguageRuntimeConfig extends Abs
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeConfig.java
index 944218b..ff6f704 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/AbstractXtextTerminalsTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractXtextTerminalsTestLanguageRuntimeConfig extends Ab
 		return org.eclipse.xtext.parser.terminalrules.parser.packrat.XtextTerminalsTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.parser.terminalrules.parser.antlr.XtextTerminalsTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.parser.terminalrules.parser.antlr.XtextTerminalsTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parser.terminalrules.services.XtextTerminalsTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractXtextTerminalsTestLanguageRuntimeConfig extends Ab
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.parser.terminalrules.parser.antlr.XtextTerminalsTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.parser.terminalrules.parser.antlr.XtextTerminalsTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.parser.terminalrules.parser.antlr.internal.InternalXtextTerminalsTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractXtextTerminalsTestLanguageRuntimeConfig extends Ab
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore
index 64ced3d..f03a642 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.ecore
@@ -14,10 +14,10 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="rules" unique="false" upperBound="-1" eType="//AbstractRule" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractRule">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration">
     <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java
index 6d4e57c..e2dd0e6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractFormatterTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parsetree.formatter.parser.packrat.FormatterTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.parsetree.formatter.parser.antlr.FormatterTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.parsetree.formatter.parser.antlr.FormatterTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractFormatterTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.parsetree.formatter.parser.antlr.FormatterTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.parsetree.formatter.parser.antlr.FormatterTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.parsetree.formatter.parser.antlr.internal.InternalFormatterTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractFormatterTestLanguageRuntimeConfig extends Abstrac
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeConfig.java
index 0d32241..cb8b87e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractComplexReconstrTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractComplexReconstrTestLanguageRuntimeConfig extends A
 		return org.eclipse.xtext.parsetree.reconstr.parser.packrat.ComplexReconstrTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.ComplexReconstrTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.ComplexReconstrTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parsetree.reconstr.services.ComplexReconstrTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractComplexReconstrTestLanguageRuntimeConfig extends A
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.ComplexReconstrTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.ComplexReconstrTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.internal.InternalComplexReconstrTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractComplexReconstrTestLanguageRuntimeConfig extends A
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSimpleReconstrTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSimpleReconstrTestLanguageRuntimeConfig.java
index 44d4d34..3213955 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSimpleReconstrTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/AbstractSimpleReconstrTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractSimpleReconstrTestLanguageRuntimeConfig extends Ab
 		return org.eclipse.xtext.parsetree.reconstr.parser.packrat.SimpleReconstrTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.SimpleReconstrTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.SimpleReconstrTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parsetree.reconstr.services.SimpleReconstrTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractSimpleReconstrTestLanguageRuntimeConfig extends Ab
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.SimpleReconstrTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.SimpleReconstrTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.parsetree.reconstr.parser.antlr.internal.InternalSimpleReconstrTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractSimpleReconstrTestLanguageRuntimeConfig extends Ab
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeConfig.java
index e3a494f..f739535 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/AbstractTransientValuesTestRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractTransientValuesTestRuntimeConfig extends AbstractS
 		return org.eclipse.xtext.parsetree.transientvalues.parser.packrat.TransientValuesTestPackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.parsetree.transientvalues.parser.antlr.TransientValuesTestParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.parsetree.transientvalues.parser.antlr.TransientValuesTestAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.parsetree.transientvalues.services.TransientValuesTestResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractTransientValuesTestRuntimeConfig extends AbstractS
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.parsetree.transientvalues.parser.antlr.TransientValuesTestParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.parsetree.transientvalues.parser.antlr.TransientValuesTestAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.parsetree.transientvalues.parser.antlr.internal.InternalTransientValuesTestLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractTransientValuesTestRuntimeConfig extends AbstractS
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/AbstractMultiValueFeatureTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/AbstractMultiValueFeatureTestLanguageRuntimeConfig.java
index ae8f02f..82df1d0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/AbstractMultiValueFeatureTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/resource/metamodel/AbstractMultiValueFeatureTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractMultiValueFeatureTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.resource.metamodel.parser.packrat.MultiValueFeatureTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.resource.metamodel.parser.antlr.MultiValueFeatureTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.resource.metamodel.parser.antlr.MultiValueFeatureTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.resource.metamodel.services.MultiValueFeatureTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractMultiValueFeatureTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.resource.metamodel.parser.antlr.MultiValueFeatureTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.resource.metamodel.parser.antlr.MultiValueFeatureTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.resource.metamodel.parser.antlr.internal.InternalMultiValueFeatureTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractMultiValueFeatureTestLanguageRuntimeConfig extends
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeConfig.java
index 7356c50..e88b1ba 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractActionTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractActionTestLanguageRuntimeConfig extends AbstractSe
 		return org.eclipse.xtext.testlanguages.parser.packrat.ActionTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.ActionTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.ActionTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.ActionTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractActionTestLanguageRuntimeConfig extends AbstractSe
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.ActionTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.ActionTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalActionTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractActionTestLanguageRuntimeConfig extends AbstractSe
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageRuntimeConfig.java
index bb701a5..f90bce5 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractContentAssistTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractContentAssistTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.testlanguages.parser.packrat.ContentAssistTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.ContentAssistTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.ContentAssistTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.ContentAssistTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractContentAssistTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.ContentAssistTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.ContentAssistTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalContentAssistTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractContentAssistTestLanguageRuntimeConfig extends Abs
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeConfig.java
index 8ced497..3fd1aac 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractFowlerDslTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractFowlerDslTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.testlanguages.parser.packrat.FowlerDslTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.FowlerDslTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.FowlerDslTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.FowlerDslTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractFowlerDslTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.FowlerDslTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.FowlerDslTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalFowlerDslTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractFowlerDslTestLanguageRuntimeConfig extends Abstrac
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLexerTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLexerTestLanguageRuntimeConfig.java
index 1b79836..1c1fe3f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLexerTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLexerTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractLexerTestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.testlanguages.parser.packrat.LexerTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.LexerTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.LexerTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.LexerTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractLexerTestLanguageRuntimeConfig extends AbstractSer
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.LexerTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.LexerTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalLexerTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractLexerTestLanguageRuntimeConfig extends AbstractSer
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeConfig.java
index 8524b4c..b174381 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractLookaheadTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractLookaheadTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.testlanguages.parser.packrat.LookaheadTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.LookaheadTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.LookaheadTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.LookaheadTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractLookaheadTestLanguageRuntimeConfig extends Abstrac
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.LookaheadTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.LookaheadTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalLookaheadTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractLookaheadTestLanguageRuntimeConfig extends Abstrac
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeConfig.java
index d03d9d3..418b4d0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractOptionalEmptyTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractOptionalEmptyTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.testlanguages.parser.packrat.OptionalEmptyTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.OptionalEmptyTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.OptionalEmptyTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.OptionalEmptyTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractOptionalEmptyTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.OptionalEmptyTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.OptionalEmptyTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalOptionalEmptyTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractOptionalEmptyTestLanguageRuntimeConfig extends Abs
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeConfig.java
index 5cd9a3b..a0e293a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractPartialParserTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractPartialParserTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.testlanguages.parser.packrat.PartialParserTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.PartialParserTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.PartialParserTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.PartialParserTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractPartialParserTestLanguageRuntimeConfig extends Abs
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.PartialParserTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.PartialParserTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalPartialParserTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractPartialParserTestLanguageRuntimeConfig extends Abs
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeConfig.java
index 356c535..e5fe2a0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractReferenceGrammarTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractReferenceGrammarTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.testlanguages.parser.packrat.ReferenceGrammarTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.ReferenceGrammarTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.ReferenceGrammarTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.ReferenceGrammarTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractReferenceGrammarTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.ReferenceGrammarTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.ReferenceGrammarTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalReferenceGrammarTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractReferenceGrammarTestLanguageRuntimeConfig extends
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeConfig.java
index 6096a52..aad46fd 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractSimpleExpressionsTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractSimpleExpressionsTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.testlanguages.parser.packrat.SimpleExpressionsTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.SimpleExpressionsTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.SimpleExpressionsTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.SimpleExpressionsTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractSimpleExpressionsTestLanguageRuntimeConfig extends
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.SimpleExpressionsTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.SimpleExpressionsTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalSimpleExpressionsTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractSimpleExpressionsTestLanguageRuntimeConfig extends
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeConfig.java
index 6efab38..d8e8b34 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return org.eclipse.xtext.testlanguages.parser.packrat.TestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.TestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.TestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.TestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.TestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.TestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeConfig.java
index a14ee7a..7259b61 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/AbstractTreeTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractTreeTestLanguageRuntimeConfig extends AbstractServ
 		return org.eclipse.xtext.testlanguages.parser.packrat.TreeTestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.TreeTestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.testlanguages.parser.antlr.TreeTestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.testlanguages.services.TreeTestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractTreeTestLanguageRuntimeConfig extends AbstractServ
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.TreeTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.testlanguages.parser.antlr.TreeTestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalTreeTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractTreeTestLanguageRuntimeConfig extends AbstractServ
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
index 8d02c8e..d0d0a55 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
@@ -13,12 +13,12 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="familie" unique="false" upperBound="-1" eType="//Familie" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Person">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/>
   <eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g
index 0372934..302bcb7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g
@@ -15,25 +15,25 @@ T15 : ';' ;
 T16 : 'rule' ;
 T17 : ':' ;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 356
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 356
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 358
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 358
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 360
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 360
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 362
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 362
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 364
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 364
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 366
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 366
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 368
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 368
 RULE_ANY_OTHER : .;
 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g
index 4cdf777..ae247e8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g
@@ -23,25 +23,25 @@ T23 : 'familie' ;
 T24 : 'keyword' ;
 T25 : ',' ;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 636
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 636
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 638
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 638
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 640
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 640
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 642
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 642
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 644
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 644
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 646
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 646
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 648
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 648
 RULE_ANY_OTHER : .;
 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g
index 4f6a11f..2fcb6a2 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g
@@ -12,25 +12,25 @@ T12 : ')' ;
 T13 : '{' ;
 T14 : '};' ;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 213
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 213
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 215
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 215
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 217
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 217
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 219
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 219
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 221
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 221
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 223
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 223
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 225
+// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 225
 RULE_ANY_OTHER : .;
 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeConfig.java
index 2a8b996..9367071 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeConfig.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/valueconverter/AbstractBug250313RuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractBug250313RuntimeConfig extends AbstractServiceRegi
 		return org.eclipse.xtext.valueconverter.parser.packrat.Bug250313PackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.valueconverter.parser.antlr.Bug250313Parser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.valueconverter.parser.antlr.Bug250313AntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.valueconverter.services.Bug250313ResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractBug250313RuntimeConfig extends AbstractServiceRegi
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.valueconverter.parser.antlr.Bug250313Parser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.valueconverter.parser.antlr.Bug250313AntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.valueconverter.parser.antlr.internal.InternalBug250313Lexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractBug250313RuntimeConfig extends AbstractServiceRegi
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java
index 40fc3e2..dc650da 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java
@@ -21,7 +21,7 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
  */
 public class GenXtextGrammarTestLanguageProposalProvider extends AbstractJavaProposalProvider {
 	// constants
-	private static final String UI_PLUGIN_ID  = ".";
+	private static final String UI_PLUGIN_ID  = "";
 	
 	
 			
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java
index 4705caa..8e19fa2 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java
@@ -11,7 +11,7 @@ import org.eclipse.xtext.ui.common.xtend.contentassist.AbstractXtendProposalProv
  */
 public class XtendXtextGrammarTestLanguageProposalProvider extends AbstractXtendProposalProvider {
 
-	private static final String UI_PLUGIN_ID = ".";
+	private static final String UI_PLUGIN_ID = "";
 		
 	@Override
 	protected ClassLoader getClassLoader() {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java
index fcbf0e1..ab99ec2 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java
@@ -21,7 +21,7 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
  */
 public class GenContentAssistTestLanguageProposalProvider extends AbstractJavaProposalProvider {
 	// constants
-	private static final String UI_PLUGIN_ID  = ".";
+	private static final String UI_PLUGIN_ID  = "";
 	
 	
 			
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java
index 0546244..7b37d05 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java
@@ -21,7 +21,7 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
  */
 public class GenReferenceGrammarTestLanguageProposalProvider extends AbstractJavaProposalProvider {
 	// constants
-	private static final String UI_PLUGIN_ID  = ".";
+	private static final String UI_PLUGIN_ID  = "";
 	
 	
 			
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java
index a7170fe..3374520 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java
@@ -21,7 +21,7 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
  */
 public class GenTreeTestLanguageProposalProvider extends AbstractJavaProposalProvider {
 	// constants
-	private static final String UI_PLUGIN_ID  = ".";
+	private static final String UI_PLUGIN_ID  = "";
 	
 	
 			
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendContentAssistTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendContentAssistTestLanguageProposalProvider.java
index 197294a..a77ccd1 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendContentAssistTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendContentAssistTestLanguageProposalProvider.java
@@ -11,7 +11,7 @@ import org.eclipse.xtext.ui.common.xtend.contentassist.AbstractXtendProposalProv
  */
 public class XtendContentAssistTestLanguageProposalProvider extends AbstractXtendProposalProvider {
 
-	private static final String UI_PLUGIN_ID = ".";
+	private static final String UI_PLUGIN_ID = "";
 		
 	@Override
 	protected ClassLoader getClassLoader() {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendReferenceGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendReferenceGrammarTestLanguageProposalProvider.java
index 86a2388..45172fd 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendReferenceGrammarTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendReferenceGrammarTestLanguageProposalProvider.java
@@ -11,7 +11,7 @@ import org.eclipse.xtext.ui.common.xtend.contentassist.AbstractXtendProposalProv
  */
 public class XtendReferenceGrammarTestLanguageProposalProvider extends AbstractXtendProposalProvider {
 
-	private static final String UI_PLUGIN_ID = ".";
+	private static final String UI_PLUGIN_ID = "";
 		
 	@Override
 	protected ClassLoader getClassLoader() {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendTreeTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendTreeTestLanguageProposalProvider.java
index 89d352b..671879b 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendTreeTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendTreeTestLanguageProposalProvider.java
@@ -11,7 +11,7 @@ import org.eclipse.xtext.ui.common.xtend.contentassist.AbstractXtendProposalProv
  */
 public class XtendTreeTestLanguageProposalProvider extends AbstractXtendProposalProvider {
 
-	private static final String UI_PLUGIN_ID = ".";
+	private static final String UI_PLUGIN_ID = "";
 		
 	@Override
 	protected ClassLoader getClassLoader() {
diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageRuntimeConfig.java
index 738fb80..73091f5 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageRuntimeConfig.java
+++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/AbstractTestLanguageRuntimeConfig.java
@@ -21,18 +21,6 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return org.eclipse.xtext.ui.integration.parser.packrat.TestLanguagePackratParser.class;
 	}
 		
-	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
-		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
-		return org.eclipse.xtext.ui.integration.parser.antlr.TestLanguageParser.class;
-	}
-		
-	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.ui.integration.parser.antlr.TestLanguageAntlrTokenFileProvider.class;
-	}
-		
 	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
 		return org.eclipse.xtext.ui.integration.services.TestLanguageResourceFactory.class;
 	}
@@ -53,6 +41,18 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
 	}
 		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.antlr.AntlrEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.ui.integration.parser.antlr.TestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.ui.integration.parser.antlr.TestLanguageAntlrTokenFileProvider.class;
+	}
+		
 	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
 		return org.eclipse.xtext.ui.integration.parser.antlr.internal.InternalTestLanguageLexer.class;
 	}
@@ -63,14 +63,14 @@ public abstract class AbstractTestLanguageRuntimeConfig extends AbstractServiceR
 		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
 		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
 		.with(org.eclipse.xtext.parser.packrat.IPackratParser.class, getIPackratParser())
-		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
-		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
-		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
 		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
 		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
 		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
 		
 			.registrations();
diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/GenTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/GenTestLanguageProposalProvider.java
index 259a05f..248ba01 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/GenTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/GenTestLanguageProposalProvider.java
@@ -25,22 +25,22 @@ public class GenTestLanguageProposalProvider extends AbstractJavaProposalProvide
 	
 	
 			
-	public List<? extends ICompletionProposal> completeFileStuff(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFile_Stuff(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFileStuff feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFile_Stuff feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeStuffName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeStuff_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeStuffName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeStuff_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "StuffName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Stuff_Name", contentAssistContext));
 	}