Fix: exception when using grammar inheritance across plugins (see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=265101)

Cleanup: IAstFactory uses EClassifiers instead of strings

508 files changed, 7598 insertions, 4459 deletions

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 95ea604..9041f77 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
@@ -94,7 +94,7 @@ ruleSpielplatz returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Spielplatz");
+	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -114,7 +114,7 @@ ruleSpielplatz returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Spielplatz");
+	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -138,7 +138,7 @@ ruleSpielplatz returns [EObject current=null]
 	    lv_kinder_4=ruleKind 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Spielplatz");
+	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -160,7 +160,7 @@ ruleSpielplatz returns [EObject current=null]
 	    lv_erzieher_5=ruleErwachsener 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Spielplatz");
+	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -182,7 +182,7 @@ ruleSpielplatz returns [EObject current=null]
 	    lv_spielzeuge_6=ruleSpielzeug 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Spielplatz");
+	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -204,7 +204,7 @@ ruleSpielplatz returns [EObject current=null]
 	    lv_familie_7=ruleFamilie 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Spielplatz");
+	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -226,7 +226,7 @@ ruleSpielplatz returns [EObject current=null]
 	    lv_types_8=ruleCustomTypeParserRule 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Spielplatz");
+	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -284,7 +284,7 @@ ruleKind returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Kind");
+	            $current = factory.create(grammarAccess.prKind().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -304,7 +304,7 @@ ruleKind returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Kind");
+	            $current = factory.create(grammarAccess.prKind().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -359,7 +359,7 @@ ruleErwachsener returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Erwachsener");
+	            $current = factory.create(grammarAccess.prErwachsener().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -379,7 +379,7 @@ ruleErwachsener returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Erwachsener");
+	            $current = factory.create(grammarAccess.prErwachsener().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -434,7 +434,7 @@ ruleSpielzeug returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Spielzeug");
+	            $current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -454,7 +454,7 @@ ruleSpielzeug returns [EObject current=null]
 	    lv_farbe_3=ruleFarbe 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Spielzeug");
+	            $current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -523,7 +523,7 @@ ruleFamilie returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Familie");
+	            $current = factory.create(grammarAccess.prFamilie().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -539,7 +539,7 @@ ruleFamilie returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("Familie");
+	            $current = factory.create(grammarAccess.prFamilie().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -555,7 +555,7 @@ ruleFamilie returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("Familie");
+	            $current = factory.create(grammarAccess.prFamilie().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -571,7 +571,7 @@ ruleFamilie returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("Familie");
+	            $current = factory.create(grammarAccess.prFamilie().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -591,7 +591,7 @@ ruleFamilie returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("Familie");
+	            $current = factory.create(grammarAccess.prFamilie().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -660,7 +660,7 @@ ruleFarbe returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Farbe");
+	            $current = factory.create(grammarAccess.prFarbe().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -707,7 +707,7 @@ ruleCustomTypeParserRule returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("CustomType");
+	            $current = factory.create(grammarAccess.prCustomTypeParserRule().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java
index bfdef05..31f1d2b 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java
@@ -160,7 +160,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     	
 
                     	        if (current==null) {
-                    	            current = factory.create("Spielplatz");
+                    	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -194,7 +194,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                             	
 
                             	        if (current==null) {
-                            	            current = factory.create("Spielplatz");
+                            	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
                             	            associateNodeWithAstElement(currentNode, current);
                             	        }
                             	        
@@ -310,7 +310,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
                     	                            	        if (current==null) {
-                    	                            	            current = factory.create("Spielplatz");
+                    	                            	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
                     	                            	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	                            	        }
                     	                            	        
@@ -342,7 +342,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
                     	                            	        if (current==null) {
-                    	                            	            current = factory.create("Spielplatz");
+                    	                            	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
                     	                            	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	                            	        }
                     	                            	        
@@ -380,7 +380,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
                     	                    	        if (current==null) {
-                    	                    	            current = factory.create("Spielplatz");
+                    	                    	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
                     	                    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	                    	        }
                     	                    	        
@@ -418,7 +418,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
                     	            	        if (current==null) {
-                    	            	            current = factory.create("Spielplatz");
+                    	            	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
                     	            	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	            	        }
                     	            	        
@@ -456,7 +456,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create("Spielplatz");
+                    	    	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getType());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -593,7 +593,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             	
 
             	        if (current==null) {
-            	            current = factory.create("Kind");
+            	            current = factory.create(grammarAccess.prKind().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -619,7 +619,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             	
 
             	        if (current==null) {
-            	            current = factory.create("Kind");
+            	            current = factory.create(grammarAccess.prKind().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -743,7 +743,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             	
 
             	        if (current==null) {
-            	            current = factory.create("Erwachsener");
+            	            current = factory.create(grammarAccess.prErwachsener().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -769,7 +769,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             	
 
             	        if (current==null) {
-            	            current = factory.create("Erwachsener");
+            	            current = factory.create(grammarAccess.prErwachsener().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -894,7 +894,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             	
 
             	        if (current==null) {
-            	            current = factory.create("Spielzeug");
+            	            current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -922,7 +922,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
             	        if (current==null) {
-            	            current = factory.create("Spielzeug");
+            	            current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -1126,7 +1126,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
             	        if (current==null) {
-            	            current = factory.create("Familie");
+            	            current = factory.create(grammarAccess.prFamilie().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1147,7 +1147,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
 
             			if (current==null) {
-            	            current = factory.create("Familie");
+            	            current = factory.create(grammarAccess.prFamilie().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
                     
@@ -1166,7 +1166,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
 
             			if (current==null) {
-            	            current = factory.create("Familie");
+            	            current = factory.create(grammarAccess.prFamilie().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
                     
@@ -1185,7 +1185,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
 
             			if (current==null) {
-            	            current = factory.create("Familie");
+            	            current = factory.create(grammarAccess.prFamilie().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
                     
@@ -1223,7 +1223,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             	    {
 
             	    			if (current==null) {
-            	    	            current = factory.create("Familie");
+            	    	            current = factory.create(grammarAccess.prFamilie().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode, current);
             	    	        }
             	            
@@ -1437,7 +1437,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
             	        if (current==null) {
-            	            current = factory.create("Farbe");
+            	            current = factory.create(grammarAccess.prFarbe().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1534,7 +1534,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             	
 
             	        if (current==null) {
-            	            current = factory.create("CustomType");
+            	            current = factory.create(grammarAccess.prCustomTypeParserRule().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
index 3d37bb1..f6f04e4 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.reference.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
 import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.CustomTypeParserRuleElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -84,7 +87,6 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi
 	}
 
 	public CustomTypeParserRuleElements getRule() {
-	// ReferenceGrammarGrammarAccess.INSTANCE.prCustomTypeParserRule()
 		return rule;
 	}
 	
@@ -93,13 +95,13 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "CustomType";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
index aee82a2..056e27c 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.reference.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
 import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.ErwachsenerElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -138,7 +141,6 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum
 	}
 
 	public ErwachsenerElements getRule() {
-	// ReferenceGrammarGrammarAccess.INSTANCE.prErwachsener()
 		return rule;
 	}
 	
@@ -147,13 +149,13 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Erwachsener";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
index 2534733..3450400 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.reference.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
 import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.FamilieElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -283,7 +286,6 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	}
 
 	public FamilieElements getRule() {
-	// ReferenceGrammarGrammarAccess.INSTANCE.prFamilie()
 		return rule;
 	}
 	
@@ -292,13 +294,13 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Familie";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
index 5b1c527..2b4eca4 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.reference.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
 import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.FarbeElements;
 
 
@@ -94,7 +97,6 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer {
 	}
 
 	public FarbeElements getRule() {
-	// ReferenceGrammarGrammarAccess.INSTANCE.prFarbe()
 		return rule;
 	}
 	
@@ -103,13 +105,13 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Farbe";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public ICharacterClass getKeyword$5$Delimiter() {
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
index 6a2ee13..26c028d 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.reference.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
 import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.KindElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -138,7 +141,6 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer {
 	}
 
 	public KindElements getRule() {
-	// ReferenceGrammarGrammarAccess.INSTANCE.prKind()
 		return rule;
 	}
 	
@@ -147,13 +149,13 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Kind";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java
index a63c6b8..dee8c0d 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.reference.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
 import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.PersonElements;
 
 import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarErwachsenerConsumer;
@@ -64,7 +67,6 @@ public final class ReferenceGrammarPersonConsumer extends NonTerminalConsumer {
 	}
 
 	public PersonElements getRule() {
-	// ReferenceGrammarGrammarAccess.INSTANCE.prPerson()
 		return rule;
 	}
 	
@@ -73,13 +75,13 @@ public final class ReferenceGrammarPersonConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Person";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setErwachsenerConsumer(INonTerminalConsumer erwachsenerConsumer) {
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
index 4f9069b..9f3d711 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.reference.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
 import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.SpielplatzElements;
 
 import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarCustomTypeParserRuleConsumer;
@@ -260,7 +263,6 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 
 	public SpielplatzElements getRule() {
-	// ReferenceGrammarGrammarAccess.INSTANCE.prSpielplatz()
 		return rule;
 	}
 	
@@ -269,13 +271,13 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Spielplatz";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setCustomTypeParserRuleConsumer(INonTerminalConsumer customTypeParserRuleConsumer) {
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
index 9993f2b..68c35e1 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.reference.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
 import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.SpielzeugElements;
 
 import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarFarbeConsumer;
@@ -135,7 +138,6 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer
 	}
 
 	public SpielzeugElements getRule() {
-	// ReferenceGrammarGrammarAccess.INSTANCE.prSpielzeug()
 		return rule;
 	}
 	
@@ -144,13 +146,13 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Spielzeug";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setFarbeConsumer(INonTerminalConsumer farbeConsumer) {
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
index f1c3677..4c57aa3 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
@@ -6,8 +6,8 @@ package org.eclipse.xtext.reference.parsetree.reconstr;
 //import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.*;
-import org.eclipse.xtext.parsetree.reconstr.*;
-import org.eclipse.xtext.parsetree.reconstr.impl.*;
+import org.eclipse.xtext.parsetree.reconstr.IInstanceDescription;
+import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor;
 import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor.AbstractToken.Solution;
 import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
 
@@ -18,17 +18,18 @@ public class ReferenceGrammarParseTreeConstructor extends AbstractParseTreeConst
 	@Inject
 	private ReferenceGrammarGrammarAccess grammarAccess;
 	
+	@Override
 	protected Solution internalSerialize(EObject obj) {
 		IInstanceDescription inst = getDescr(obj);
 		Solution s;
-		if(inst.isInstanceOf("Spielplatz") && (s = new Spielplatz_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Person") && (s = new Person_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Kind") && (s = new Kind_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Erwachsener") && (s = new Erwachsener_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Spielzeug") && (s = new Spielzeug_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Familie") && (s = new Familie_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Farbe") && (s = new Farbe_Assignment_wert(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("CustomType") && (s = new CustomTypeParserRule_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prSpielplatz().getRule().getType().getType()) && (s = new Spielplatz_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prPerson().getRule().getType().getType()) && (s = new Person_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prKind().getRule().getType().getType()) && (s = new Kind_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getType()) && (s = new Erwachsener_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prSpielzeug().getRule().getType().getType()) && (s = new Spielzeug_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prFamilie().getRule().getType().getType()) && (s = new Familie_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prFarbe().getRule().getType().getType()) && (s = new Farbe_Assignment_wert(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prCustomTypeParserRule().getRule().getType().getType()) && (s = new CustomTypeParserRule_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
 		return null;
 	}
 	
@@ -47,6 +48,7 @@ protected class Spielplatz_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSpielplatz().eleGroup();
 	}
@@ -76,6 +78,7 @@ protected class Spielplatz_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele0Group();
 	}
@@ -105,6 +108,7 @@ protected class Spielplatz_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele00Group();
 	}
@@ -134,6 +138,7 @@ protected class Spielplatz_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele000Group();
 	}
@@ -163,6 +168,7 @@ protected class Spielplatz_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele0000Group();
 	}
@@ -192,6 +198,7 @@ protected class Spielplatz_0_0_0_0_0_Keyword_spielplatz extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele00000KeywordSpielplatz();
 	}	
@@ -204,6 +211,7 @@ protected class Spielplatz_0_0_0_0_1_Assignment_groesse extends AssignmentToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele00001AssignmentGroesse();
 	}
@@ -229,6 +237,7 @@ protected class Spielplatz_0_0_0_1_Assignment_beschreibung extends AssignmentTok
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele0001AssignmentBeschreibung();
 	}
@@ -254,6 +263,7 @@ protected class Spielplatz_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele001KeywordLeftCurlyBracket();
 	}	
@@ -267,6 +277,7 @@ protected class Spielplatz_0_1_Alternatives extends AlternativesToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele01Alternatives();
 	}
@@ -289,6 +300,7 @@ protected class Spielplatz_0_1_0_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele010Alternatives();
 	}
@@ -311,6 +323,7 @@ protected class Spielplatz_0_1_0_0_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele0100Alternatives();
 	}
@@ -333,6 +346,7 @@ protected class Spielplatz_0_1_0_0_0_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele01000Alternatives();
 	}
@@ -355,6 +369,7 @@ protected class Spielplatz_0_1_0_0_0_0_Assignment_kinder extends AssignmentToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele010000AssignmentKinder();
 	}
@@ -366,7 +381,7 @@ protected class Spielplatz_0_1_0_0_0_0_Assignment_kinder extends AssignmentToken
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Kind")) {
+			if(param.isInstanceOf(grammarAccess.prKind().getRule().getType().getType())) {
 				Solution s = new Kind_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -387,6 +402,7 @@ protected class Spielplatz_0_1_0_0_0_1_Assignment_erzieher extends AssignmentTok
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele010001AssignmentErzieher();
 	}
@@ -398,7 +414,7 @@ protected class Spielplatz_0_1_0_0_0_1_Assignment_erzieher extends AssignmentTok
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Erwachsener")) {
+			if(param.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getType())) {
 				Solution s = new Erwachsener_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -420,6 +436,7 @@ protected class Spielplatz_0_1_0_0_1_Assignment_spielzeuge extends AssignmentTok
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele01001AssignmentSpielzeuge();
 	}
@@ -431,7 +448,7 @@ protected class Spielplatz_0_1_0_0_1_Assignment_spielzeuge extends AssignmentTok
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Spielzeug")) {
+			if(param.isInstanceOf(grammarAccess.prSpielzeug().getRule().getType().getType())) {
 				Solution s = new Spielzeug_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -453,6 +470,7 @@ protected class Spielplatz_0_1_0_1_Assignment_familie extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele0101AssignmentFamilie();
 	}
@@ -464,7 +482,7 @@ protected class Spielplatz_0_1_0_1_Assignment_familie extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Familie")) {
+			if(param.isInstanceOf(grammarAccess.prFamilie().getRule().getType().getType())) {
 				Solution s = new Familie_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -486,6 +504,7 @@ protected class Spielplatz_0_1_1_Assignment_types extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele011AssignmentTypes();
 	}
@@ -497,7 +516,7 @@ protected class Spielplatz_0_1_1_Assignment_types extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("CustomType")) {
+			if(param.isInstanceOf(grammarAccess.prCustomTypeParserRule().getRule().getType().getType())) {
 				Solution s = new CustomTypeParserRule_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -520,6 +539,7 @@ protected class Spielplatz_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prSpielplatz().ele1KeywordRightCurlyBracket();
 	}	
@@ -543,6 +563,7 @@ protected class Person_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prPerson().eleAlternatives();
 	}
@@ -565,6 +586,7 @@ protected class Person_0_RuleCall_Kind extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prPerson().ele0ParserRuleCallKind();
 	}
@@ -572,7 +594,7 @@ protected class Person_0_RuleCall_Kind extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Kind_Group.class, current)) return null;
-		if(!current.isInstanceOf("Kind")) return null;
+		if(!current.isInstanceOf(grammarAccess.prKind().getRule().getType().getType())) return null;
 		return new Kind_Group(current, this).firstSolution();
 	}
 }
@@ -584,6 +606,7 @@ protected class Person_1_RuleCall_Erwachsener extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prPerson().ele1ParserRuleCallErwachsener();
 	}
@@ -591,7 +614,7 @@ protected class Person_1_RuleCall_Erwachsener extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Erwachsener_Group.class, current)) return null;
-		if(!current.isInstanceOf("Erwachsener")) return null;
+		if(!current.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getType())) return null;
 		return new Erwachsener_Group(current, this).firstSolution();
 	}
 }
@@ -614,6 +637,7 @@ protected class Kind_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prKind().eleGroup();
 	}
@@ -643,6 +667,7 @@ protected class Kind_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prKind().ele0Group();
 	}
@@ -672,6 +697,7 @@ protected class Kind_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prKind().ele00Group();
 	}
@@ -701,6 +727,7 @@ protected class Kind_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prKind().ele000Group();
 	}
@@ -730,6 +757,7 @@ protected class Kind_0_0_0_0_Keyword_kind extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prKind().ele0000KeywordKind();
 	}	
@@ -742,6 +770,7 @@ protected class Kind_0_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prKind().ele0001KeywordLeftParenthesis();
 	}	
@@ -755,6 +784,7 @@ protected class Kind_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prKind().ele001AssignmentName();
 	}
@@ -780,6 +810,7 @@ protected class Kind_0_1_Assignment_age extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prKind().ele01AssignmentAge();
 	}
@@ -805,6 +836,7 @@ protected class Kind_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prKind().ele1KeywordRightParenthesis();
 	}	
@@ -828,6 +860,7 @@ protected class Erwachsener_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prErwachsener().eleGroup();
 	}
@@ -857,6 +890,7 @@ protected class Erwachsener_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prErwachsener().ele0Group();
 	}
@@ -886,6 +920,7 @@ protected class Erwachsener_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prErwachsener().ele00Group();
 	}
@@ -915,6 +950,7 @@ protected class Erwachsener_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prErwachsener().ele000Group();
 	}
@@ -944,6 +980,7 @@ protected class Erwachsener_0_0_0_0_Keyword_erwachsener extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prErwachsener().ele0000KeywordErwachsener();
 	}	
@@ -956,6 +993,7 @@ protected class Erwachsener_0_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prErwachsener().ele0001KeywordLeftParenthesis();
 	}	
@@ -969,6 +1007,7 @@ protected class Erwachsener_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prErwachsener().ele001AssignmentName();
 	}
@@ -994,6 +1033,7 @@ protected class Erwachsener_0_1_Assignment_age extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prErwachsener().ele01AssignmentAge();
 	}
@@ -1019,6 +1059,7 @@ protected class Erwachsener_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prErwachsener().ele1KeywordRightParenthesis();
 	}	
@@ -1042,6 +1083,7 @@ protected class Spielzeug_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSpielzeug().eleGroup();
 	}
@@ -1071,6 +1113,7 @@ protected class Spielzeug_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSpielzeug().ele0Group();
 	}
@@ -1100,6 +1143,7 @@ protected class Spielzeug_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSpielzeug().ele00Group();
 	}
@@ -1129,6 +1173,7 @@ protected class Spielzeug_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSpielzeug().ele000Group();
 	}
@@ -1158,6 +1203,7 @@ protected class Spielzeug_0_0_0_0_Keyword_spielzeug extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prSpielzeug().ele0000KeywordSpielzeug();
 	}	
@@ -1170,6 +1216,7 @@ protected class Spielzeug_0_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prSpielzeug().ele0001KeywordLeftParenthesis();
 	}	
@@ -1183,6 +1230,7 @@ protected class Spielzeug_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSpielzeug().ele001AssignmentName();
 	}
@@ -1208,6 +1256,7 @@ protected class Spielzeug_0_1_Assignment_farbe extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSpielzeug().ele01AssignmentFarbe();
 	}
@@ -1219,7 +1268,7 @@ protected class Spielzeug_0_1_Assignment_farbe extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Farbe")) {
+			if(param.isInstanceOf(grammarAccess.prFarbe().getRule().getType().getType())) {
 				Solution s = new Farbe_Assignment_wert(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1241,6 +1290,7 @@ protected class Spielzeug_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prSpielzeug().ele1KeywordRightParenthesis();
 	}	
@@ -1264,6 +1314,7 @@ protected class Familie_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prFamilie().eleGroup();
 	}
@@ -1293,6 +1344,7 @@ protected class Familie_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prFamilie().ele0Group();
 	}
@@ -1322,6 +1374,7 @@ protected class Familie_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prFamilie().ele00Group();
 	}
@@ -1351,6 +1404,7 @@ protected class Familie_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prFamilie().ele000Group();
 	}
@@ -1380,6 +1434,7 @@ protected class Familie_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prFamilie().ele0000Group();
 	}
@@ -1409,6 +1464,7 @@ protected class Familie_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prFamilie().ele00000Group();
 	}
@@ -1438,6 +1494,7 @@ protected class Familie_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prFamilie().ele000000Group();
 	}
@@ -1467,6 +1524,7 @@ protected class Familie_0_0_0_0_0_0_0_Keyword_familie extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prFamilie().ele0000000KeywordFamilie();
 	}	
@@ -1479,6 +1537,7 @@ protected class Familie_0_0_0_0_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prFamilie().ele0000001KeywordLeftParenthesis();
 	}	
@@ -1492,6 +1551,7 @@ protected class Familie_0_0_0_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prFamilie().ele000001AssignmentName();
 	}
@@ -1529,6 +1589,7 @@ protected class Familie_0_0_0_0_1_Assignment_mutter extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prFamilie().ele00001AssignmentMutter();
 	}
@@ -1539,7 +1600,7 @@ protected class Familie_0_0_0_0_1_Assignment_mutter extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("mutter");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Erwachsener")) {
+			if(param.isInstanceOf(grammarAccess.prFamilie().ele000010CrossReferenceEStringErwachsener().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prFamilie().ele000010CrossReferenceEStringErwachsener(); 
 				return new Solution(obj);
@@ -1557,6 +1618,7 @@ protected class Familie_0_0_0_1_Assignment_vater extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prFamilie().ele0001AssignmentVater();
 	}
@@ -1567,7 +1629,7 @@ protected class Familie_0_0_0_1_Assignment_vater extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("vater");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Erwachsener")) {
+			if(param.isInstanceOf(grammarAccess.prFamilie().ele00010CrossReferenceEStringErwachsener().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prFamilie().ele00010CrossReferenceEStringErwachsener(); 
 				return new Solution(obj);
@@ -1585,6 +1647,7 @@ protected class Familie_0_0_1_Assignment_kinder extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prFamilie().ele001AssignmentKinder();
 	}
@@ -1595,7 +1658,7 @@ protected class Familie_0_0_1_Assignment_kinder extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("kinder");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Kind")) {
+			if(param.isInstanceOf(grammarAccess.prFamilie().ele0010CrossReferenceEStringKind().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prFamilie().ele0010CrossReferenceEStringKind(); 
 				return new Solution(obj);
@@ -1613,6 +1676,7 @@ protected class Familie_0_1_Group extends GroupToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prFamilie().ele01Group();
 	}
@@ -1642,6 +1706,7 @@ protected class Familie_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prFamilie().ele010KeywordComma();
 	}	
@@ -1654,6 +1719,7 @@ protected class Familie_0_1_1_Assignment_kinder extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prFamilie().ele011AssignmentKinder();
 	}
@@ -1664,7 +1730,7 @@ protected class Familie_0_1_1_Assignment_kinder extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("kinder");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Kind")) {
+			if(param.isInstanceOf(grammarAccess.prFamilie().ele0110CrossReferenceEStringKind().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prFamilie().ele0110CrossReferenceEStringKind(); 
 				return new Solution(obj);
@@ -1683,6 +1749,7 @@ protected class Familie_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prFamilie().ele1KeywordRightParenthesis();
 	}	
@@ -1706,6 +1773,7 @@ protected class Farbe_Assignment_wert extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prFarbe().eleAssignmentWert();
 	}
@@ -1763,6 +1831,7 @@ protected class CustomTypeParserRule_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prCustomTypeParserRule().eleGroup();
 	}
@@ -1792,6 +1861,7 @@ protected class CustomTypeParserRule_0_Keyword_type extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prCustomTypeParserRule().ele0KeywordType();
 	}	
@@ -1804,6 +1874,7 @@ protected class CustomTypeParserRule_1_Assignment_name extends AssignmentToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prCustomTypeParserRule().ele1AssignmentName();
 	}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarMetamodelAccess.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarMetamodelAccess.java
index 18c96c8..3e7e52b 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarMetamodelAccess.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarMetamodelAccess.java
@@ -9,42 +9,42 @@ import org.eclipse.xtext.parser.BaseEPackageAccess;
 
 public class ReferenceGrammarMetamodelAccess extends BaseEPackageAccess implements IMetamodelAccess {
 
-{
-
+	protected static final String REFERENCEGRAMMAR_NS_URI = "http://eclipse.org/xtext/reference/ReferenceGrammar";
+	
+	
+	public static void init() {
 		if (!EPackage.Registry.INSTANCE.containsKey(REFERENCEGRAMMAR_NS_URI))
-			EPackage.Registry.INSTANCE.put(REFERENCEGRAMMAR_NS_URI, loadEcoreFile(getClass().getClassLoader(), "classpath:/org/eclipse/xtext/reference/ReferenceGrammar.ecore"));
+			EPackage.Registry.INSTANCE.put(REFERENCEGRAMMAR_NS_URI, loadEcoreFile(ReferenceGrammarMetamodelAccess.class.getClassLoader(), "classpath:/org/eclipse/xtext/reference/ReferenceGrammar.ecore"));
+	}
 
-}
+	static {
+		org.eclipse.xtext.builtin.services.XtextBuiltinMetamodelAccess.init();
+		init();
+	}
 
 	private EPackage[] generated = new EPackage[] {
-		
 		getReferenceGrammarEPackage()
-		
-		};
+	};
 
 	public EPackage[] getGeneratedEPackages() {
 		return generated;
 	}
 
 	private EPackage[] referenced = new EPackage[] {
-		
 		BaseEPackageAccess.getEPackageFromRegistry("http://eclipse.org/xtext/reference/ReferenceModel")
-		
-		};
+	};
+	
 	public EPackage[] getReferencedEPackages() {
 		return referenced;
 	}
 	
 	private EPackage[] all = new EPackage[] {
 	    BaseEPackageAccess.getEPackageFromRegistry("http://eclipse.org/xtext/reference/ReferenceModel"),getReferenceGrammarEPackage()
-		};
+	};
 	
 	public EPackage[] getAllEPackages() {
 		return all;
 	}
-
-	
-	protected static final String REFERENCEGRAMMAR_NS_URI = "http://eclipse.org/xtext/reference/ReferenceGrammar";
 	
 	protected EPackage getReferenceGrammarEPackage() {	
 		return EPackage.Registry.INSTANCE.getEPackage(REFERENCEGRAMMAR_NS_URI);
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 2e3a521..bac35ba 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
@@ -90,7 +90,7 @@ ruleFile returns [EObject current=null]
 	    lv_imports_0=ruleImport 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("File");
+	            $current = factory.create(grammarAccess.prFile().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -111,7 +111,7 @@ ruleFile returns [EObject current=null]
 	    lv_namedElements_1=ruleNamedElement 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("File");
+	            $current = factory.create(grammarAccess.prFile().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -159,7 +159,7 @@ ruleImport returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Import");
+	            $current = factory.create(grammarAccess.prImport().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -248,7 +248,7 @@ rulePackage returns [EObject current=null]
 	    lv_name_1=ruleQualifiedName 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Package");
+	            $current = factory.create(grammarAccess.prPackage().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -273,7 +273,7 @@ rulePackage returns [EObject current=null]
 	    lv_namedElements_3=ruleNamedElement 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Package");
+	            $current = factory.create(grammarAccess.prPackage().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -367,7 +367,7 @@ ruleDataType returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("DataType");
+	            $current = factory.create(grammarAccess.prDataType().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -414,7 +414,7 @@ ruleEntity returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Entity");
+	            $current = factory.create(grammarAccess.prEntity().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -434,7 +434,7 @@ ruleEntity returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("Entity");
+	            $current = factory.create(grammarAccess.prEntity().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -458,7 +458,7 @@ ruleEntity returns [EObject current=null]
 	    lv_features_5=ruleFeature 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Entity");
+	            $current = factory.create(grammarAccess.prEntity().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -594,7 +594,7 @@ ruleAttribute returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Attribute");
+	            $current = factory.create(grammarAccess.prAttribute().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -618,7 +618,7 @@ ruleAttribute returns [EObject current=null]
 	    lv_type_3=ruleTypeRef 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Attribute");
+	            $current = factory.create(grammarAccess.prAttribute().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -666,7 +666,7 @@ ruleReference returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Reference");
+	            $current = factory.create(grammarAccess.prReference().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -690,7 +690,7 @@ ruleReference returns [EObject current=null]
 	    lv_type_3=ruleTypeRef 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Reference");
+	            $current = factory.create(grammarAccess.prReference().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -711,7 +711,7 @@ ruleReference returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("Reference");
+	            $current = factory.create(grammarAccess.prReference().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -758,7 +758,7 @@ ruleOperation returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Operation");
+	            $current = factory.create(grammarAccess.prOperation().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -782,7 +782,7 @@ ruleOperation returns [EObject current=null]
 	    lv_params_3=ruleParameter 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Operation");
+	            $current = factory.create(grammarAccess.prOperation().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -807,7 +807,7 @@ ruleOperation returns [EObject current=null]
 	    lv_params_5=ruleParameter 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Operation");
+	            $current = factory.create(grammarAccess.prOperation().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -836,7 +836,7 @@ ruleOperation returns [EObject current=null]
 	    lv_type_8=ruleTypeRef 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Operation");
+	            $current = factory.create(grammarAccess.prOperation().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -880,7 +880,7 @@ ruleParameter returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Parameter");
+	            $current = factory.create(grammarAccess.prParameter().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -900,7 +900,7 @@ ruleParameter returns [EObject current=null]
 	    lv_type_1=ruleTypeRef 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Parameter");
+	            $current = factory.create(grammarAccess.prParameter().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -942,7 +942,7 @@ ruleTypeRef returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("TypeRef");
+	            $current = factory.create(grammarAccess.prTypeRef().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
index d91ee8d..5c8eae1 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
@@ -142,7 +142,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("File");
+            	    	            current = factory.create(grammarAccess.prFile().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -186,7 +186,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("File");
+            	    	            current = factory.create(grammarAccess.prFile().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -293,7 +293,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("Import");
+            	            current = factory.create(grammarAccess.prImport().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -531,7 +531,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("Package");
+            	            current = factory.create(grammarAccess.prPackage().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -579,7 +579,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("Package");
+            	    	            current = factory.create(grammarAccess.prPackage().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -817,7 +817,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("DataType");
+            	            current = factory.create(grammarAccess.prDataType().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -931,7 +931,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("Entity");
+            	            current = factory.create(grammarAccess.prEntity().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -967,7 +967,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     {
 
                     			if (current==null) {
-                    	            current = factory.create("Entity");
+                    	            current = factory.create(grammarAccess.prEntity().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                             
@@ -1018,7 +1018,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("Entity");
+            	    	            current = factory.create(grammarAccess.prEntity().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -1388,7 +1388,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("Attribute");
+            	            current = factory.create(grammarAccess.prAttribute().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1423,7 +1423,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("Attribute");
+            	            current = factory.create(grammarAccess.prAttribute().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -1535,7 +1535,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("Reference");
+            	            current = factory.create(grammarAccess.prReference().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1570,7 +1570,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("Reference");
+            	            current = factory.create(grammarAccess.prReference().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -1607,7 +1607,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     {
 
                     			if (current==null) {
-                    	            current = factory.create("Reference");
+                    	            current = factory.create(grammarAccess.prReference().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                             
@@ -1732,7 +1732,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("Operation");
+            	            current = factory.create(grammarAccess.prOperation().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1778,7 +1778,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create("Operation");
+                    	            current = factory.create(grammarAccess.prOperation().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -1823,7 +1823,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create("Operation");
+                    	    	            current = factory.create(grammarAccess.prOperation().getRule().getType().getType());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -1881,7 +1881,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("Operation");
+            	            current = factory.create(grammarAccess.prOperation().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -1980,7 +1980,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("Parameter");
+            	            current = factory.create(grammarAccess.prParameter().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -2005,7 +2005,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("Parameter");
+            	            current = factory.create(grammarAccess.prParameter().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -2092,7 +2092,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             {
 
             			if (current==null) {
-            	            current = factory.create("TypeRef");
+            	            current = factory.create(grammarAccess.prTypeRef().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
                     
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
index d09cf7b..5dea5ce 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.AttributeElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -119,7 +122,6 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
 	}
 
 	public AttributeElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prAttribute()
 		return rule;
 	}
 	
@@ -128,13 +130,13 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Attribute";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
index 695d9b9..3a98e55 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.DataTypeElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -84,7 +87,6 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer {
 	}
 
 	public DataTypeElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prDataType()
 		return rule;
 	}
 	
@@ -93,13 +95,13 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "DataType";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
index 00954be..a10974e 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.EntityElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelFeatureConsumer;
@@ -212,7 +215,6 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
 	}
 
 	public EntityElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prEntity()
 		return rule;
 	}
 	
@@ -221,13 +223,13 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Entity";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setFeatureConsumer(INonTerminalConsumer featureConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
index 0d5d5f7..79728d3 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.FeatureElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelOperationConsumer;
@@ -64,7 +67,6 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer {
 	}
 
 	public FeatureElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prFeature()
 		return rule;
 	}
 	
@@ -73,13 +75,13 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Feature";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setOperationConsumer(INonTerminalConsumer operationConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
index 362e7bf..7288573 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.FileElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelImportConsumer;
@@ -102,7 +105,6 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer {
 	}
 
 	public FileElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prFile()
 		return rule;
 	}
 	
@@ -111,13 +113,13 @@ public final class DomainmodelFileConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "File";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setImportConsumer(INonTerminalConsumer importConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
index 980a5d6..2d7dacf 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.ImportElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSTRINGConsumer;
@@ -84,7 +87,6 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer {
 	}
 
 	public ImportElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prImport()
 		return rule;
 	}
 	
@@ -93,13 +95,13 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Import";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setStringConsumer(ITerminalConsumer stringConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java
index 39ab8b9..b8ad048 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelNamedElementConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.NamedElementElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelPackageConsumer;
@@ -64,7 +67,6 @@ public final class DomainmodelNamedElementConsumer extends NonTerminalConsumer {
 	}
 
 	public NamedElementElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prNamedElement()
 		return rule;
 	}
 	
@@ -73,13 +75,13 @@ public final class DomainmodelNamedElementConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "NamedElement";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setPackageConsumer(INonTerminalConsumer packageConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
index 05bcb2c..ba3150c 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.OperationElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -266,7 +269,6 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
 	}
 
 	public OperationElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prOperation()
 		return rule;
 	}
 	
@@ -275,13 +277,13 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Operation";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
index b09d7e5..ce13640 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelPackageConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.PackageElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelNamedElementConsumer;
@@ -141,7 +144,6 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
 	}
 
 	public PackageElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prPackage()
 		return rule;
 	}
 	
@@ -150,13 +152,13 @@ public final class DomainmodelPackageConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Package";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setNamedElementConsumer(INonTerminalConsumer namedElementConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
index b4c8f24..1c1367d 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.ParameterElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -87,7 +90,6 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer {
 	}
 
 	public ParameterElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prParameter()
 		return rule;
 	}
 	
@@ -96,13 +98,13 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Parameter";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
index c6d60ba..8e5140d 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.QualifiedNameElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -127,7 +130,6 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
 	}
 
 	public QualifiedNameElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prQualifiedName()
 		return rule;
 	}
 	
@@ -136,13 +138,13 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EString";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
index 4a316d3..a200ac7 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.ReferenceElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -187,7 +190,6 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
 	}
 
 	public ReferenceElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prReference()
 		return rule;
 	}
 	
@@ -196,13 +198,13 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Reference";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java
index 0d85fd3..9e5dcc5 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelStructuralFeatureConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.StructuralFeatureElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelAttributeConsumer;
@@ -64,7 +67,6 @@ public final class DomainmodelStructuralFeatureConsumer extends NonTerminalConsu
 	}
 
 	public StructuralFeatureElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prStructuralFeature()
 		return rule;
 	}
 	
@@ -73,13 +75,13 @@ public final class DomainmodelStructuralFeatureConsumer extends NonTerminalConsu
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "StructuralFeature";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setAttributeConsumer(INonTerminalConsumer attributeConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java
index 48de045..c0cd35e 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.TypeElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelDataTypeConsumer;
@@ -64,7 +67,6 @@ public final class DomainmodelTypeConsumer extends NonTerminalConsumer {
 	}
 
 	public TypeElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prType()
 		return rule;
 	}
 	
@@ -73,13 +75,13 @@ public final class DomainmodelTypeConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "Type";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setDataTypeConsumer(INonTerminalConsumer dataTypeConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
index a678565..3c96245 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypeRefConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.TypeRefElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -46,7 +49,6 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer {
 	}
 
 	public TypeRefElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prTypeRef()
 		return rule;
 	}
 	
@@ -55,13 +57,13 @@ public final class DomainmodelTypeRefConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "TypeRef";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java
index 2b1ea74..537a81a 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelTypedElementConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess.TypedElementElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.DomainmodelFeatureConsumer;
@@ -64,7 +67,6 @@ public final class DomainmodelTypedElementConsumer extends NonTerminalConsumer {
 	}
 
 	public TypedElementElements getRule() {
-	// DomainmodelGrammarAccess.INSTANCE.prTypedElement()
 		return rule;
 	}
 	
@@ -73,13 +75,13 @@ public final class DomainmodelTypedElementConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "TypedElement";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setFeatureConsumer(INonTerminalConsumer featureConsumer) {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parsetree/reconstr/DomainmodelParseTreeConstructor.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parsetree/reconstr/DomainmodelParseTreeConstructor.java
index a906ade..8d4c0b4 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parsetree/reconstr/DomainmodelParseTreeConstructor.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parsetree/reconstr/DomainmodelParseTreeConstructor.java
@@ -6,8 +6,8 @@ package org.eclipse.xtext.example.parsetree.reconstr;
 //import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.*;
-import org.eclipse.xtext.parsetree.reconstr.*;
-import org.eclipse.xtext.parsetree.reconstr.impl.*;
+import org.eclipse.xtext.parsetree.reconstr.IInstanceDescription;
+import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor;
 import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor.AbstractToken.Solution;
 import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 
@@ -18,24 +18,25 @@ public class DomainmodelParseTreeConstructor extends AbstractParseTreeConstructo
 	@Inject
 	private DomainmodelGrammarAccess grammarAccess;
 	
+	@Override
 	protected Solution internalSerialize(EObject obj) {
 		IInstanceDescription inst = getDescr(obj);
 		Solution s;
-		if(inst.isInstanceOf("File") && (s = new File_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Import") && (s = new Import_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("NamedElement") && (s = new NamedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Package") && (s = new Package_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Type") && (s = new Type_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("DataType") && (s = new DataType_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Entity") && (s = new Entity_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Feature") && (s = new Feature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("StructuralFeature") && (s = new StructuralFeature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Attribute") && (s = new Attribute_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Reference") && (s = new Reference_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Operation") && (s = new Operation_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("Parameter") && (s = new Parameter_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("TypedElement") && (s = new TypedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("TypeRef") && (s = new TypeRef_Assignment_referenced(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prFile().getRule().getType().getType()) && (s = new File_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prImport().getRule().getType().getType()) && (s = new Import_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getType()) && (s = new NamedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prPackage().getRule().getType().getType()) && (s = new Package_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prType().getRule().getType().getType()) && (s = new Type_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prDataType().getRule().getType().getType()) && (s = new DataType_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEntity().getRule().getType().getType()) && (s = new Entity_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prFeature().getRule().getType().getType()) && (s = new Feature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prStructuralFeature().getRule().getType().getType()) && (s = new StructuralFeature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prAttribute().getRule().getType().getType()) && (s = new Attribute_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prReference().getRule().getType().getType()) && (s = new Reference_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prOperation().getRule().getType().getType()) && (s = new Operation_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prParameter().getRule().getType().getType()) && (s = new Parameter_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prTypedElement().getRule().getType().getType()) && (s = new TypedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getType()) && (s = new TypeRef_Assignment_referenced(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
 		return null;
 	}
 	
@@ -54,6 +55,7 @@ protected class File_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prFile().eleGroup();
 	}
@@ -83,6 +85,7 @@ protected class File_0_Assignment_imports extends AssignmentToken  {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prFile().ele0AssignmentImports();
 	}
@@ -94,7 +97,7 @@ protected class File_0_Assignment_imports extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Import")) {
+			if(param.isInstanceOf(grammarAccess.prImport().getRule().getType().getType())) {
 				Solution s = new Import_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -115,6 +118,7 @@ protected class File_1_Assignment_namedElements extends AssignmentToken  {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prFile().ele1AssignmentNamedElements();
 	}
@@ -126,7 +130,7 @@ protected class File_1_Assignment_namedElements extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("NamedElement")) {
+			if(param.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getType())) {
 				Solution s = new NamedElement_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -158,6 +162,7 @@ protected class Import_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prImport().eleGroup();
 	}
@@ -187,6 +192,7 @@ protected class Import_0_Keyword_import extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prImport().ele0KeywordImport();
 	}	
@@ -199,6 +205,7 @@ protected class Import_1_Assignment_importURI extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prImport().ele1AssignmentImportURI();
 	}
@@ -234,6 +241,7 @@ protected class NamedElement_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prNamedElement().eleAlternatives();
 	}
@@ -256,6 +264,7 @@ protected class NamedElement_0_RuleCall_Package extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prNamedElement().ele0ParserRuleCallPackage();
 	}
@@ -263,7 +272,7 @@ protected class NamedElement_0_RuleCall_Package extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Package_Group.class, current)) return null;
-		if(!current.isInstanceOf("Package")) return null;
+		if(!current.isInstanceOf(grammarAccess.prPackage().getRule().getType().getType())) return null;
 		return new Package_Group(current, this).firstSolution();
 	}
 }
@@ -275,6 +284,7 @@ protected class NamedElement_1_RuleCall_Type extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prNamedElement().ele1ParserRuleCallType();
 	}
@@ -282,7 +292,7 @@ protected class NamedElement_1_RuleCall_Type extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Type_Alternatives.class, current)) return null;
-		if(!current.isInstanceOf("Type")) return null;
+		if(!current.isInstanceOf(grammarAccess.prType().getRule().getType().getType())) return null;
 		return new Type_Alternatives(current, this).firstSolution();
 	}
 }
@@ -305,6 +315,7 @@ protected class Package_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prPackage().eleGroup();
 	}
@@ -334,6 +345,7 @@ protected class Package_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prPackage().ele0Group();
 	}
@@ -363,6 +375,7 @@ protected class Package_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prPackage().ele00Group();
 	}
@@ -392,6 +405,7 @@ protected class Package_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prPackage().ele000Group();
 	}
@@ -421,6 +435,7 @@ protected class Package_0_0_0_0_Keyword_package extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prPackage().ele0000KeywordPackage();
 	}	
@@ -433,6 +448,7 @@ protected class Package_0_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prPackage().ele0001AssignmentName();
 	}
@@ -460,6 +476,7 @@ protected class Package_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prPackage().ele001KeywordLeftCurlyBracket();
 	}	
@@ -473,6 +490,7 @@ protected class Package_0_1_Assignment_namedElements extends AssignmentToken  {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prPackage().ele01AssignmentNamedElements();
 	}
@@ -484,7 +502,7 @@ protected class Package_0_1_Assignment_namedElements extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("NamedElement")) {
+			if(param.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getType())) {
 				Solution s = new NamedElement_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -506,6 +524,7 @@ protected class Package_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prPackage().ele1KeywordRightCurlyBracket();
 	}	
@@ -529,6 +548,7 @@ protected class Type_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prType().eleAlternatives();
 	}
@@ -551,6 +571,7 @@ protected class Type_0_RuleCall_Entity extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prType().ele0ParserRuleCallEntity();
 	}
@@ -558,7 +579,7 @@ protected class Type_0_RuleCall_Entity extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Entity_Group.class, current)) return null;
-		if(!current.isInstanceOf("Entity")) return null;
+		if(!current.isInstanceOf(grammarAccess.prEntity().getRule().getType().getType())) return null;
 		return new Entity_Group(current, this).firstSolution();
 	}
 }
@@ -570,6 +591,7 @@ protected class Type_1_RuleCall_DataType extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prType().ele1ParserRuleCallDataType();
 	}
@@ -577,7 +599,7 @@ protected class Type_1_RuleCall_DataType extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(DataType_Group.class, current)) return null;
-		if(!current.isInstanceOf("DataType")) return null;
+		if(!current.isInstanceOf(grammarAccess.prDataType().getRule().getType().getType())) return null;
 		return new DataType_Group(current, this).firstSolution();
 	}
 }
@@ -600,6 +622,7 @@ protected class DataType_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prDataType().eleGroup();
 	}
@@ -629,6 +652,7 @@ protected class DataType_0_Keyword_datatype extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prDataType().ele0KeywordDatatype();
 	}	
@@ -641,6 +665,7 @@ protected class DataType_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prDataType().ele1AssignmentName();
 	}
@@ -676,6 +701,7 @@ protected class Entity_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEntity().eleGroup();
 	}
@@ -705,6 +731,7 @@ protected class Entity_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEntity().ele0Group();
 	}
@@ -734,6 +761,7 @@ protected class Entity_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEntity().ele00Group();
 	}
@@ -763,6 +791,7 @@ protected class Entity_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEntity().ele000Group();
 	}
@@ -792,6 +821,7 @@ protected class Entity_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEntity().ele0000Group();
 	}
@@ -821,6 +851,7 @@ protected class Entity_0_0_0_0_0_Keyword_entity extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEntity().ele00000KeywordEntity();
 	}	
@@ -833,6 +864,7 @@ protected class Entity_0_0_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEntity().ele00001AssignmentName();
 	}
@@ -858,6 +890,7 @@ protected class Entity_0_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEntity().ele0001Group();
 	}
@@ -887,6 +920,7 @@ protected class Entity_0_0_0_1_0_Keyword_extends extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEntity().ele00010KeywordExtends();
 	}	
@@ -899,6 +933,7 @@ protected class Entity_0_0_0_1_1_Assignment_superType extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEntity().ele00011AssignmentSuperType();
 	}
@@ -909,7 +944,7 @@ protected class Entity_0_0_0_1_1_Assignment_superType extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("superType");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Entity")) {
+			if(param.isInstanceOf(grammarAccess.prEntity().ele000110CrossReferenceEStringEntity().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prEntity().ele000110CrossReferenceEStringEntity(); 
 				return new Solution(obj);
@@ -928,6 +963,7 @@ protected class Entity_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEntity().ele001KeywordLeftCurlyBracket();
 	}	
@@ -941,6 +977,7 @@ protected class Entity_0_1_Assignment_features extends AssignmentToken  {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEntity().ele01AssignmentFeatures();
 	}
@@ -952,7 +989,7 @@ protected class Entity_0_1_Assignment_features extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Feature")) {
+			if(param.isInstanceOf(grammarAccess.prFeature().getRule().getType().getType())) {
 				Solution s = new Feature_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -974,6 +1011,7 @@ protected class Entity_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEntity().ele1KeywordRightCurlyBracket();
 	}	
@@ -997,6 +1035,7 @@ protected class Feature_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prFeature().eleAlternatives();
 	}
@@ -1019,6 +1058,7 @@ protected class Feature_0_RuleCall_StructuralFeature extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature();
 	}
@@ -1026,7 +1066,7 @@ protected class Feature_0_RuleCall_StructuralFeature extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(StructuralFeature_Alternatives.class, current)) return null;
-		if(!current.isInstanceOf("StructuralFeature")) return null;
+		if(!current.isInstanceOf(grammarAccess.prStructuralFeature().getRule().getType().getType())) return null;
 		return new StructuralFeature_Alternatives(current, this).firstSolution();
 	}
 }
@@ -1038,6 +1078,7 @@ protected class Feature_1_RuleCall_Operation extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prFeature().ele1ParserRuleCallOperation();
 	}
@@ -1045,7 +1086,7 @@ protected class Feature_1_RuleCall_Operation extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Operation_Group.class, current)) return null;
-		if(!current.isInstanceOf("Operation")) return null;
+		if(!current.isInstanceOf(grammarAccess.prOperation().getRule().getType().getType())) return null;
 		return new Operation_Group(current, this).firstSolution();
 	}
 }
@@ -1068,6 +1109,7 @@ protected class StructuralFeature_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prStructuralFeature().eleAlternatives();
 	}
@@ -1090,6 +1132,7 @@ protected class StructuralFeature_0_RuleCall_Attribute extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute();
 	}
@@ -1097,7 +1140,7 @@ protected class StructuralFeature_0_RuleCall_Attribute extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Attribute_Group.class, current)) return null;
-		if(!current.isInstanceOf("Attribute")) return null;
+		if(!current.isInstanceOf(grammarAccess.prAttribute().getRule().getType().getType())) return null;
 		return new Attribute_Group(current, this).firstSolution();
 	}
 }
@@ -1109,6 +1152,7 @@ protected class StructuralFeature_1_RuleCall_Reference extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prStructuralFeature().ele1ParserRuleCallReference();
 	}
@@ -1116,7 +1160,7 @@ protected class StructuralFeature_1_RuleCall_Reference extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Reference_Group.class, current)) return null;
-		if(!current.isInstanceOf("Reference")) return null;
+		if(!current.isInstanceOf(grammarAccess.prReference().getRule().getType().getType())) return null;
 		return new Reference_Group(current, this).firstSolution();
 	}
 }
@@ -1139,6 +1183,7 @@ protected class Attribute_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prAttribute().eleGroup();
 	}
@@ -1168,6 +1213,7 @@ protected class Attribute_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prAttribute().ele0Group();
 	}
@@ -1197,6 +1243,7 @@ protected class Attribute_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prAttribute().ele00Group();
 	}
@@ -1226,6 +1273,7 @@ protected class Attribute_0_0_0_Keyword_attr extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prAttribute().ele000KeywordAttr();
 	}	
@@ -1238,6 +1286,7 @@ protected class Attribute_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prAttribute().ele001AssignmentName();
 	}
@@ -1263,6 +1312,7 @@ protected class Attribute_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prAttribute().ele01KeywordColon();
 	}	
@@ -1276,6 +1326,7 @@ protected class Attribute_1_Assignment_type extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prAttribute().ele1AssignmentType();
 	}
@@ -1287,7 +1338,7 @@ protected class Attribute_1_Assignment_type extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("TypeRef")) {
+			if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getType())) {
 				Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1319,6 +1370,7 @@ protected class Reference_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prReference().eleGroup();
 	}
@@ -1348,6 +1400,7 @@ protected class Reference_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prReference().ele0Group();
 	}
@@ -1377,6 +1430,7 @@ protected class Reference_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prReference().ele00Group();
 	}
@@ -1406,6 +1460,7 @@ protected class Reference_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prReference().ele000Group();
 	}
@@ -1435,6 +1490,7 @@ protected class Reference_0_0_0_0_Keyword_ref extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prReference().ele0000KeywordRef();
 	}	
@@ -1447,6 +1503,7 @@ protected class Reference_0_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prReference().ele0001AssignmentName();
 	}
@@ -1472,6 +1529,7 @@ protected class Reference_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prReference().ele001KeywordColon();
 	}	
@@ -1485,6 +1543,7 @@ protected class Reference_0_1_Assignment_type extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prReference().ele01AssignmentType();
 	}
@@ -1496,7 +1555,7 @@ protected class Reference_0_1_Assignment_type extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("TypeRef")) {
+			if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getType())) {
 				Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1518,6 +1577,7 @@ protected class Reference_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prReference().ele1Group();
 	}
@@ -1547,6 +1607,7 @@ protected class Reference_1_0_Keyword_opposite extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prReference().ele10KeywordOpposite();
 	}	
@@ -1559,6 +1620,7 @@ protected class Reference_1_1_Assignment_opposite extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prReference().ele11AssignmentOpposite();
 	}
@@ -1569,7 +1631,7 @@ protected class Reference_1_1_Assignment_opposite extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("opposite");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Reference")) {
+			if(param.isInstanceOf(grammarAccess.prReference().ele110CrossReferenceEStringReference().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prReference().ele110CrossReferenceEStringReference(); 
 				return new Solution(obj);
@@ -1598,6 +1660,7 @@ protected class Operation_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prOperation().eleGroup();
 	}
@@ -1627,6 +1690,7 @@ protected class Operation_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prOperation().ele0Group();
 	}
@@ -1656,6 +1720,7 @@ protected class Operation_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prOperation().ele00Group();
 	}
@@ -1685,6 +1750,7 @@ protected class Operation_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prOperation().ele000Group();
 	}
@@ -1714,6 +1780,7 @@ protected class Operation_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prOperation().ele0000Group();
 	}
@@ -1743,6 +1810,7 @@ protected class Operation_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prOperation().ele00000Group();
 	}
@@ -1772,6 +1840,7 @@ protected class Operation_0_0_0_0_0_0_Keyword_op extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prOperation().ele000000KeywordOp();
 	}	
@@ -1784,6 +1853,7 @@ protected class Operation_0_0_0_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prOperation().ele000001AssignmentName();
 	}
@@ -1809,6 +1879,7 @@ protected class Operation_0_0_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prOperation().ele00001KeywordLeftParenthesis();
 	}	
@@ -1822,6 +1893,7 @@ protected class Operation_0_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prOperation().ele0001Group();
 	}
@@ -1851,6 +1923,7 @@ protected class Operation_0_0_0_1_0_Assignment_params extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prOperation().ele00010AssignmentParams();
 	}
@@ -1862,7 +1935,7 @@ protected class Operation_0_0_0_1_0_Assignment_params extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Parameter")) {
+			if(param.isInstanceOf(grammarAccess.prParameter().getRule().getType().getType())) {
 				Solution s = new Parameter_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1883,6 +1956,7 @@ protected class Operation_0_0_0_1_1_Group extends GroupToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prOperation().ele00011Group();
 	}
@@ -1912,6 +1986,7 @@ protected class Operation_0_0_0_1_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prOperation().ele000110KeywordComma();
 	}	
@@ -1924,6 +1999,7 @@ protected class Operation_0_0_0_1_1_1_Assignment_params extends AssignmentToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prOperation().ele000111AssignmentParams();
 	}
@@ -1935,7 +2011,7 @@ protected class Operation_0_0_0_1_1_1_Assignment_params extends AssignmentToken
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Parameter")) {
+			if(param.isInstanceOf(grammarAccess.prParameter().getRule().getType().getType())) {
 				Solution s = new Parameter_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1959,6 +2035,7 @@ protected class Operation_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prOperation().ele001KeywordRightParenthesis();
 	}	
@@ -1972,6 +2049,7 @@ protected class Operation_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prOperation().ele01KeywordColon();
 	}	
@@ -1985,6 +2063,7 @@ protected class Operation_1_Assignment_type extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prOperation().ele1AssignmentType();
 	}
@@ -1996,7 +2075,7 @@ protected class Operation_1_Assignment_type extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("TypeRef")) {
+			if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getType())) {
 				Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -2028,6 +2107,7 @@ protected class Parameter_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prParameter().eleGroup();
 	}
@@ -2057,6 +2137,7 @@ protected class Parameter_0_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prParameter().ele0AssignmentName();
 	}
@@ -2081,6 +2162,7 @@ protected class Parameter_1_Assignment_type extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prParameter().ele1AssignmentType();
 	}
@@ -2092,7 +2174,7 @@ protected class Parameter_1_Assignment_type extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("TypeRef")) {
+			if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getType())) {
 				Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -2124,6 +2206,7 @@ protected class TypedElement_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prTypedElement().eleAlternatives();
 	}
@@ -2146,6 +2229,7 @@ protected class TypedElement_0_RuleCall_Feature extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prTypedElement().ele0ParserRuleCallFeature();
 	}
@@ -2153,7 +2237,7 @@ protected class TypedElement_0_RuleCall_Feature extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Feature_Alternatives.class, current)) return null;
-		if(!current.isInstanceOf("Feature")) return null;
+		if(!current.isInstanceOf(grammarAccess.prFeature().getRule().getType().getType())) return null;
 		return new Feature_Alternatives(current, this).firstSolution();
 	}
 }
@@ -2165,6 +2249,7 @@ protected class TypedElement_1_RuleCall_Parameter extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prTypedElement().ele1ParserRuleCallParameter();
 	}
@@ -2172,7 +2257,7 @@ protected class TypedElement_1_RuleCall_Parameter extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Parameter_Group.class, current)) return null;
-		if(!current.isInstanceOf("Parameter")) return null;
+		if(!current.isInstanceOf(grammarAccess.prParameter().getRule().getType().getType())) return null;
 		return new Parameter_Group(current, this).firstSolution();
 	}
 }
@@ -2195,6 +2280,7 @@ protected class TypeRef_Assignment_referenced extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prTypeRef().eleAssignmentReferenced();
 	}
@@ -2205,7 +2291,7 @@ protected class TypeRef_Assignment_referenced extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("referenced");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("Type")) {
+			if(param.isInstanceOf(grammarAccess.prTypeRef().ele0CrossReferenceEStringType().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prTypeRef().ele0CrossReferenceEStringType(); 
 				return new Solution(obj);
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelMetamodelAccess.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelMetamodelAccess.java
index 58f904b..1e7eaac 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelMetamodelAccess.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelMetamodelAccess.java
@@ -9,42 +9,42 @@ import org.eclipse.xtext.parser.BaseEPackageAccess;
 
 public class DomainmodelMetamodelAccess extends BaseEPackageAccess implements IMetamodelAccess {
 
-{
-
+	protected static final String DOMAINMODEL_NS_URI = "http://www.example.xtext/Domainmodel";
+	
+	
+	public static void init() {
 		if (!EPackage.Registry.INSTANCE.containsKey(DOMAINMODEL_NS_URI))
-			EPackage.Registry.INSTANCE.put(DOMAINMODEL_NS_URI, loadEcoreFile(getClass().getClassLoader(), "classpath:/org/eclipse/xtext/example/domainmodel.ecore"));
+			EPackage.Registry.INSTANCE.put(DOMAINMODEL_NS_URI, loadEcoreFile(DomainmodelMetamodelAccess.class.getClassLoader(), "classpath:/org/eclipse/xtext/example/domainmodel.ecore"));
+	}
 
-}
+	static {
+		org.eclipse.xtext.builtin.services.XtextBuiltinMetamodelAccess.init();
+		init();
+	}
 
 	private EPackage[] generated = new EPackage[] {
-		
 		getDomainmodelEPackage()
-		
-		};
+	};
 
 	public EPackage[] getGeneratedEPackages() {
 		return generated;
 	}
 
 	private EPackage[] referenced = new EPackage[] {
-		
 		BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore")
-		
-		};
+	};
+	
 	public EPackage[] getReferencedEPackages() {
 		return referenced;
 	}
 	
 	private EPackage[] all = new EPackage[] {
 	    getDomainmodelEPackage(),BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore")
-		};
+	};
 	
 	public EPackage[] getAllEPackages() {
 		return all;
 	}
-
-	
-	protected static final String DOMAINMODEL_NS_URI = "http://www.example.xtext/Domainmodel";
 	
 	protected EPackage getDomainmodelEPackage() {	
 		return EPackage.Registry.INSTANCE.getEPackage(DOMAINMODEL_NS_URI);
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g
index 1f35053..eef39be 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g
@@ -90,7 +90,7 @@ ruleEcoreDsl returns [EObject current=null]
 	    lv_imports_0=ruleImportStatementDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EcoreDsl");
+	            $current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -111,7 +111,7 @@ ruleEcoreDsl returns [EObject current=null]
 	    lv_package_1=ruleEPackageDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EcoreDsl");
+	            $current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -159,7 +159,7 @@ ruleImportStatementDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("ImportStatementDecl");
+	            $current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -183,7 +183,7 @@ ruleImportStatementDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("ImportStatementDecl");
+	            $current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -230,7 +230,7 @@ ruleEPackageDecl returns [EObject current=null]
 	    lv_eAnnotations_0=ruleEAnnotationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EPackage");
+	            $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -255,7 +255,7 @@ ruleEPackageDecl returns [EObject current=null]
 	    lv_name_2=ruleQID 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EPackage");
+	            $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -284,7 +284,7 @@ ruleEPackageDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EPackage");
+	            $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -312,7 +312,7 @@ ruleEPackageDecl returns [EObject current=null]
 	    lv_nsPrefix_8=ruleQID 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EPackage");
+	            $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -337,7 +337,7 @@ ruleEPackageDecl returns [EObject current=null]
 	    lv_eSubpackages_10=ruleSubEPackageDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EPackage");
+	            $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -359,7 +359,7 @@ ruleEPackageDecl returns [EObject current=null]
 	    lv_eClassifiers_11=ruleEClassifierDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EPackage");
+	            $current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -407,7 +407,7 @@ ruleSubEPackageDecl returns [EObject current=null]
 	    lv_eAnnotations_0=ruleEAnnotationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EPackage");
+	            $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -432,7 +432,7 @@ ruleSubEPackageDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EPackage");
+	            $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -456,7 +456,7 @@ ruleSubEPackageDecl returns [EObject current=null]
 	    lv_eSubpackages_4=ruleSubEPackageDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EPackage");
+	            $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -478,7 +478,7 @@ ruleSubEPackageDecl returns [EObject current=null]
 	    lv_eClassifiers_5=ruleEClassifierDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EPackage");
+	            $current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -568,7 +568,7 @@ ruleEDataTypeDecl returns [EObject current=null]
 	    lv_eAnnotations_0=ruleEAnnotationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EDataType");
+	            $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -590,7 +590,7 @@ ruleEDataTypeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EDataType");
+	            $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -614,7 +614,7 @@ ruleEDataTypeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EDataType");
+	            $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -638,7 +638,7 @@ ruleEDataTypeDecl returns [EObject current=null]
 	    lv_instanceClassName_5=ruleSTRING_OR_QID 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EDataType");
+	            $current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -700,7 +700,7 @@ ruleEAnnotationDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAnnotation");
+	            $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -716,7 +716,7 @@ ruleEAnnotationDecl returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("EAnnotation");
+	            $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -740,7 +740,7 @@ ruleEAnnotationDecl returns [EObject current=null]
 	    lv_contents_4=ruleMapEntrySuper 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAnnotation");
+	            $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -765,7 +765,7 @@ ruleEAnnotationDecl returns [EObject current=null]
 	    lv_contents_6=ruleMapEntrySuper 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAnnotation");
+	            $current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -813,7 +813,7 @@ ruleEClassDecl returns [EObject current=null]
 	    lv_eAnnotations_0=ruleEAnnotationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -835,7 +835,7 @@ ruleEClassDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -856,7 +856,7 @@ ruleEClassDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -881,7 +881,7 @@ ruleEClassDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -905,7 +905,7 @@ ruleEClassDecl returns [EObject current=null]
 	    lv_eTypeParameters_6=ruleETypeParameterDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -930,7 +930,7 @@ ruleEClassDecl returns [EObject current=null]
 	    lv_eTypeParameters_8=ruleETypeParameterDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -959,7 +959,7 @@ ruleEClassDecl returns [EObject current=null]
 	    lv_eGenericSuperTypes_11=ruleEGenericTypeReferenceDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -984,7 +984,7 @@ ruleEClassDecl returns [EObject current=null]
 	    lv_eGenericSuperTypes_13=ruleEGenericTypeReferenceDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1009,7 +1009,7 @@ ruleEClassDecl returns [EObject current=null]
 	    lv_instanceClassName_15=ruleSTRING_OR_QID 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1034,7 +1034,7 @@ ruleEClassDecl returns [EObject current=null]
 	    lv_eStructuralFeatures_17=ruleEStructuralFeatureDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1056,7 +1056,7 @@ ruleEClassDecl returns [EObject current=null]
 	    lv_eOperations_18=ruleEOperationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EClass");
+	            $current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1146,7 +1146,7 @@ ruleEAttributeDecl returns [EObject current=null]
 	    lv_eAnnotations_0=ruleEAnnotationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1168,7 +1168,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1190,7 +1190,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1212,7 +1212,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1234,7 +1234,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1256,7 +1256,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1278,7 +1278,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1300,7 +1300,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1322,7 +1322,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1346,7 +1346,7 @@ ruleEAttributeDecl returns [EObject current=null]
 	    lv_eGenericType_10=ruleEGenericTypeReferenceDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1371,7 +1371,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1395,7 +1395,7 @@ ruleEAttributeDecl returns [EObject current=null]
 	    lv_upperBound_14=ruleSINT 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1420,7 +1420,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1444,7 +1444,7 @@ ruleEAttributeDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EAttribute");
+	            $current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1491,7 +1491,7 @@ ruleEReferenceDecl returns [EObject current=null]
 	    lv_eAnnotations_0=ruleEAnnotationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1513,7 +1513,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1535,7 +1535,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1557,7 +1557,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1579,7 +1579,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1601,7 +1601,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1623,7 +1623,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1645,7 +1645,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1667,7 +1667,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1688,7 +1688,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1713,7 +1713,7 @@ ruleEReferenceDecl returns [EObject current=null]
 	    lv_eGenericType_11=ruleEGenericTypeReferenceDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1738,7 +1738,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1762,7 +1762,7 @@ ruleEReferenceDecl returns [EObject current=null]
 	    lv_upperBound_15=ruleSINT 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1787,7 +1787,7 @@ ruleEReferenceDecl returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -1807,7 +1807,7 @@ ruleEReferenceDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EReference");
+	            $current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1854,7 +1854,7 @@ ruleEEnumDecl returns [EObject current=null]
 	    lv_eAnnotations_0=ruleEAnnotationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EEnum");
+	            $current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1879,7 +1879,7 @@ ruleEEnumDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EEnum");
+	            $current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1903,7 +1903,7 @@ ruleEEnumDecl returns [EObject current=null]
 	    lv_eLiterals_4=ruleEEnumLiteralDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EEnum");
+	            $current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1951,7 +1951,7 @@ ruleEEnumLiteralDecl returns [EObject current=null]
 	    lv_eAnnotations_0=ruleEAnnotationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EEnumLiteral");
+	            $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -1972,7 +1972,7 @@ ruleEEnumLiteralDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EEnumLiteral");
+	            $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -1996,7 +1996,7 @@ ruleEEnumLiteralDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EEnumLiteral");
+	            $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -2016,7 +2016,7 @@ ruleEEnumLiteralDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EEnumLiteral");
+	            $current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -2063,7 +2063,7 @@ ruleETypeParameterDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("ETypeParameter");
+	            $current = factory.create(grammarAccess.prETypeParameterDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -2087,7 +2087,7 @@ ruleETypeParameterDecl returns [EObject current=null]
 	    lv_eBounds_2=ruleEGenericTypeDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("ETypeParameter");
+	            $current = factory.create(grammarAccess.prETypeParameterDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2127,7 +2127,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("EGenericType");
+	            $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -2151,7 +2151,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null]
 	    lv_eTypeArguments_2=ruleEGenericTypeDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EGenericType");
+	            $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2176,7 +2176,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null]
 	    lv_eTypeArguments_4=ruleEGenericTypeDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EGenericType");
+	            $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2202,7 +2202,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("EGenericType");
+	            $current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -2241,7 +2241,7 @@ ruleEGenericTypeDecl returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("EGenericType");
+	            $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -2265,7 +2265,7 @@ ruleEGenericTypeDecl returns [EObject current=null]
 	    lv_eTypeArguments_2=ruleEGenericTypeDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EGenericType");
+	            $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2290,7 +2290,7 @@ ruleEGenericTypeDecl returns [EObject current=null]
 	    lv_eTypeArguments_4=ruleEGenericTypeDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EGenericType");
+	            $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2316,7 +2316,7 @@ ruleEGenericTypeDecl returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("EGenericType");
+	            $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -2345,7 +2345,7 @@ ruleEGenericTypeDecl returns [EObject current=null]
 	    lv_eUpperBound_10=ruleEGenericTypeDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EGenericType");
+	            $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2371,7 +2371,7 @@ ruleEGenericTypeDecl returns [EObject current=null]
 	    lv_eLowerBound_12=ruleEGenericTypeDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EGenericType");
+	            $current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2415,7 +2415,7 @@ ruleEOperationDecl returns [EObject current=null]
 	    lv_eAnnotations_0=ruleEAnnotationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2437,7 +2437,7 @@ ruleEOperationDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -2459,7 +2459,7 @@ ruleEOperationDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -2483,7 +2483,7 @@ ruleEOperationDecl returns [EObject current=null]
 	    lv_eGenericType_4=ruleEGenericTypeReferenceDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2509,7 +2509,7 @@ ruleEOperationDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -2533,7 +2533,7 @@ ruleEOperationDecl returns [EObject current=null]
 	    lv_eTypeParameters_8=ruleETypeParameterDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2558,7 +2558,7 @@ ruleEOperationDecl returns [EObject current=null]
 	    lv_eTypeParameters_10=ruleETypeParameterDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2587,7 +2587,7 @@ ruleEOperationDecl returns [EObject current=null]
 	    lv_eParameters_13=ruleEParameterDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2612,7 +2612,7 @@ ruleEOperationDecl returns [EObject current=null]
 	    lv_eParameters_15=ruleEParameterDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2641,7 +2641,7 @@ ruleEOperationDecl returns [EObject current=null]
 	    lv_eGenericExceptions_18=ruleEGenericTypeReferenceDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2666,7 +2666,7 @@ ruleEOperationDecl returns [EObject current=null]
 	    lv_eGenericExceptions_20=ruleEGenericTypeReferenceDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EOperation");
+	            $current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2714,7 +2714,7 @@ ruleEParameterDecl returns [EObject current=null]
 	    lv_eAnnotations_0=ruleEAnnotationDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EParameter");
+	            $current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2735,7 +2735,7 @@ ruleEParameterDecl returns [EObject current=null]
 	    lv_eGenericType_1=ruleEGenericTypeReferenceDecl 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EParameter");
+	            $current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -2756,7 +2756,7 @@ ruleEParameterDecl returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("EParameter");
+	            $current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -2831,7 +2831,7 @@ ruleMapEntry returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("MapEntry");
+	            $current = factory.create(grammarAccess.prMapEntry().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -2855,7 +2855,7 @@ ruleMapEntry returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("MapEntry");
+	            $current = factory.create(grammarAccess.prMapEntry().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
index 487aae7..168a779 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
@@ -142,7 +142,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EcoreDsl");
+            	    	            current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -174,7 +174,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("EcoreDsl");
+            	            current = factory.create(grammarAccess.prEcoreDsl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -293,7 +293,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     	
 
                     	        if (current==null) {
-                    	            current = factory.create("ImportStatementDecl");
+                    	            current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -329,7 +329,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("ImportStatementDecl");
+            	            current = factory.create(grammarAccess.prImportStatementDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -486,7 +486,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EPackage");
+            	    	            current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -525,7 +525,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("EPackage");
+            	            current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -566,7 +566,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("EPackage");
+            	            current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -608,7 +608,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("EPackage");
+            	            current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -653,7 +653,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EPackage");
+            	    	            current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -685,7 +685,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EPackage");
+            	    	            current = factory.create(grammarAccess.prEPackageDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -830,7 +830,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EPackage");
+            	    	            current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -867,7 +867,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("EPackage");
+            	            current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -911,7 +911,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EPackage");
+            	    	            current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -943,7 +943,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EPackage");
+            	    	            current = factory.create(grammarAccess.prSubEPackageDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -1198,7 +1198,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create("EDataType");
+                    	    	            current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -1236,7 +1236,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                                 
 
                             	        if (current==null) {
-                            	            current = factory.create("EDataType");
+                            	            current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType());
                             	            associateNodeWithAstElement(currentNode, current);
                             	        }
                             	        
@@ -1281,7 +1281,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     	
 
                     	        if (current==null) {
-                    	            current = factory.create("EDataType");
+                    	            current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -1316,7 +1316,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create("EDataType");
+                    	            current = factory.create(grammarAccess.prEDataTypeDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -1469,7 +1469,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("EAnnotation");
+            	            current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1498,7 +1498,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     {
 
                     			if (current==null) {
-                    	            current = factory.create("EAnnotation");
+                    	            current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                             
@@ -1534,7 +1534,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("EAnnotation");
+            	            current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -1582,7 +1582,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EAnnotation");
+            	    	            current = factory.create(grammarAccess.prEAnnotationDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -1751,7 +1751,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EClass");
+            	    	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -1789,7 +1789,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                         
 
                     	        if (current==null) {
-                    	            current = factory.create("EClass");
+                    	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -1838,7 +1838,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                         
 
                     	        if (current==null) {
-                    	            current = factory.create("EClass");
+                    	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -1880,7 +1880,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("EClass");
+            	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1929,7 +1929,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create("EClass");
+                    	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -1977,7 +1977,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create("EClass");
+                    	    	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -2046,7 +2046,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create("EClass");
+                    	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -2094,7 +2094,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create("EClass");
+                    	    	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -2153,7 +2153,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create("EClass");
+                    	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -2204,7 +2204,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EClass");
+            	    	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -2236,7 +2236,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EClass");
+            	    	            current = factory.create(grammarAccess.prEClassDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -2508,7 +2508,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EAttribute");
+            	    	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -2676,7 +2676,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                                                        
 
             	                                                    	        if (current==null) {
-            	                                                    	            current = factory.create("EAttribute");
+            	                                                    	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	                                                    	            associateNodeWithAstElement(currentNode, current);
             	                                                    	        }
             	                                                    	        
@@ -2705,7 +2705,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                                                        
 
             	                                                    	        if (current==null) {
-            	                                                    	            current = factory.create("EAttribute");
+            	                                                    	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	                                                    	            associateNodeWithAstElement(currentNode, current);
             	                                                    	        }
             	                                                    	        
@@ -2740,7 +2740,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                                                
 
             	                                            	        if (current==null) {
-            	                                            	            current = factory.create("EAttribute");
+            	                                            	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	                                            	            associateNodeWithAstElement(currentNode, current);
             	                                            	        }
             	                                            	        
@@ -2775,7 +2775,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                                        
 
             	                                    	        if (current==null) {
-            	                                    	            current = factory.create("EAttribute");
+            	                                    	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	                                    	            associateNodeWithAstElement(currentNode, current);
             	                                    	        }
             	                                    	        
@@ -2810,7 +2810,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                                
 
             	                            	        if (current==null) {
-            	                            	            current = factory.create("EAttribute");
+            	                            	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	                            	            associateNodeWithAstElement(currentNode, current);
             	                            	        }
             	                            	        
@@ -2845,7 +2845,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                        
 
             	                    	        if (current==null) {
-            	                    	            current = factory.create("EAttribute");
+            	                    	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	                    	            associateNodeWithAstElement(currentNode, current);
             	                    	        }
             	                    	        
@@ -2880,7 +2880,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                
 
             	            	        if (current==null) {
-            	            	            current = factory.create("EAttribute");
+            	            	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	            	            associateNodeWithAstElement(currentNode, current);
             	            	        }
             	            	        
@@ -2915,7 +2915,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	        
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EAttribute");
+            	    	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode, current);
             	    	        }
             	    	        
@@ -2959,7 +2959,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("EAttribute");
+            	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -3007,7 +3007,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     	
 
                     	        if (current==null) {
-                    	            current = factory.create("EAttribute");
+                    	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -3050,7 +3050,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                             	        if (current==null) {
-                            	            current = factory.create("EAttribute");
+                            	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
                             	            associateNodeWithAstElement(currentNode.getParent(), current);
                             	        }
                             	        
@@ -3096,7 +3096,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("EAttribute");
+            	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -3137,7 +3137,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     	
 
                     	        if (current==null) {
-                    	            current = factory.create("EAttribute");
+                    	            current = factory.create(grammarAccess.prEAttributeDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -3294,7 +3294,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EReference");
+            	    	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -3462,7 +3462,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                                                        
 
             	                                                    	        if (current==null) {
-            	                                                    	            current = factory.create("EReference");
+            	                                                    	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	                                                    	            associateNodeWithAstElement(currentNode, current);
             	                                                    	        }
             	                                                    	        
@@ -3491,7 +3491,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                                                        
 
             	                                                    	        if (current==null) {
-            	                                                    	            current = factory.create("EReference");
+            	                                                    	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	                                                    	            associateNodeWithAstElement(currentNode, current);
             	                                                    	        }
             	                                                    	        
@@ -3526,7 +3526,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                                                
 
             	                                            	        if (current==null) {
-            	                                            	            current = factory.create("EReference");
+            	                                            	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	                                            	            associateNodeWithAstElement(currentNode, current);
             	                                            	        }
             	                                            	        
@@ -3561,7 +3561,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                                        
 
             	                                    	        if (current==null) {
-            	                                    	            current = factory.create("EReference");
+            	                                    	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	                                    	            associateNodeWithAstElement(currentNode, current);
             	                                    	        }
             	                                    	        
@@ -3596,7 +3596,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                                
 
             	                            	        if (current==null) {
-            	                            	            current = factory.create("EReference");
+            	                            	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	                            	            associateNodeWithAstElement(currentNode, current);
             	                            	        }
             	                            	        
@@ -3631,7 +3631,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                        
 
             	                    	        if (current==null) {
-            	                    	            current = factory.create("EReference");
+            	                    	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	                    	            associateNodeWithAstElement(currentNode, current);
             	                    	        }
             	                    	        
@@ -3666,7 +3666,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	                
 
             	            	        if (current==null) {
-            	            	            current = factory.create("EReference");
+            	            	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	            	            associateNodeWithAstElement(currentNode, current);
             	            	        }
             	            	        
@@ -3701,7 +3701,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	        
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EReference");
+            	    	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode, current);
             	    	        }
             	    	        
@@ -3756,7 +3756,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                         
 
                     	        if (current==null) {
-                    	            current = factory.create("EReference");
+                    	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -3800,7 +3800,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("EReference");
+            	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -3848,7 +3848,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     	
 
                     	        if (current==null) {
-                    	            current = factory.create("EReference");
+                    	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -3891,7 +3891,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                             	        if (current==null) {
-                            	            current = factory.create("EReference");
+                            	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
                             	            associateNodeWithAstElement(currentNode.getParent(), current);
                             	        }
                             	        
@@ -3947,7 +3947,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     {
 
                     			if (current==null) {
-                    	            current = factory.create("EReference");
+                    	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                             
@@ -3977,7 +3977,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("EReference");
+            	            current = factory.create(grammarAccess.prEReferenceDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -4110,7 +4110,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EEnum");
+            	    	            current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -4147,7 +4147,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("EEnum");
+            	            current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -4195,7 +4195,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EEnum");
+            	    	            current = factory.create(grammarAccess.prEEnumDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -4336,7 +4336,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EEnumLiteral");
+            	    	            current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -4366,7 +4366,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("EEnumLiteral");
+            	            current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -4407,7 +4407,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     	
 
                     	        if (current==null) {
-                    	            current = factory.create("EEnumLiteral");
+                    	            current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -4447,7 +4447,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     	
 
                     	        if (current==null) {
-                    	            current = factory.create("EEnumLiteral");
+                    	            current = factory.create(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -4555,7 +4555,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("ETypeParameter");
+            	            current = factory.create(grammarAccess.prETypeParameterDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -4595,7 +4595,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create("ETypeParameter");
+                    	            current = factory.create(grammarAccess.prETypeParameterDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -4716,7 +4716,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     {
 
                     			if (current==null) {
-                    	            current = factory.create("EGenericType");
+                    	            current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                             
@@ -4760,7 +4760,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                             	        if (current==null) {
-                            	            current = factory.create("EGenericType");
+                            	            current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType());
                             	            associateNodeWithAstElement(currentNode.getParent(), current);
                             	        }
                             	        
@@ -4808,7 +4808,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                             	    	        if (current==null) {
-                            	    	            current = factory.create("EGenericType");
+                            	    	            current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType());
                             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                             	    	        }
                             	    	        
@@ -4865,7 +4865,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                     {
 
                     			if (current==null) {
-                    	            current = factory.create("EGenericType");
+                    	            current = factory.create(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                             
@@ -5007,7 +5007,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                             {
 
                             			if (current==null) {
-                            	            current = factory.create("EGenericType");
+                            	            current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
                             	            associateNodeWithAstElement(currentNode, current);
                             	        }
                                     
@@ -5051,7 +5051,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                                     	        if (current==null) {
-                                    	            current = factory.create("EGenericType");
+                                    	            current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
                                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                                     	        }
                                     	        
@@ -5099,7 +5099,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                                     	    	        if (current==null) {
-                                    	    	            current = factory.create("EGenericType");
+                                    	    	            current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
                                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                                     	    	        }
                                     	    	        
@@ -5156,7 +5156,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
                             {
 
                             			if (current==null) {
-                            	            current = factory.create("EGenericType");
+                            	            current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
                             	            associateNodeWithAstElement(currentNode, current);
                             	        }
                                     
@@ -5228,7 +5228,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                             	        if (current==null) {
-                            	            current = factory.create("EGenericType");
+                            	            current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
                             	            associateNodeWithAstElement(currentNode.getParent(), current);
                             	        }
                             	        
@@ -5270,7 +5270,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                             	        if (current==null) {
-                            	            current = factory.create("EGenericType");
+                            	            current = factory.create(grammarAccess.prEGenericTypeDecl().getRule().getType().getType());
                             	            associateNodeWithAstElement(currentNode.getParent(), current);
                             	        }
                             	        
@@ -5441,7 +5441,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EOperation");
+            	    	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -5489,7 +5489,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	        
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EOperation");
+            	    	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode, current);
             	    	        }
             	    	        
@@ -5518,7 +5518,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	        
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EOperation");
+            	    	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode, current);
             	    	        }
             	    	        
@@ -5582,7 +5582,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create("EOperation");
+                    	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -5625,7 +5625,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("EOperation");
+            	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -5674,7 +5674,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create("EOperation");
+                    	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -5722,7 +5722,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create("EOperation");
+                    	    	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -5791,7 +5791,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create("EOperation");
+                    	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -5836,7 +5836,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create("EOperation");
+                    	    	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -5905,7 +5905,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create("EOperation");
+                    	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -5953,7 +5953,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create("EOperation");
+                    	    	            current = factory.create(grammarAccess.prEOperationDecl().getRule().getType().getType());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -6093,7 +6093,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("EParameter");
+            	    	            current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -6125,7 +6125,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create("EParameter");
+            	            current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -6152,7 +6152,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("EParameter");
+            	            current = factory.create(grammarAccess.prEParameterDecl().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -6331,7 +6331,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("MapEntry");
+            	            current = factory.create(grammarAccess.prMapEntry().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -6361,7 +6361,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("MapEntry");
+            	            current = factory.create(grammarAccess.prMapEntry().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java
index 63c91db..b6b0eb8 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAnnotationDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EAnnotationDeclElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -231,7 +234,6 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public EAnnotationDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEAnnotationDecl()
 		return rule;
 	}
 	
@@ -240,13 +242,13 @@ public final class EcoreDslEAnnotationDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EAnnotation";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java
index c83e800..23b1011 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEAttributeDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EAttributeDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAnnotationDeclConsumer;
@@ -525,7 +528,6 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public EAttributeDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEAttributeDecl()
 		return rule;
 	}
 	
@@ -534,13 +536,13 @@ public final class EcoreDslEAttributeDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EAttribute";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAnnotationDeclConsumer(INonTerminalConsumer eAnnotationDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java
index a289364..fb008a9 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EClassDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAnnotationDeclConsumer;
@@ -606,7 +609,6 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public EClassDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEClassDecl()
 		return rule;
 	}
 	
@@ -615,13 +617,13 @@ public final class EcoreDslEClassDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EClass";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAnnotationDeclConsumer(INonTerminalConsumer eAnnotationDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java
index cf55f18..507ec83 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEClassifierDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EClassifierDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEClassDeclConsumer;
@@ -64,7 +67,6 @@ public final class EcoreDslEClassifierDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public EClassifierDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEClassifierDecl()
 		return rule;
 	}
 	
@@ -73,13 +75,13 @@ public final class EcoreDslEClassifierDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EClassifier";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEClassDeclConsumer(INonTerminalConsumer eClassDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java
index 190a0fc..135ada7 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEDataTypeDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EDataTypeDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAnnotationDeclConsumer;
@@ -218,7 +221,6 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public EDataTypeDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEDataTypeDecl()
 		return rule;
 	}
 	
@@ -227,13 +229,13 @@ public final class EcoreDslEDataTypeDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EDataType";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAnnotationDeclConsumer(INonTerminalConsumer eAnnotationDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java
index 0708bfb..7c45b9b 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EEnumDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAnnotationDeclConsumer;
@@ -191,7 +194,6 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public EEnumDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEEnumDecl()
 		return rule;
 	}
 	
@@ -200,13 +202,13 @@ public final class EcoreDslEEnumDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EEnum";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAnnotationDeclConsumer(INonTerminalConsumer eAnnotationDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java
index a2999f4..90fdc90 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEEnumLiteralDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EEnumLiteralDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAnnotationDeclConsumer;
@@ -214,7 +217,6 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer
 	}
 
 	public EEnumLiteralDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEEnumLiteralDecl()
 		return rule;
 	}
 	
@@ -223,13 +225,13 @@ public final class EcoreDslEEnumLiteralDeclConsumer extends NonTerminalConsumer
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EEnumLiteral";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAnnotationDeclConsumer(INonTerminalConsumer eAnnotationDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java
index 020e245..52dc8f9 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EGenericTypeDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEGenericTypeDeclConsumer;
@@ -437,7 +440,6 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 
 	public EGenericTypeDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEGenericTypeDecl()
 		return rule;
 	}
 	
@@ -446,13 +448,13 @@ public final class EcoreDslEGenericTypeDeclConsumer extends NonTerminalConsumer
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EGenericType";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEGenericTypeDeclConsumer(INonTerminalConsumer eGenericTypeDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java
index c47e2c9..d6dcd95 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEGenericTypeReferenceDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EGenericTypeReferenceDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEGenericTypeDeclConsumer;
@@ -283,7 +286,6 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 
 	public EGenericTypeReferenceDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEGenericTypeReferenceDecl()
 		return rule;
 	}
 	
@@ -292,13 +294,13 @@ public final class EcoreDslEGenericTypeReferenceDeclConsumer extends NonTerminal
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EGenericType";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEGenericTypeDeclConsumer(INonTerminalConsumer eGenericTypeDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java
index 59dae88..e74aa5f 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEOperationDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EOperationDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAnnotationDeclConsumer;
@@ -655,7 +658,6 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public EOperationDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEOperationDecl()
 		return rule;
 	}
 	
@@ -664,13 +666,13 @@ public final class EcoreDslEOperationDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EOperation";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAnnotationDeclConsumer(INonTerminalConsumer eAnnotationDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java
index 95491d6..bdc4ab3 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEPackageDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EPackageDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAnnotationDeclConsumer;
@@ -301,7 +304,6 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public EPackageDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEPackageDecl()
 		return rule;
 	}
 	
@@ -310,13 +312,13 @@ public final class EcoreDslEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EPackage";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAnnotationDeclConsumer(INonTerminalConsumer eAnnotationDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java
index 09bc4c7..8ad1d18 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEParameterDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EParameterDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAnnotationDeclConsumer;
@@ -115,7 +118,6 @@ public final class EcoreDslEParameterDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public EParameterDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEParameterDecl()
 		return rule;
 	}
 	
@@ -124,13 +126,13 @@ public final class EcoreDslEParameterDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EParameter";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAnnotationDeclConsumer(INonTerminalConsumer eAnnotationDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java
index a24d91b..1c25d29 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEReferenceDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EReferenceDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAnnotationDeclConsumer;
@@ -553,7 +556,6 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public EReferenceDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEReferenceDecl()
 		return rule;
 	}
 	
@@ -562,13 +564,13 @@ public final class EcoreDslEReferenceDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EReference";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAnnotationDeclConsumer(INonTerminalConsumer eAnnotationDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java
index 2ca6f99..6760966 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEStructuralFeatureDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EStructuralFeatureDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAttributeDeclConsumer;
@@ -64,7 +67,6 @@ public final class EcoreDslEStructuralFeatureDeclConsumer extends NonTerminalCon
 	}
 
 	public EStructuralFeatureDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEStructuralFeatureDecl()
 		return rule;
 	}
 	
@@ -73,13 +75,13 @@ public final class EcoreDslEStructuralFeatureDeclConsumer extends NonTerminalCon
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EStructuralFeature";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAttributeDeclConsumer(INonTerminalConsumer eAttributeDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java
index 3c533b8..fc56de0 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslETypeParameterDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.ETypeParameterDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEGenericTypeDeclConsumer;
@@ -135,7 +138,6 @@ public final class EcoreDslETypeParameterDeclConsumer extends NonTerminalConsume
 	}
 
 	public ETypeParameterDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prETypeParameterDecl()
 		return rule;
 	}
 	
@@ -144,13 +146,13 @@ public final class EcoreDslETypeParameterDeclConsumer extends NonTerminalConsume
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "ETypeParameter";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEGenericTypeDeclConsumer(INonTerminalConsumer eGenericTypeDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java
index f03c9df..13db4fe 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.EcoreDslElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEPackageDeclConsumer;
@@ -93,7 +96,6 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer {
 	}
 
 	public EcoreDslElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prEcoreDsl()
 		return rule;
 	}
 	
@@ -102,13 +104,13 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EcoreDsl";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEPackageDeclConsumer(INonTerminalConsumer ePackageDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java
index 667fe80..dab5da2 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.ImportStatementDeclElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -170,7 +173,6 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
 	}
 
 	public ImportStatementDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prImportStatementDecl()
 		return rule;
 	}
 	
@@ -179,13 +181,13 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "ImportStatementDecl";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java
index 114e177..2b1139e 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntryConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.MapEntryElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -106,7 +109,6 @@ public final class EcoreDslMapEntryConsumer extends NonTerminalConsumer {
 	}
 
 	public MapEntryElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prMapEntry()
 		return rule;
 	}
 	
@@ -115,13 +117,13 @@ public final class EcoreDslMapEntryConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "MapEntry";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java
index 85a04e1..1d0b770 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMapEntrySuperConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.MapEntrySuperElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslMapEntryConsumer;
@@ -39,7 +42,6 @@ public final class EcoreDslMapEntrySuperConsumer extends NonTerminalConsumer {
 	}
 
 	public MapEntrySuperElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prMapEntrySuper()
 		return rule;
 	}
 	
@@ -48,13 +50,13 @@ public final class EcoreDslMapEntrySuperConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EObject";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setMapEntryConsumer(INonTerminalConsumer mapEntryConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java
index 9c3ff9a..5fe7d51 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslMultiplicityExprConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.MultiplicityExprElements;
 
 
@@ -78,7 +81,6 @@ public final class EcoreDslMultiplicityExprConsumer extends NonTerminalConsumer
 	}
 
 	public MultiplicityExprElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prMultiplicityExpr()
 		return rule;
 	}
 	
@@ -87,13 +89,13 @@ public final class EcoreDslMultiplicityExprConsumer extends NonTerminalConsumer
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "MultiplicityExpr";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public ICharacterClass getKeyword$3$Delimiter() {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java
index 4714c36..a8073be 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslQIDConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.QIDElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer;
@@ -153,7 +156,6 @@ public final class EcoreDslQIDConsumer extends NonTerminalConsumer {
 	}
 
 	public QIDElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prQID()
 		return rule;
 	}
 	
@@ -162,13 +164,13 @@ public final class EcoreDslQIDConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EString";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIdConsumer(ITerminalConsumer idConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java
index 49585ec..a3aba5e 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSINTConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.SINTElements;
 
 import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinINTConsumer;
@@ -90,7 +93,6 @@ public final class EcoreDslSINTConsumer extends NonTerminalConsumer {
 	}
 
 	public SINTElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prSINT()
 		return rule;
 	}
 	
@@ -99,13 +101,13 @@ public final class EcoreDslSINTConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EInt";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setIntConsumer(ITerminalConsumer intConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java
index cc3fde1..537540d 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSTRING_OR_QIDConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.STRING_OR_QIDElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslQIDConsumer;
@@ -67,7 +70,6 @@ public final class EcoreDslSTRING_OR_QIDConsumer extends NonTerminalConsumer {
 	}
 
 	public STRING_OR_QIDElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prSTRING_OR_QID()
 		return rule;
 	}
 	
@@ -76,13 +78,13 @@ public final class EcoreDslSTRING_OR_QIDConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EString";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setQidConsumer(INonTerminalConsumer qidConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java
index fcc7950..012ed79 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslSubEPackageDeclConsumer.java
@@ -3,7 +3,11 @@ Generated with Xtext
 */
 package org.eclipse.xtext.example.parser.packrat.consumers;
 
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.AbstractRule;
+
 import org.eclipse.xtext.parser.packrat.IMarkerFactory.IMarker;
 import org.eclipse.xtext.parser.packrat.consumers.ITerminalConsumer;
 import org.eclipse.xtext.parser.packrat.consumers.INonTerminalConsumer;
@@ -13,7 +17,6 @@ import org.eclipse.xtext.parser.packrat.consumers.ConsumeResult;
 import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
 import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
 
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.SubEPackageDeclElements;
 
 import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEAnnotationDeclConsumer;
@@ -201,7 +204,6 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 
 	public SubEPackageDeclElements getRule() {
-	// EcoreDslGrammarAccess.INSTANCE.prSubEPackageDecl()
 		return rule;
 	}
 	
@@ -210,13 +212,13 @@ public final class EcoreDslSubEPackageDeclConsumer extends NonTerminalConsumer {
 	}
 	
 	@Override
-	protected EObject getGrammarElement() {
+	protected AbstractRule getGrammarElement() {
 		return getRule().getRule();
 	}
 
 	@Override
-	protected String getDefaultTypeName() {
-		return "EPackage";
+	protected EClassifier getDefaultType() {
+		return getGrammarElement().getType().getType();
 	}
 	
 	public void setEAnnotationDeclConsumer(INonTerminalConsumer eAnnotationDeclConsumer) {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/EcoreDslParseTreeConstructor.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/EcoreDslParseTreeConstructor.java
index 2b7086e..a0b6f28 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/EcoreDslParseTreeConstructor.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/EcoreDslParseTreeConstructor.java
@@ -6,8 +6,8 @@ package org.eclipse.xtext.example.parsetree.reconstr;
 //import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.*;
-import org.eclipse.xtext.parsetree.reconstr.*;
-import org.eclipse.xtext.parsetree.reconstr.impl.*;
+import org.eclipse.xtext.parsetree.reconstr.IInstanceDescription;
+import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor;
 import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor.AbstractToken.Solution;
 import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
 
@@ -18,30 +18,31 @@ public class EcoreDslParseTreeConstructor extends AbstractParseTreeConstructor {
 	@Inject
 	private EcoreDslGrammarAccess grammarAccess;
 	
+	@Override
 	protected Solution internalSerialize(EObject obj) {
 		IInstanceDescription inst = getDescr(obj);
 		Solution s;
-		if(inst.isInstanceOf("EcoreDsl") && (s = new EcoreDsl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("ImportStatementDecl") && (s = new ImportStatementDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EPackage") && (s = new EPackageDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EPackage") && (s = new SubEPackageDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EClassifier") && (s = new EClassifierDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EDataType") && (s = new EDataTypeDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EAnnotation") && (s = new EAnnotationDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EClass") && (s = new EClassDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EStructuralFeature") && (s = new EStructuralFeatureDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EAttribute") && (s = new EAttributeDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EReference") && (s = new EReferenceDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EEnum") && (s = new EEnumDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EEnumLiteral") && (s = new EEnumLiteralDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("ETypeParameter") && (s = new ETypeParameterDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EGenericType") && (s = new EGenericTypeReferenceDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EGenericType") && (s = new EGenericTypeDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EOperation") && (s = new EOperationDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EParameter") && (s = new EParameterDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("EObject") && (s = new MapEntrySuper_RuleCall_MapEntry(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("MapEntry") && (s = new MapEntry_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf("MultiplicityExpr") && (s = new MultiplicityExpr_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEcoreDsl().getRule().getType().getType()) && (s = new EcoreDsl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prImportStatementDecl().getRule().getType().getType()) && (s = new ImportStatementDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEPackageDecl().getRule().getType().getType()) && (s = new EPackageDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prSubEPackageDecl().getRule().getType().getType()) && (s = new SubEPackageDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEClassifierDecl().getRule().getType().getType()) && (s = new EClassifierDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEDataTypeDecl().getRule().getType().getType()) && (s = new EDataTypeDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType()) && (s = new EAnnotationDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEClassDecl().getRule().getType().getType()) && (s = new EClassDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEStructuralFeatureDecl().getRule().getType().getType()) && (s = new EStructuralFeatureDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEAttributeDecl().getRule().getType().getType()) && (s = new EAttributeDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEReferenceDecl().getRule().getType().getType()) && (s = new EReferenceDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEEnumDecl().getRule().getType().getType()) && (s = new EEnumDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType()) && (s = new EEnumLiteralDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getType()) && (s = new ETypeParameterDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType()) && (s = new EGenericTypeReferenceDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType()) && (s = new EGenericTypeDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEOperationDecl().getRule().getType().getType()) && (s = new EOperationDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prEParameterDecl().getRule().getType().getType()) && (s = new EParameterDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prMapEntrySuper().getRule().getType().getType()) && (s = new MapEntrySuper_RuleCall_MapEntry(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prMapEntry().getRule().getType().getType()) && (s = new MapEntry_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.prMultiplicityExpr().getRule().getType().getType()) && (s = new MultiplicityExpr_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
 		return null;
 	}
 	
@@ -60,6 +61,7 @@ protected class EcoreDsl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEcoreDsl().eleGroup();
 	}
@@ -89,6 +91,7 @@ protected class EcoreDsl_0_Assignment_imports extends AssignmentToken  {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEcoreDsl().ele0AssignmentImports();
 	}
@@ -100,7 +103,7 @@ protected class EcoreDsl_0_Assignment_imports extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("ImportStatementDecl")) {
+			if(param.isInstanceOf(grammarAccess.prImportStatementDecl().getRule().getType().getType())) {
 				Solution s = new ImportStatementDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -121,6 +124,7 @@ protected class EcoreDsl_1_Assignment_package extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEcoreDsl().ele1AssignmentPackage();
 	}
@@ -132,7 +136,7 @@ protected class EcoreDsl_1_Assignment_package extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EPackage")) {
+			if(param.isInstanceOf(grammarAccess.prEPackageDecl().getRule().getType().getType())) {
 				Solution s = new EPackageDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -164,6 +168,7 @@ protected class ImportStatementDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prImportStatementDecl().eleGroup();
 	}
@@ -193,6 +198,7 @@ protected class ImportStatementDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prImportStatementDecl().ele0Group();
 	}
@@ -222,6 +228,7 @@ protected class ImportStatementDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prImportStatementDecl().ele00Group();
 	}
@@ -251,6 +258,7 @@ protected class ImportStatementDecl_0_0_0_Keyword_import extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prImportStatementDecl().ele000KeywordImport();
 	}	
@@ -263,6 +271,7 @@ protected class ImportStatementDecl_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prImportStatementDecl().ele001Group();
 	}
@@ -292,6 +301,7 @@ protected class ImportStatementDecl_0_0_1_0_Assignment_alias extends AssignmentT
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prImportStatementDecl().ele0010AssignmentAlias();
 	}
@@ -316,6 +326,7 @@ protected class ImportStatementDecl_0_0_1_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prImportStatementDecl().ele0011KeywordEqualsSign();
 	}	
@@ -330,6 +341,7 @@ protected class ImportStatementDecl_0_1_Assignment_importURI extends AssignmentT
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prImportStatementDecl().ele01AssignmentImportURI();
 	}
@@ -355,6 +367,7 @@ protected class ImportStatementDecl_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prImportStatementDecl().ele1KeywordSemicolon();
 	}	
@@ -378,6 +391,7 @@ protected class EPackageDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().eleGroup();
 	}
@@ -407,6 +421,7 @@ protected class EPackageDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele0Group();
 	}
@@ -436,6 +451,7 @@ protected class EPackageDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele00Group();
 	}
@@ -465,6 +481,7 @@ protected class EPackageDecl_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele000Group();
 	}
@@ -494,6 +511,7 @@ protected class EPackageDecl_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele0000Group();
 	}
@@ -523,6 +541,7 @@ protected class EPackageDecl_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele00000Group();
 	}
@@ -552,6 +571,7 @@ protected class EPackageDecl_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele000000Group();
 	}
@@ -581,6 +601,7 @@ protected class EPackageDecl_0_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele0000000Group();
 	}
@@ -610,6 +631,7 @@ protected class EPackageDecl_0_0_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele00000000Group();
 	}
@@ -639,6 +661,7 @@ protected class EPackageDecl_0_0_0_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele000000000Group();
 	}
@@ -668,6 +691,7 @@ protected class EPackageDecl_0_0_0_0_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele0000000000Group();
 	}
@@ -697,6 +721,7 @@ protected class EPackageDecl_0_0_0_0_0_0_0_0_0_0_0_Assignment_eAnnotations exten
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele00000000000AssignmentEAnnotations();
 	}
@@ -708,7 +733,7 @@ protected class EPackageDecl_0_0_0_0_0_0_0_0_0_0_0_Assignment_eAnnotations exten
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EAnnotation")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) {
 				Solution s = new EAnnotationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -729,6 +754,7 @@ protected class EPackageDecl_0_0_0_0_0_0_0_0_0_0_1_Keyword_package extends Keywo
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele00000000001KeywordPackage();
 	}	
@@ -742,6 +768,7 @@ protected class EPackageDecl_0_0_0_0_0_0_0_0_0_1_Assignment_name extends Assignm
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele0000000001AssignmentName();
 	}
@@ -769,6 +796,7 @@ protected class EPackageDecl_0_0_0_0_0_0_0_0_1_Keyword_nsURI extends KeywordToke
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele000000001KeywordNsURI();
 	}	
@@ -782,6 +810,7 @@ protected class EPackageDecl_0_0_0_0_0_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele00000001KeywordEqualsSign();
 	}	
@@ -795,6 +824,7 @@ protected class EPackageDecl_0_0_0_0_0_0_1_Assignment_nsURI extends AssignmentTo
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele0000001AssignmentNsURI();
 	}
@@ -820,6 +850,7 @@ protected class EPackageDecl_0_0_0_0_0_1_Keyword_nsPrefix extends KeywordToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele000001KeywordNsPrefix();
 	}	
@@ -833,6 +864,7 @@ protected class EPackageDecl_0_0_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele00001KeywordEqualsSign();
 	}	
@@ -846,6 +878,7 @@ protected class EPackageDecl_0_0_0_1_Assignment_nsPrefix extends AssignmentToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele0001AssignmentNsPrefix();
 	}
@@ -873,6 +906,7 @@ protected class EPackageDecl_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele001KeywordLeftCurlyBracket();
 	}	
@@ -886,6 +920,7 @@ protected class EPackageDecl_0_1_Alternatives extends AlternativesToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele01Alternatives();
 	}
@@ -908,6 +943,7 @@ protected class EPackageDecl_0_1_0_Assignment_eSubpackages extends AssignmentTok
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele010AssignmentESubpackages();
 	}
@@ -919,7 +955,7 @@ protected class EPackageDecl_0_1_0_Assignment_eSubpackages extends AssignmentTok
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EPackage")) {
+			if(param.isInstanceOf(grammarAccess.prSubEPackageDecl().getRule().getType().getType())) {
 				Solution s = new SubEPackageDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -940,6 +976,7 @@ protected class EPackageDecl_0_1_1_Assignment_eClassifiers extends AssignmentTok
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele011AssignmentEClassifiers();
 	}
@@ -951,7 +988,7 @@ protected class EPackageDecl_0_1_1_Assignment_eClassifiers extends AssignmentTok
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EClassifier")) {
+			if(param.isInstanceOf(grammarAccess.prEClassifierDecl().getRule().getType().getType())) {
 				Solution s = new EClassifierDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -974,6 +1011,7 @@ protected class EPackageDecl_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEPackageDecl().ele1KeywordRightCurlyBracket();
 	}	
@@ -997,6 +1035,7 @@ protected class SubEPackageDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().eleGroup();
 	}
@@ -1026,6 +1065,7 @@ protected class SubEPackageDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele0Group();
 	}
@@ -1055,6 +1095,7 @@ protected class SubEPackageDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele00Group();
 	}
@@ -1084,6 +1125,7 @@ protected class SubEPackageDecl_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele000Group();
 	}
@@ -1113,6 +1155,7 @@ protected class SubEPackageDecl_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele0000Group();
 	}
@@ -1142,6 +1185,7 @@ protected class SubEPackageDecl_0_0_0_0_0_Assignment_eAnnotations extends Assign
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele00000AssignmentEAnnotations();
 	}
@@ -1153,7 +1197,7 @@ protected class SubEPackageDecl_0_0_0_0_0_Assignment_eAnnotations extends Assign
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EAnnotation")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) {
 				Solution s = new EAnnotationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1174,6 +1218,7 @@ protected class SubEPackageDecl_0_0_0_0_1_Keyword_package extends KeywordToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele00001KeywordPackage();
 	}	
@@ -1187,6 +1232,7 @@ protected class SubEPackageDecl_0_0_0_1_Assignment_name extends AssignmentToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele0001AssignmentName();
 	}
@@ -1212,6 +1258,7 @@ protected class SubEPackageDecl_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele001KeywordLeftCurlyBracket();
 	}	
@@ -1225,6 +1272,7 @@ protected class SubEPackageDecl_0_1_Alternatives extends AlternativesToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele01Alternatives();
 	}
@@ -1247,6 +1295,7 @@ protected class SubEPackageDecl_0_1_0_Assignment_eSubpackages extends Assignment
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele010AssignmentESubpackages();
 	}
@@ -1258,7 +1307,7 @@ protected class SubEPackageDecl_0_1_0_Assignment_eSubpackages extends Assignment
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EPackage")) {
+			if(param.isInstanceOf(grammarAccess.prSubEPackageDecl().getRule().getType().getType())) {
 				Solution s = new SubEPackageDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1279,6 +1328,7 @@ protected class SubEPackageDecl_0_1_1_Assignment_eClassifiers extends Assignment
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele011AssignmentEClassifiers();
 	}
@@ -1290,7 +1340,7 @@ protected class SubEPackageDecl_0_1_1_Assignment_eClassifiers extends Assignment
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EClassifier")) {
+			if(param.isInstanceOf(grammarAccess.prEClassifierDecl().getRule().getType().getType())) {
 				Solution s = new EClassifierDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1313,6 +1363,7 @@ protected class SubEPackageDecl_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prSubEPackageDecl().ele1KeywordRightCurlyBracket();
 	}	
@@ -1336,6 +1387,7 @@ protected class EClassifierDecl_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEClassifierDecl().eleAlternatives();
 	}
@@ -1358,6 +1410,7 @@ protected class EClassifierDecl_0_RuleCall_EClassDecl extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prEClassifierDecl().ele0ParserRuleCallEClassDecl();
 	}
@@ -1365,7 +1418,7 @@ protected class EClassifierDecl_0_RuleCall_EClassDecl extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(EClassDecl_Group.class, current)) return null;
-		if(!current.isInstanceOf("EClass")) return null;
+		if(!current.isInstanceOf(grammarAccess.prEClassDecl().getRule().getType().getType())) return null;
 		return new EClassDecl_Group(current, this).firstSolution();
 	}
 }
@@ -1377,6 +1430,7 @@ protected class EClassifierDecl_1_RuleCall_EDataTypeDecl extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prEClassifierDecl().ele1ParserRuleCallEDataTypeDecl();
 	}
@@ -1384,7 +1438,7 @@ protected class EClassifierDecl_1_RuleCall_EDataTypeDecl extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(EDataTypeDecl_Alternatives.class, current)) return null;
-		if(!current.isInstanceOf("EDataType")) return null;
+		if(!current.isInstanceOf(grammarAccess.prEDataTypeDecl().getRule().getType().getType())) return null;
 		return new EDataTypeDecl_Alternatives(current, this).firstSolution();
 	}
 }
@@ -1407,6 +1461,7 @@ protected class EDataTypeDecl_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().eleAlternatives();
 	}
@@ -1429,6 +1484,7 @@ protected class EDataTypeDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele0Group();
 	}
@@ -1458,6 +1514,7 @@ protected class EDataTypeDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele00Group();
 	}
@@ -1487,6 +1544,7 @@ protected class EDataTypeDecl_0_0_0_Assignment_eAnnotations extends AssignmentTo
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele000AssignmentEAnnotations();
 	}
@@ -1498,7 +1556,7 @@ protected class EDataTypeDecl_0_0_0_Assignment_eAnnotations extends AssignmentTo
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EAnnotation")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) {
 				Solution s = new EAnnotationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1519,6 +1577,7 @@ protected class EDataTypeDecl_0_0_1_Assignment_serializable extends AssignmentTo
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele001AssignmentSerializable();
 	}
@@ -1546,6 +1605,7 @@ protected class EDataTypeDecl_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele01Group();
 	}
@@ -1575,6 +1635,7 @@ protected class EDataTypeDecl_0_1_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele010Group();
 	}
@@ -1604,6 +1665,7 @@ protected class EDataTypeDecl_0_1_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele0100Group();
 	}
@@ -1633,6 +1695,7 @@ protected class EDataTypeDecl_0_1_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele01000Group();
 	}
@@ -1662,6 +1725,7 @@ protected class EDataTypeDecl_0_1_0_0_0_0_Keyword_datatype extends KeywordToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele010000KeywordDatatype();
 	}	
@@ -1674,6 +1738,7 @@ protected class EDataTypeDecl_0_1_0_0_0_1_Assignment_name extends AssignmentToke
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele010001AssignmentName();
 	}
@@ -1699,6 +1764,7 @@ protected class EDataTypeDecl_0_1_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele01001KeywordColon();
 	}	
@@ -1712,6 +1778,7 @@ protected class EDataTypeDecl_0_1_0_1_Assignment_instanceClassName extends Assig
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele0101AssignmentInstanceClassName();
 	}
@@ -1739,6 +1806,7 @@ protected class EDataTypeDecl_0_1_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele011KeywordSemicolon();
 	}	
@@ -1753,6 +1821,7 @@ protected class EDataTypeDecl_1_RuleCall_EEnumDecl extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prEDataTypeDecl().ele1ParserRuleCallEEnumDecl();
 	}
@@ -1760,7 +1829,7 @@ protected class EDataTypeDecl_1_RuleCall_EEnumDecl extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(EEnumDecl_Group.class, current)) return null;
-		if(!current.isInstanceOf("EEnum")) return null;
+		if(!current.isInstanceOf(grammarAccess.prEEnumDecl().getRule().getType().getType())) return null;
 		return new EEnumDecl_Group(current, this).firstSolution();
 	}
 }
@@ -1783,6 +1852,7 @@ protected class EAnnotationDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().eleGroup();
 	}
@@ -1812,6 +1882,7 @@ protected class EAnnotationDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele0Group();
 	}
@@ -1841,6 +1912,7 @@ protected class EAnnotationDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele00Group();
 	}
@@ -1870,6 +1942,7 @@ protected class EAnnotationDecl_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele000Group();
 	}
@@ -1899,6 +1972,7 @@ protected class EAnnotationDecl_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele0000Group();
 	}
@@ -1928,6 +2002,7 @@ protected class EAnnotationDecl_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele00000Group();
 	}
@@ -1957,6 +2032,7 @@ protected class EAnnotationDecl_0_0_0_0_0_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele000000KeywordCommercialAt();
 	}	
@@ -1969,6 +2045,7 @@ protected class EAnnotationDecl_0_0_0_0_0_1_Assignment_source extends Assignment
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele000001AssignmentSource();
 	}
@@ -1994,6 +2071,7 @@ protected class EAnnotationDecl_0_0_0_0_1_Assignment_eModelElement extends Assig
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele00001AssignmentEModelElement();
 	}
@@ -2004,7 +2082,7 @@ protected class EAnnotationDecl_0_0_0_0_1_Assignment_eModelElement extends Assig
 		IInstanceDescription obj = current.cloneAndConsume("eModelElement");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EModelElement")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().ele000010CrossReferenceEStringEModelElement().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prEAnnotationDecl().ele000010CrossReferenceEStringEModelElement(); 
 				return new Solution(obj);
@@ -2022,6 +2100,7 @@ protected class EAnnotationDecl_0_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele0001KeywordLeftParenthesis();
 	}	
@@ -2035,6 +2114,7 @@ protected class EAnnotationDecl_0_0_1_Assignment_contents extends AssignmentToke
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele001AssignmentContents();
 	}
@@ -2046,7 +2126,7 @@ protected class EAnnotationDecl_0_0_1_Assignment_contents extends AssignmentToke
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EObject")) {
+			if(param.isInstanceOf(grammarAccess.prMapEntrySuper().getRule().getType().getType())) {
 				Solution s = new MapEntrySuper_RuleCall_MapEntry(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -2068,6 +2148,7 @@ protected class EAnnotationDecl_0_1_Group extends GroupToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele01Group();
 	}
@@ -2097,6 +2178,7 @@ protected class EAnnotationDecl_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele010KeywordComma();
 	}	
@@ -2109,6 +2191,7 @@ protected class EAnnotationDecl_0_1_1_Assignment_contents extends AssignmentToke
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele011AssignmentContents();
 	}
@@ -2120,7 +2203,7 @@ protected class EAnnotationDecl_0_1_1_Assignment_contents extends AssignmentToke
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EObject")) {
+			if(param.isInstanceOf(grammarAccess.prMapEntrySuper().getRule().getType().getType())) {
 				Solution s = new MapEntrySuper_RuleCall_MapEntry(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -2143,6 +2226,7 @@ protected class EAnnotationDecl_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEAnnotationDecl().ele1KeywordRightParenthesis();
 	}	
@@ -2166,6 +2250,7 @@ protected class EClassDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().eleGroup();
 	}
@@ -2195,6 +2280,7 @@ protected class EClassDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0Group();
 	}
@@ -2224,6 +2310,7 @@ protected class EClassDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele00Group();
 	}
@@ -2253,6 +2340,7 @@ protected class EClassDecl_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000Group();
 	}
@@ -2282,6 +2370,7 @@ protected class EClassDecl_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0000Group();
 	}
@@ -2311,6 +2400,7 @@ protected class EClassDecl_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele00000Group();
 	}
@@ -2340,6 +2430,7 @@ protected class EClassDecl_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000000Group();
 	}
@@ -2369,6 +2460,7 @@ protected class EClassDecl_0_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0000000Group();
 	}
@@ -2398,6 +2490,7 @@ protected class EClassDecl_0_0_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele00000000Group();
 	}
@@ -2427,6 +2520,7 @@ protected class EClassDecl_0_0_0_0_0_0_0_0_0_Assignment_eAnnotations extends Ass
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000000000AssignmentEAnnotations();
 	}
@@ -2438,7 +2532,7 @@ protected class EClassDecl_0_0_0_0_0_0_0_0_0_Assignment_eAnnotations extends Ass
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EAnnotation")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) {
 				Solution s = new EAnnotationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -2459,6 +2553,7 @@ protected class EClassDecl_0_0_0_0_0_0_0_0_1_Assignment_abstract extends Assignm
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000000001AssignmentAbstract();
 	}
@@ -2486,6 +2581,7 @@ protected class EClassDecl_0_0_0_0_0_0_0_1_Alternatives extends AlternativesToke
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele00000001Alternatives();
 	}
@@ -2508,6 +2604,7 @@ protected class EClassDecl_0_0_0_0_0_0_0_1_0_Assignment_interface extends Assign
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000000010AssignmentInterface();
 	}
@@ -2534,6 +2631,7 @@ protected class EClassDecl_0_0_0_0_0_0_0_1_1_Keyword_class extends KeywordToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000000011KeywordClass();
 	}	
@@ -2548,6 +2646,7 @@ protected class EClassDecl_0_0_0_0_0_0_1_Assignment_name extends AssignmentToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0000001AssignmentName();
 	}
@@ -2573,6 +2672,7 @@ protected class EClassDecl_0_0_0_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000001Group();
 	}
@@ -2602,6 +2702,7 @@ protected class EClassDecl_0_0_0_0_0_1_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0000010Group();
 	}
@@ -2631,6 +2732,7 @@ protected class EClassDecl_0_0_0_0_0_1_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele00000100Group();
 	}
@@ -2660,6 +2762,7 @@ protected class EClassDecl_0_0_0_0_0_1_0_0_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000001000KeywordLessThanSign();
 	}	
@@ -2672,6 +2775,7 @@ protected class EClassDecl_0_0_0_0_0_1_0_0_1_Assignment_eTypeParameters extends
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000001001AssignmentETypeParameters();
 	}
@@ -2683,7 +2787,7 @@ protected class EClassDecl_0_0_0_0_0_1_0_0_1_Assignment_eTypeParameters extends
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("ETypeParameter")) {
+			if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getType())) {
 				Solution s = new ETypeParameterDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -2705,6 +2809,7 @@ protected class EClassDecl_0_0_0_0_0_1_0_1_Group extends GroupToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele00000101Group();
 	}
@@ -2734,6 +2839,7 @@ protected class EClassDecl_0_0_0_0_0_1_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000001010KeywordComma();
 	}	
@@ -2746,6 +2852,7 @@ protected class EClassDecl_0_0_0_0_0_1_0_1_1_Assignment_eTypeParameters extends
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000001011AssignmentETypeParameters();
 	}
@@ -2757,7 +2864,7 @@ protected class EClassDecl_0_0_0_0_0_1_0_1_1_Assignment_eTypeParameters extends
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("ETypeParameter")) {
+			if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getType())) {
 				Solution s = new ETypeParameterDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -2780,6 +2887,7 @@ protected class EClassDecl_0_0_0_0_0_1_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0000011KeywordGreaterThanSign();
 	}	
@@ -2794,6 +2902,7 @@ protected class EClassDecl_0_0_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele00001Group();
 	}
@@ -2823,6 +2932,7 @@ protected class EClassDecl_0_0_0_0_1_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000010Group();
 	}
@@ -2852,6 +2962,7 @@ protected class EClassDecl_0_0_0_0_1_0_0_Keyword_extends extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0000100KeywordExtends();
 	}	
@@ -2864,6 +2975,7 @@ protected class EClassDecl_0_0_0_0_1_0_1_Assignment_eGenericSuperTypes extends A
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0000101AssignmentEGenericSuperTypes();
 	}
@@ -2875,7 +2987,7 @@ protected class EClassDecl_0_0_0_0_1_0_1_Assignment_eGenericSuperTypes extends A
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -2897,6 +3009,7 @@ protected class EClassDecl_0_0_0_0_1_1_Group extends GroupToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele000011Group();
 	}
@@ -2926,6 +3039,7 @@ protected class EClassDecl_0_0_0_0_1_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0000110KeywordComma();
 	}	
@@ -2938,6 +3052,7 @@ protected class EClassDecl_0_0_0_0_1_1_1_Assignment_eGenericSuperTypes extends A
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0000111AssignmentEGenericSuperTypes();
 	}
@@ -2949,7 +3064,7 @@ protected class EClassDecl_0_0_0_0_1_1_1_Assignment_eGenericSuperTypes extends A
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -2973,6 +3088,7 @@ protected class EClassDecl_0_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele0001Group();
 	}
@@ -3002,6 +3118,7 @@ protected class EClassDecl_0_0_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele00010KeywordColon();
 	}	
@@ -3014,6 +3131,7 @@ protected class EClassDecl_0_0_0_1_1_Assignment_instanceClassName extends Assign
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele00011AssignmentInstanceClassName();
 	}
@@ -3042,6 +3160,7 @@ protected class EClassDecl_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele001KeywordLeftCurlyBracket();
 	}	
@@ -3055,6 +3174,7 @@ protected class EClassDecl_0_1_Alternatives extends AlternativesToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele01Alternatives();
 	}
@@ -3077,6 +3197,7 @@ protected class EClassDecl_0_1_0_Assignment_eStructuralFeatures extends Assignme
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele010AssignmentEStructuralFeatures();
 	}
@@ -3088,7 +3209,7 @@ protected class EClassDecl_0_1_0_Assignment_eStructuralFeatures extends Assignme
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EStructuralFeature")) {
+			if(param.isInstanceOf(grammarAccess.prEStructuralFeatureDecl().getRule().getType().getType())) {
 				Solution s = new EStructuralFeatureDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -3109,6 +3230,7 @@ protected class EClassDecl_0_1_1_Assignment_eOperations extends AssignmentToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele011AssignmentEOperations();
 	}
@@ -3120,7 +3242,7 @@ protected class EClassDecl_0_1_1_Assignment_eOperations extends AssignmentToken
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EOperation")) {
+			if(param.isInstanceOf(grammarAccess.prEOperationDecl().getRule().getType().getType())) {
 				Solution s = new EOperationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -3143,6 +3265,7 @@ protected class EClassDecl_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEClassDecl().ele1KeywordRightCurlyBracket();
 	}	
@@ -3166,6 +3289,7 @@ protected class EStructuralFeatureDecl_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEStructuralFeatureDecl().eleAlternatives();
 	}
@@ -3188,6 +3312,7 @@ protected class EStructuralFeatureDecl_0_RuleCall_EAttributeDecl extends RuleCal
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prEStructuralFeatureDecl().ele0ParserRuleCallEAttributeDecl();
 	}
@@ -3195,7 +3320,7 @@ protected class EStructuralFeatureDecl_0_RuleCall_EAttributeDecl extends RuleCal
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(EAttributeDecl_Group.class, current)) return null;
-		if(!current.isInstanceOf("EAttribute")) return null;
+		if(!current.isInstanceOf(grammarAccess.prEAttributeDecl().getRule().getType().getType())) return null;
 		return new EAttributeDecl_Group(current, this).firstSolution();
 	}
 }
@@ -3207,6 +3332,7 @@ protected class EStructuralFeatureDecl_1_RuleCall_EReferenceDecl extends RuleCal
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prEStructuralFeatureDecl().ele1ParserRuleCallEReferenceDecl();
 	}
@@ -3214,7 +3340,7 @@ protected class EStructuralFeatureDecl_1_RuleCall_EReferenceDecl extends RuleCal
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(EReferenceDecl_Group.class, current)) return null;
-		if(!current.isInstanceOf("EReference")) return null;
+		if(!current.isInstanceOf(grammarAccess.prEReferenceDecl().getRule().getType().getType())) return null;
 		return new EReferenceDecl_Group(current, this).firstSolution();
 	}
 }
@@ -3237,6 +3363,7 @@ protected class EAttributeDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().eleGroup();
 	}
@@ -3266,6 +3393,7 @@ protected class EAttributeDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0Group();
 	}
@@ -3295,6 +3423,7 @@ protected class EAttributeDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00Group();
 	}
@@ -3324,6 +3453,7 @@ protected class EAttributeDecl_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele000Group();
 	}
@@ -3353,6 +3483,7 @@ protected class EAttributeDecl_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0000Group();
 	}
@@ -3382,6 +3513,7 @@ protected class EAttributeDecl_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00000Group();
 	}
@@ -3411,6 +3543,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele000000Group();
 	}
@@ -3440,6 +3573,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_0_Assignment_eAnnotations extends Ass
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0000000AssignmentEAnnotations();
 	}
@@ -3451,7 +3585,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_0_Assignment_eAnnotations extends Ass
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EAnnotation")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) {
 				Solution s = new EAnnotationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -3472,6 +3606,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_Alternatives extends AlternativesTo
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0000001Alternatives();
 	}
@@ -3494,6 +3629,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_Alternatives extends Alternatives
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00000010Alternatives();
 	}
@@ -3516,6 +3652,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_Alternatives extends Alternativ
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele000000100Alternatives();
 	}
@@ -3538,6 +3675,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_0_Alternatives extends Alternat
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0000001000Alternatives();
 	}
@@ -3560,6 +3698,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_0_0_Alternatives extends Altern
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00000010000Alternatives();
 	}
@@ -3582,6 +3721,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_0_0_0_Alternatives extends Alte
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele000000100000Alternatives();
 	}
@@ -3604,6 +3744,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_0_0_0_0_Alternatives extends Al
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0000001000000Alternatives();
 	}
@@ -3626,6 +3767,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_0_0_0_0_0_Assignment_iD extends
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00000010000000AssignmentID();
 	}
@@ -3652,6 +3794,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_0_0_0_0_1_Assignment_unique ext
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00000010000001AssignmentUnique();
 	}
@@ -3679,6 +3822,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_0_0_0_1_Assignment_ordered exte
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0000001000001AssignmentOrdered();
 	}
@@ -3706,6 +3850,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_0_0_1_Assignment_changeable ext
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele000000100001AssignmentChangeable();
 	}
@@ -3733,6 +3878,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_0_1_Assignment_volatile extends
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00000010001AssignmentVolatile();
 	}
@@ -3760,6 +3906,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_0_1_Assignment_transient extends
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0000001001AssignmentTransient();
 	}
@@ -3787,6 +3934,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_0_1_Assignment_unsettable extends A
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele000000101AssignmentUnsettable();
 	}
@@ -3814,6 +3962,7 @@ protected class EAttributeDecl_0_0_0_0_0_0_1_1_Assignment_derived extends Assign
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00000011AssignmentDerived();
 	}
@@ -3842,6 +3991,7 @@ protected class EAttributeDecl_0_0_0_0_0_1_Keyword_attr extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele000001KeywordAttr();
 	}	
@@ -3855,6 +4005,7 @@ protected class EAttributeDecl_0_0_0_0_1_Assignment_eGenericType extends Assignm
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00001AssignmentEGenericType();
 	}
@@ -3866,7 +4017,7 @@ protected class EAttributeDecl_0_0_0_0_1_Assignment_eGenericType extends Assignm
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -3888,6 +4039,7 @@ protected class EAttributeDecl_0_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0001Group();
 	}
@@ -3917,6 +4069,7 @@ protected class EAttributeDecl_0_0_0_1_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00010Group();
 	}
@@ -3946,6 +4099,7 @@ protected class EAttributeDecl_0_0_0_1_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele000100Group();
 	}
@@ -3975,6 +4129,7 @@ protected class EAttributeDecl_0_0_0_1_0_0_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0001000KeywordLeftSquareBracket();
 	}	
@@ -3987,6 +4142,7 @@ protected class EAttributeDecl_0_0_0_1_0_0_1_Assignment_lowerBound extends Assig
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0001001AssignmentLowerBound();
 	}
@@ -4012,6 +4168,7 @@ protected class EAttributeDecl_0_0_0_1_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele000101Group();
 	}
@@ -4041,6 +4198,7 @@ protected class EAttributeDecl_0_0_0_1_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0001010KeywordFullStopFullStop();
 	}	
@@ -4053,6 +4211,7 @@ protected class EAttributeDecl_0_0_0_1_0_1_1_Assignment_upperBound extends Assig
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele0001011AssignmentUpperBound();
 	}
@@ -4081,6 +4240,7 @@ protected class EAttributeDecl_0_0_0_1_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele00011KeywordRightSquareBracket();
 	}	
@@ -4095,6 +4255,7 @@ protected class EAttributeDecl_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele001AssignmentName();
 	}
@@ -4120,6 +4281,7 @@ protected class EAttributeDecl_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele01Group();
 	}
@@ -4149,6 +4311,7 @@ protected class EAttributeDecl_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele010KeywordEqualsSign();
 	}	
@@ -4161,6 +4324,7 @@ protected class EAttributeDecl_0_1_1_Assignment_defaultValueLiteral extends Assi
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele011AssignmentDefaultValueLiteral();
 	}
@@ -4187,6 +4351,7 @@ protected class EAttributeDecl_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEAttributeDecl().ele1KeywordSemicolon();
 	}	
@@ -4210,6 +4375,7 @@ protected class EReferenceDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().eleGroup();
 	}
@@ -4239,6 +4405,7 @@ protected class EReferenceDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0Group();
 	}
@@ -4268,6 +4435,7 @@ protected class EReferenceDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00Group();
 	}
@@ -4297,6 +4465,7 @@ protected class EReferenceDecl_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele000Group();
 	}
@@ -4326,6 +4495,7 @@ protected class EReferenceDecl_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0000Group();
 	}
@@ -4355,6 +4525,7 @@ protected class EReferenceDecl_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00000Group();
 	}
@@ -4384,6 +4555,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele000000Group();
 	}
@@ -4413,6 +4585,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_0_Assignment_eAnnotations extends Ass
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0000000AssignmentEAnnotations();
 	}
@@ -4424,7 +4597,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_0_Assignment_eAnnotations extends Ass
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EAnnotation")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) {
 				Solution s = new EAnnotationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -4445,6 +4618,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_Alternatives extends AlternativesTo
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0000001Alternatives();
 	}
@@ -4467,6 +4641,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_Alternatives extends Alternatives
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00000010Alternatives();
 	}
@@ -4489,6 +4664,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_Alternatives extends Alternativ
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele000000100Alternatives();
 	}
@@ -4511,6 +4687,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_0_Alternatives extends Alternat
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0000001000Alternatives();
 	}
@@ -4533,6 +4710,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_0_0_Alternatives extends Altern
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00000010000Alternatives();
 	}
@@ -4555,6 +4733,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_0_0_0_Alternatives extends Alte
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele000000100000Alternatives();
 	}
@@ -4577,6 +4756,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_0_0_0_0_Alternatives extends Al
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0000001000000Alternatives();
 	}
@@ -4599,6 +4779,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_0_0_0_0_0_Assignment_resolvePro
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00000010000000AssignmentResolveProxies();
 	}
@@ -4625,6 +4806,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_0_0_0_0_1_Assignment_unique ext
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00000010000001AssignmentUnique();
 	}
@@ -4652,6 +4834,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_0_0_0_1_Assignment_ordered exte
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0000001000001AssignmentOrdered();
 	}
@@ -4679,6 +4862,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_0_0_1_Assignment_changeable ext
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele000000100001AssignmentChangeable();
 	}
@@ -4706,6 +4890,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_0_1_Assignment_volatile extends
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00000010001AssignmentVolatile();
 	}
@@ -4733,6 +4918,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_0_1_Assignment_transient extends
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0000001001AssignmentTransient();
 	}
@@ -4760,6 +4946,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_0_1_Assignment_unsettable extends A
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele000000101AssignmentUnsettable();
 	}
@@ -4787,6 +4974,7 @@ protected class EReferenceDecl_0_0_0_0_0_0_1_1_Assignment_derived extends Assign
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00000011AssignmentDerived();
 	}
@@ -4815,6 +5003,7 @@ protected class EReferenceDecl_0_0_0_0_0_1_Alternatives extends AlternativesToke
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele000001Alternatives();
 	}
@@ -4837,6 +5026,7 @@ protected class EReferenceDecl_0_0_0_0_0_1_0_Assignment_containment extends Assi
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0000010AssignmentContainment();
 	}
@@ -4863,6 +5053,7 @@ protected class EReferenceDecl_0_0_0_0_0_1_1_Keyword_ref extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0000011KeywordRef();
 	}	
@@ -4877,6 +5068,7 @@ protected class EReferenceDecl_0_0_0_0_1_Assignment_eGenericType extends Assignm
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00001AssignmentEGenericType();
 	}
@@ -4888,7 +5080,7 @@ protected class EReferenceDecl_0_0_0_0_1_Assignment_eGenericType extends Assignm
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -4910,6 +5102,7 @@ protected class EReferenceDecl_0_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0001Group();
 	}
@@ -4939,6 +5132,7 @@ protected class EReferenceDecl_0_0_0_1_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00010Group();
 	}
@@ -4968,6 +5162,7 @@ protected class EReferenceDecl_0_0_0_1_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele000100Group();
 	}
@@ -4997,6 +5192,7 @@ protected class EReferenceDecl_0_0_0_1_0_0_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0001000KeywordLeftSquareBracket();
 	}	
@@ -5009,6 +5205,7 @@ protected class EReferenceDecl_0_0_0_1_0_0_1_Assignment_lowerBound extends Assig
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0001001AssignmentLowerBound();
 	}
@@ -5034,6 +5231,7 @@ protected class EReferenceDecl_0_0_0_1_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele000101Group();
 	}
@@ -5063,6 +5261,7 @@ protected class EReferenceDecl_0_0_0_1_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0001010KeywordFullStopFullStop();
 	}	
@@ -5075,6 +5274,7 @@ protected class EReferenceDecl_0_0_0_1_0_1_1_Assignment_upperBound extends Assig
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0001011AssignmentUpperBound();
 	}
@@ -5103,6 +5303,7 @@ protected class EReferenceDecl_0_0_0_1_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele00011KeywordRightSquareBracket();
 	}	
@@ -5117,6 +5318,7 @@ protected class EReferenceDecl_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele001Group();
 	}
@@ -5146,6 +5348,7 @@ protected class EReferenceDecl_0_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0010KeywordNumberSign();
 	}	
@@ -5158,6 +5361,7 @@ protected class EReferenceDecl_0_0_1_1_Assignment_eOpposite extends AssignmentTo
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele0011AssignmentEOpposite();
 	}
@@ -5168,7 +5372,7 @@ protected class EReferenceDecl_0_0_1_1_Assignment_eOpposite extends AssignmentTo
 		IInstanceDescription obj = current.cloneAndConsume("eOpposite");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EReference")) {
+			if(param.isInstanceOf(grammarAccess.prEReferenceDecl().ele00110CrossReferenceEStringEReference().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prEReferenceDecl().ele00110CrossReferenceEStringEReference(); 
 				return new Solution(obj);
@@ -5187,6 +5391,7 @@ protected class EReferenceDecl_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele01AssignmentName();
 	}
@@ -5212,6 +5417,7 @@ protected class EReferenceDecl_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEReferenceDecl().ele1KeywordSemicolon();
 	}	
@@ -5235,6 +5441,7 @@ protected class EEnumDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEEnumDecl().eleGroup();
 	}
@@ -5264,6 +5471,7 @@ protected class EEnumDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEEnumDecl().ele0Group();
 	}
@@ -5293,6 +5501,7 @@ protected class EEnumDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEEnumDecl().ele00Group();
 	}
@@ -5322,6 +5531,7 @@ protected class EEnumDecl_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEEnumDecl().ele000Group();
 	}
@@ -5351,6 +5561,7 @@ protected class EEnumDecl_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEEnumDecl().ele0000Group();
 	}
@@ -5380,6 +5591,7 @@ protected class EEnumDecl_0_0_0_0_0_Assignment_eAnnotations extends AssignmentTo
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEEnumDecl().ele00000AssignmentEAnnotations();
 	}
@@ -5391,7 +5603,7 @@ protected class EEnumDecl_0_0_0_0_0_Assignment_eAnnotations extends AssignmentTo
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EAnnotation")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) {
 				Solution s = new EAnnotationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -5412,6 +5624,7 @@ protected class EEnumDecl_0_0_0_0_1_Keyword_enum extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEEnumDecl().ele00001KeywordEnum();
 	}	
@@ -5425,6 +5638,7 @@ protected class EEnumDecl_0_0_0_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEEnumDecl().ele0001AssignmentName();
 	}
@@ -5450,6 +5664,7 @@ protected class EEnumDecl_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEEnumDecl().ele001KeywordLeftCurlyBracket();
 	}	
@@ -5463,6 +5678,7 @@ protected class EEnumDecl_0_1_Assignment_eLiterals extends AssignmentToken  {
 		super(curr, pred, IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEEnumDecl().ele01AssignmentELiterals();
 	}
@@ -5474,7 +5690,7 @@ protected class EEnumDecl_0_1_Assignment_eLiterals extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EEnumLiteral")) {
+			if(param.isInstanceOf(grammarAccess.prEEnumLiteralDecl().getRule().getType().getType())) {
 				Solution s = new EEnumLiteralDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -5496,6 +5712,7 @@ protected class EEnumDecl_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEEnumDecl().ele1KeywordRightCurlyBracket();
 	}	
@@ -5519,6 +5736,7 @@ protected class EEnumLiteralDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().eleGroup();
 	}
@@ -5548,6 +5766,7 @@ protected class EEnumLiteralDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().ele0Group();
 	}
@@ -5577,6 +5796,7 @@ protected class EEnumLiteralDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().ele00Group();
 	}
@@ -5606,6 +5826,7 @@ protected class EEnumLiteralDecl_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().ele000Group();
 	}
@@ -5635,6 +5856,7 @@ protected class EEnumLiteralDecl_0_0_0_0_Assignment_eAnnotations extends Assignm
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().ele0000AssignmentEAnnotations();
 	}
@@ -5646,7 +5868,7 @@ protected class EEnumLiteralDecl_0_0_0_0_Assignment_eAnnotations extends Assignm
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EAnnotation")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) {
 				Solution s = new EAnnotationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -5667,6 +5889,7 @@ protected class EEnumLiteralDecl_0_0_0_1_Assignment_name extends AssignmentToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().ele0001AssignmentName();
 	}
@@ -5692,6 +5915,7 @@ protected class EEnumLiteralDecl_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().ele001Group();
 	}
@@ -5721,6 +5945,7 @@ protected class EEnumLiteralDecl_0_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().ele0010KeywordEqualsSign();
 	}	
@@ -5733,6 +5958,7 @@ protected class EEnumLiteralDecl_0_0_1_1_Assignment_value extends AssignmentToke
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().ele0011AssignmentValue();
 	}
@@ -5759,6 +5985,7 @@ protected class EEnumLiteralDecl_0_1_Assignment_literal extends AssignmentToken
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().ele01AssignmentLiteral();
 	}
@@ -5784,6 +6011,7 @@ protected class EEnumLiteralDecl_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEEnumLiteralDecl().ele1KeywordSemicolon();
 	}	
@@ -5807,6 +6035,7 @@ protected class ETypeParameterDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prETypeParameterDecl().eleGroup();
 	}
@@ -5836,6 +6065,7 @@ protected class ETypeParameterDecl_0_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prETypeParameterDecl().ele0AssignmentName();
 	}
@@ -5860,6 +6090,7 @@ protected class ETypeParameterDecl_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prETypeParameterDecl().ele1Group();
 	}
@@ -5889,6 +6120,7 @@ protected class ETypeParameterDecl_1_0_Keyword_extends extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prETypeParameterDecl().ele10KeywordExtends();
 	}	
@@ -5901,6 +6133,7 @@ protected class ETypeParameterDecl_1_1_Assignment_eBounds extends AssignmentToke
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prETypeParameterDecl().ele11AssignmentEBounds();
 	}
@@ -5912,7 +6145,7 @@ protected class ETypeParameterDecl_1_1_Assignment_eBounds extends AssignmentToke
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -5945,6 +6178,7 @@ protected class EGenericTypeReferenceDecl_Alternatives extends AlternativesToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().eleAlternatives();
 	}
@@ -5967,6 +6201,7 @@ protected class EGenericTypeReferenceDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele0Group();
 	}
@@ -5996,6 +6231,7 @@ protected class EGenericTypeReferenceDecl_0_0_Assignment_eClassifier extends Ass
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele00AssignmentEClassifier();
 	}
@@ -6006,7 +6242,7 @@ protected class EGenericTypeReferenceDecl_0_0_Assignment_eClassifier extends Ass
 		IInstanceDescription obj = current.cloneAndConsume("eClassifier");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EClassifier")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().ele000CrossReferenceEStringEClassifier().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prEGenericTypeReferenceDecl().ele000CrossReferenceEStringEClassifier(); 
 				return new Solution(obj);
@@ -6023,6 +6259,7 @@ protected class EGenericTypeReferenceDecl_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele01Group();
 	}
@@ -6052,6 +6289,7 @@ protected class EGenericTypeReferenceDecl_0_1_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele010Group();
 	}
@@ -6081,6 +6319,7 @@ protected class EGenericTypeReferenceDecl_0_1_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele0100Group();
 	}
@@ -6110,6 +6349,7 @@ protected class EGenericTypeReferenceDecl_0_1_0_0_0_Keyword extends KeywordToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele01000KeywordLessThanSign();
 	}	
@@ -6122,6 +6362,7 @@ protected class EGenericTypeReferenceDecl_0_1_0_0_1_Assignment_eTypeArguments ex
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele01001AssignmentETypeArguments();
 	}
@@ -6133,7 +6374,7 @@ protected class EGenericTypeReferenceDecl_0_1_0_0_1_Assignment_eTypeArguments ex
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -6155,6 +6396,7 @@ protected class EGenericTypeReferenceDecl_0_1_0_1_Group extends GroupToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele0101Group();
 	}
@@ -6184,6 +6426,7 @@ protected class EGenericTypeReferenceDecl_0_1_0_1_0_Keyword extends KeywordToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele01010KeywordComma();
 	}	
@@ -6196,6 +6439,7 @@ protected class EGenericTypeReferenceDecl_0_1_0_1_1_Assignment_eTypeArguments ex
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele01011AssignmentETypeArguments();
 	}
@@ -6207,7 +6451,7 @@ protected class EGenericTypeReferenceDecl_0_1_0_1_1_Assignment_eTypeArguments ex
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -6230,6 +6474,7 @@ protected class EGenericTypeReferenceDecl_0_1_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele011KeywordGreaterThanSign();
 	}	
@@ -6244,6 +6489,7 @@ protected class EGenericTypeReferenceDecl_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele1Group();
 	}
@@ -6273,6 +6519,7 @@ protected class EGenericTypeReferenceDecl_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele10KeywordNumberSign();
 	}	
@@ -6285,6 +6532,7 @@ protected class EGenericTypeReferenceDecl_1_1_Assignment_eTypeParameter extends
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEGenericTypeReferenceDecl().ele11AssignmentETypeParameter();
 	}
@@ -6295,7 +6543,7 @@ protected class EGenericTypeReferenceDecl_1_1_Assignment_eTypeParameter extends
 		IInstanceDescription obj = current.cloneAndConsume("eTypeParameter");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("ETypeParameter")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().ele110CrossReferenceEStringETypeParameter().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prEGenericTypeReferenceDecl().ele110CrossReferenceEStringETypeParameter(); 
 				return new Solution(obj);
@@ -6324,6 +6572,7 @@ protected class EGenericTypeDecl_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().eleAlternatives();
 	}
@@ -6346,6 +6595,7 @@ protected class EGenericTypeDecl_0_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele0Alternatives();
 	}
@@ -6368,6 +6618,7 @@ protected class EGenericTypeDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele00Group();
 	}
@@ -6397,6 +6648,7 @@ protected class EGenericTypeDecl_0_0_0_Assignment_eClassifier extends Assignment
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele000AssignmentEClassifier();
 	}
@@ -6407,7 +6659,7 @@ protected class EGenericTypeDecl_0_0_0_Assignment_eClassifier extends Assignment
 		IInstanceDescription obj = current.cloneAndConsume("eClassifier");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EClassifier")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().ele0000CrossReferenceEStringEClassifier().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prEGenericTypeDecl().ele0000CrossReferenceEStringEClassifier(); 
 				return new Solution(obj);
@@ -6424,6 +6676,7 @@ protected class EGenericTypeDecl_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele001Group();
 	}
@@ -6453,6 +6706,7 @@ protected class EGenericTypeDecl_0_0_1_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele0010Group();
 	}
@@ -6482,6 +6736,7 @@ protected class EGenericTypeDecl_0_0_1_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele00100Group();
 	}
@@ -6511,6 +6766,7 @@ protected class EGenericTypeDecl_0_0_1_0_0_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele001000KeywordLessThanSign();
 	}	
@@ -6523,6 +6779,7 @@ protected class EGenericTypeDecl_0_0_1_0_0_1_Assignment_eTypeArguments extends A
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele001001AssignmentETypeArguments();
 	}
@@ -6534,7 +6791,7 @@ protected class EGenericTypeDecl_0_0_1_0_0_1_Assignment_eTypeArguments extends A
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -6556,6 +6813,7 @@ protected class EGenericTypeDecl_0_0_1_0_1_Group extends GroupToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele00101Group();
 	}
@@ -6585,6 +6843,7 @@ protected class EGenericTypeDecl_0_0_1_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele001010KeywordComma();
 	}	
@@ -6597,6 +6856,7 @@ protected class EGenericTypeDecl_0_0_1_0_1_1_Assignment_eTypeArguments extends A
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele001011AssignmentETypeArguments();
 	}
@@ -6608,7 +6868,7 @@ protected class EGenericTypeDecl_0_0_1_0_1_1_Assignment_eTypeArguments extends A
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -6631,6 +6891,7 @@ protected class EGenericTypeDecl_0_0_1_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele0011KeywordGreaterThanSign();
 	}	
@@ -6645,6 +6906,7 @@ protected class EGenericTypeDecl_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele01Group();
 	}
@@ -6674,6 +6936,7 @@ protected class EGenericTypeDecl_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele010KeywordNumberSign();
 	}	
@@ -6686,6 +6949,7 @@ protected class EGenericTypeDecl_0_1_1_Assignment_eTypeParameter extends Assignm
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele011AssignmentETypeParameter();
 	}
@@ -6696,7 +6960,7 @@ protected class EGenericTypeDecl_0_1_1_Assignment_eTypeParameter extends Assignm
 		IInstanceDescription obj = current.cloneAndConsume("eTypeParameter");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("ETypeParameter")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().ele0110CrossReferenceEStringETypeParameter().getType().getType())) {
 				type = AssignmentType.CR;
 				element = grammarAccess.prEGenericTypeDecl().ele0110CrossReferenceEStringETypeParameter(); 
 				return new Solution(obj);
@@ -6715,6 +6979,7 @@ protected class EGenericTypeDecl_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele1Group();
 	}
@@ -6744,6 +7009,7 @@ protected class EGenericTypeDecl_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele10KeywordQuestionMark();
 	}	
@@ -6756,6 +7022,7 @@ protected class EGenericTypeDecl_1_1_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele11Alternatives();
 	}
@@ -6778,6 +7045,7 @@ protected class EGenericTypeDecl_1_1_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele110Group();
 	}
@@ -6807,6 +7075,7 @@ protected class EGenericTypeDecl_1_1_0_0_Keyword_extends extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele1100KeywordExtends();
 	}	
@@ -6819,6 +7088,7 @@ protected class EGenericTypeDecl_1_1_0_1_Assignment_eUpperBound extends Assignme
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele1101AssignmentEUpperBound();
 	}
@@ -6830,7 +7100,7 @@ protected class EGenericTypeDecl_1_1_0_1_Assignment_eUpperBound extends Assignme
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -6852,6 +7122,7 @@ protected class EGenericTypeDecl_1_1_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele111Group();
 	}
@@ -6881,6 +7152,7 @@ protected class EGenericTypeDecl_1_1_1_0_Keyword_super extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele1110KeywordSuper();
 	}	
@@ -6893,6 +7165,7 @@ protected class EGenericTypeDecl_1_1_1_1_Assignment_eLowerBound extends Assignme
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEGenericTypeDecl().ele1111AssignmentELowerBound();
 	}
@@ -6904,7 +7177,7 @@ protected class EGenericTypeDecl_1_1_1_1_Assignment_eLowerBound extends Assignme
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -6939,6 +7212,7 @@ protected class EOperationDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().eleGroup();
 	}
@@ -6968,6 +7242,7 @@ protected class EOperationDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0Group();
 	}
@@ -6997,6 +7272,7 @@ protected class EOperationDecl_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00Group();
 	}
@@ -7026,6 +7302,7 @@ protected class EOperationDecl_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000Group();
 	}
@@ -7055,6 +7332,7 @@ protected class EOperationDecl_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0000Group();
 	}
@@ -7084,6 +7362,7 @@ protected class EOperationDecl_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00000Group();
 	}
@@ -7113,6 +7392,7 @@ protected class EOperationDecl_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000000Group();
 	}
@@ -7142,6 +7422,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0000000Group();
 	}
@@ -7171,6 +7452,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00000000Group();
 	}
@@ -7200,6 +7482,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000000000Group();
 	}
@@ -7229,6 +7512,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_0_0_0_Assignment_eAnnotations exten
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0000000000AssignmentEAnnotations();
 	}
@@ -7240,7 +7524,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_0_0_0_Assignment_eAnnotations exten
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EAnnotation")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) {
 				Solution s = new EAnnotationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -7261,6 +7545,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_0_0_1_Alternatives extends Alternat
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0000000001Alternatives();
 	}
@@ -7283,6 +7568,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_0_0_1_0_Assignment_unique extends A
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00000000010AssignmentUnique();
 	}
@@ -7309,6 +7595,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_0_0_1_1_Assignment_ordered extends
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00000000011AssignmentOrdered();
 	}
@@ -7337,6 +7624,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_0_1_Keyword_op extends KeywordToken
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000000001KeywordOp();
 	}	
@@ -7350,6 +7638,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_1_Alternatives extends Alternatives
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00000001Alternatives();
 	}
@@ -7372,6 +7661,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_1_0_Assignment_eGenericType extends
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000000010AssignmentEGenericType();
 	}
@@ -7383,7 +7673,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_1_0_Assignment_eGenericType extends
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -7404,6 +7694,7 @@ protected class EOperationDecl_0_0_0_0_0_0_0_1_1_Keyword_void extends KeywordTok
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000000011KeywordVoid();
 	}	
@@ -7418,6 +7709,7 @@ protected class EOperationDecl_0_0_0_0_0_0_1_Assignment_name extends AssignmentT
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0000001AssignmentName();
 	}
@@ -7443,6 +7735,7 @@ protected class EOperationDecl_0_0_0_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000001Group();
 	}
@@ -7472,6 +7765,7 @@ protected class EOperationDecl_0_0_0_0_0_1_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0000010Group();
 	}
@@ -7501,6 +7795,7 @@ protected class EOperationDecl_0_0_0_0_0_1_0_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00000100Group();
 	}
@@ -7530,6 +7825,7 @@ protected class EOperationDecl_0_0_0_0_0_1_0_0_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000001000KeywordLessThanSign();
 	}	
@@ -7542,6 +7838,7 @@ protected class EOperationDecl_0_0_0_0_0_1_0_0_1_Assignment_eTypeParameters exte
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000001001AssignmentETypeParameters();
 	}
@@ -7553,7 +7850,7 @@ protected class EOperationDecl_0_0_0_0_0_1_0_0_1_Assignment_eTypeParameters exte
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("ETypeParameter")) {
+			if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getType())) {
 				Solution s = new ETypeParameterDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -7575,6 +7872,7 @@ protected class EOperationDecl_0_0_0_0_0_1_0_1_Group extends GroupToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00000101Group();
 	}
@@ -7604,6 +7902,7 @@ protected class EOperationDecl_0_0_0_0_0_1_0_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000001010KeywordComma();
 	}	
@@ -7616,6 +7915,7 @@ protected class EOperationDecl_0_0_0_0_0_1_0_1_1_Assignment_eTypeParameters exte
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000001011AssignmentETypeParameters();
 	}
@@ -7627,7 +7927,7 @@ protected class EOperationDecl_0_0_0_0_0_1_0_1_1_Assignment_eTypeParameters exte
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("ETypeParameter")) {
+			if(param.isInstanceOf(grammarAccess.prETypeParameterDecl().getRule().getType().getType())) {
 				Solution s = new ETypeParameterDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -7650,6 +7950,7 @@ protected class EOperationDecl_0_0_0_0_0_1_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0000011KeywordGreaterThanSign();
 	}	
@@ -7664,6 +7965,7 @@ protected class EOperationDecl_0_0_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00001KeywordLeftParenthesis();
 	}	
@@ -7677,6 +7979,7 @@ protected class EOperationDecl_0_0_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0001Group();
 	}
@@ -7706,6 +8009,7 @@ protected class EOperationDecl_0_0_0_1_0_Assignment_eParameters extends Assignme
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00010AssignmentEParameters();
 	}
@@ -7717,7 +8021,7 @@ protected class EOperationDecl_0_0_0_1_0_Assignment_eParameters extends Assignme
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EParameter")) {
+			if(param.isInstanceOf(grammarAccess.prEParameterDecl().getRule().getType().getType())) {
 				Solution s = new EParameterDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -7738,6 +8042,7 @@ protected class EOperationDecl_0_0_0_1_1_Group extends GroupToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele00011Group();
 	}
@@ -7767,6 +8072,7 @@ protected class EOperationDecl_0_0_0_1_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000110KeywordComma();
 	}	
@@ -7779,6 +8085,7 @@ protected class EOperationDecl_0_0_0_1_1_1_Assignment_eParameters extends Assign
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele000111AssignmentEParameters();
 	}
@@ -7790,7 +8097,7 @@ protected class EOperationDecl_0_0_0_1_1_1_Assignment_eParameters extends Assign
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EParameter")) {
+			if(param.isInstanceOf(grammarAccess.prEParameterDecl().getRule().getType().getType())) {
 				Solution s = new EParameterDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -7814,6 +8121,7 @@ protected class EOperationDecl_0_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele001KeywordRightParenthesis();
 	}	
@@ -7827,6 +8135,7 @@ protected class EOperationDecl_0_1_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele01Group();
 	}
@@ -7856,6 +8165,7 @@ protected class EOperationDecl_0_1_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele010Group();
 	}
@@ -7885,6 +8195,7 @@ protected class EOperationDecl_0_1_0_0_Keyword_throws extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0100KeywordThrows();
 	}	
@@ -7897,6 +8208,7 @@ protected class EOperationDecl_0_1_0_1_Assignment_eGenericExceptions extends Ass
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0101AssignmentEGenericExceptions();
 	}
@@ -7908,7 +8220,7 @@ protected class EOperationDecl_0_1_0_1_Assignment_eGenericExceptions extends Ass
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -7930,6 +8242,7 @@ protected class EOperationDecl_0_1_1_Group extends GroupToken {
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele011Group();
 	}
@@ -7959,6 +8272,7 @@ protected class EOperationDecl_0_1_1_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0110KeywordComma();
 	}	
@@ -7971,6 +8285,7 @@ protected class EOperationDecl_0_1_1_1_Assignment_eGenericExceptions extends Ass
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele0111AssignmentEGenericExceptions();
 	}
@@ -7982,7 +8297,7 @@ protected class EOperationDecl_0_1_1_1_Assignment_eGenericExceptions extends Ass
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -8006,6 +8321,7 @@ protected class EOperationDecl_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prEOperationDecl().ele1KeywordSemicolon();
 	}	
@@ -8029,6 +8345,7 @@ protected class EParameterDecl_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEParameterDecl().eleGroup();
 	}
@@ -8058,6 +8375,7 @@ protected class EParameterDecl_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prEParameterDecl().ele0Group();
 	}
@@ -8087,6 +8405,7 @@ protected class EParameterDecl_0_0_Assignment_eAnnotations extends AssignmentTok
 		super(curr, pred, IS_MANY, !IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEParameterDecl().ele00AssignmentEAnnotations();
 	}
@@ -8098,7 +8417,7 @@ protected class EParameterDecl_0_0_Assignment_eAnnotations extends AssignmentTok
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EAnnotation")) {
+			if(param.isInstanceOf(grammarAccess.prEAnnotationDecl().getRule().getType().getType())) {
 				Solution s = new EAnnotationDecl_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -8119,6 +8438,7 @@ protected class EParameterDecl_0_1_Assignment_eGenericType extends AssignmentTok
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEParameterDecl().ele01AssignmentEGenericType();
 	}
@@ -8130,7 +8450,7 @@ protected class EParameterDecl_0_1_Assignment_eGenericType extends AssignmentTok
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf("EGenericType")) {
+			if(param.isInstanceOf(grammarAccess.prEGenericTypeReferenceDecl().getRule().getType().getType())) {
 				Solution s = new EGenericTypeReferenceDecl_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -8152,6 +8472,7 @@ protected class EParameterDecl_1_Assignment_name extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prEParameterDecl().ele1AssignmentName();
 	}
@@ -8187,6 +8508,7 @@ protected class MapEntrySuper_RuleCall_MapEntry extends RuleCallToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public RuleCall getGrammarElement() {
 		return grammarAccess.prMapEntrySuper().eleParserRuleCallMapEntry();
 	}
@@ -8194,7 +8516,7 @@ protected class MapEntrySuper_RuleCall_MapEntry extends RuleCallToken {
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(MapEntry_Group.class, current)) return null;
-		if(!current.isInstanceOf("MapEntry")) return null;
+		if(!current.isInstanceOf(grammarAccess.prMapEntry().getRule().getType().getType())) return null;
 		return new MapEntry_Group(current, this).firstSolution();
 	}
 }
@@ -8216,6 +8538,7 @@ protected class MapEntry_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prMapEntry().eleGroup();
 	}
@@ -8245,6 +8568,7 @@ protected class MapEntry_0_Group extends GroupToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Group getGrammarElement() {
 		return grammarAccess.prMapEntry().ele0Group();
 	}
@@ -8274,6 +8598,7 @@ protected class MapEntry_0_0_Assignment_detailKey extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prMapEntry().ele00AssignmentDetailKey();
 	}
@@ -8298,6 +8623,7 @@ protected class MapEntry_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prMapEntry().ele01KeywordEqualsSign();
 	}	
@@ -8311,6 +8637,7 @@ protected class MapEntry_1_Assignment_detailValue extends AssignmentToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Assignment getGrammarElement() {
 		return grammarAccess.prMapEntry().ele1AssignmentDetailValue();
 	}
@@ -8346,6 +8673,7 @@ protected class MultiplicityExpr_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prMultiplicityExpr().eleAlternatives();
 	}
@@ -8368,6 +8696,7 @@ protected class MultiplicityExpr_0_Alternatives extends AlternativesToken {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Alternatives getGrammarElement() {
 		return grammarAccess.prMultiplicityExpr().ele0Alternatives();
 	}
@@ -8390,6 +8719,7 @@ protected class MultiplicityExpr_0_0_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prMultiplicityExpr().ele00KeywordPlusSign();
 	}	
@@ -8402,6 +8732,7 @@ protected class MultiplicityExpr_0_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prMultiplicityExpr().ele01KeywordQuestionMark();
 	}	
@@ -8415,6 +8746,7 @@ protected class MultiplicityExpr_1_Keyword extends KeywordToken  {
 		super(curr, pred, !IS_MANY, IS_REQUIRED);
 	}
 	
+	@Override
 	public Keyword getGrammarElement() {
 		return grammarAccess.prMultiplicityExpr().ele1KeywordAsterisk();
 	}	
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslMetamodelAccess.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslMetamodelAccess.java
index 4824d9e..bc287d7 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslMetamodelAccess.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslMetamodelAccess.java
@@ -9,42 +9,42 @@ import org.eclipse.xtext.parser.BaseEPackageAccess;
 
 public class EcoreDslMetamodelAccess extends BaseEPackageAccess implements IMetamodelAccess {
 
-{
-
+	protected static final String ECOREDSL_NS_URI = "http://example.xtext.org/EcoreDsl";
+	
+	
+	public static void init() {
 		if (!EPackage.Registry.INSTANCE.containsKey(ECOREDSL_NS_URI))
-			EPackage.Registry.INSTANCE.put(ECOREDSL_NS_URI, loadEcoreFile(getClass().getClassLoader(), "classpath:/org/eclipse/xtext/example/ecoredsl.ecore"));
+			EPackage.Registry.INSTANCE.put(ECOREDSL_NS_URI, loadEcoreFile(EcoreDslMetamodelAccess.class.getClassLoader(), "classpath:/org/eclipse/xtext/example/ecoredsl.ecore"));
+	}
 
-}
+	static {
+		org.eclipse.xtext.builtin.services.XtextBuiltinMetamodelAccess.init();
+		init();
+	}
 
 	private EPackage[] generated = new EPackage[] {
-		
 		getEcoredslEPackage()
-		
-		};
+	};
 
 	public EPackage[] getGeneratedEPackages() {
 		return generated;
 	}
 
 	private EPackage[] referenced = new EPackage[] {
-		
 		BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore")
-		
-		};
+	};
+	
 	public EPackage[] getReferencedEPackages() {
 		return referenced;
 	}
 	
 	private EPackage[] all = new EPackage[] {
 	    getEcoredslEPackage(),BaseEPackageAccess.getEPackageFromRegistry("http://www.eclipse.org/emf/2002/Ecore")
-		};
+	};
 	
 	public EPackage[] getAllEPackages() {
 		return all;
 	}
-
-	
-	protected static final String ECOREDSL_NS_URI = "http://example.xtext.org/EcoreDsl";
 	
 	protected EPackage getEcoredslEPackage() {	
 		return EPackage.Registry.INSTANCE.getEPackage(ECOREDSL_NS_URI);
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 99b2072..8af2097 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
@@ -94,7 +94,7 @@ ruleStatemachine returns [EObject current=null]
 	    lv_events_1=ruleEvent 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Statemachine");
+	            $current = factory.create(grammarAccess.prStatemachine().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -123,7 +123,7 @@ ruleStatemachine returns [EObject current=null]
 	    lv_commands_4=ruleCommand 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Statemachine");
+	            $current = factory.create(grammarAccess.prStatemachine().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -148,7 +148,7 @@ ruleStatemachine returns [EObject current=null]
 	    lv_states_6=ruleState 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Statemachine");
+	            $current = factory.create(grammarAccess.prStatemachine().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -193,7 +193,7 @@ ruleEvent returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Event");
+	            $current = factory.create(grammarAccess.prEvent().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -213,7 +213,7 @@ ruleEvent returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Event");
+	            $current = factory.create(grammarAccess.prEvent().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -233,7 +233,7 @@ ruleEvent returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Event");
+	            $current = factory.create(grammarAccess.prEvent().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -276,7 +276,7 @@ ruleCommand returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Command");
+	            $current = factory.create(grammarAccess.prCommand().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -296,7 +296,7 @@ ruleCommand returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("Command");
+	            $current = factory.create(grammarAccess.prCommand().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -343,7 +343,7 @@ ruleState returns [EObject current=null]
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create("State");
+	            $current = factory.create(grammarAccess.prState().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -367,7 +367,7 @@ ruleState returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("State");
+	            $current = factory.create(grammarAccess.prState().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -391,7 +391,7 @@ ruleState returns [EObject current=null]
 	    lv_transitions_6=ruleTransition 
 	    {
 	        if ($current==null) {
-	            $current = factory.create("State");
+	            $current = factory.create(grammarAccess.prState().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -435,7 +435,7 @@ ruleTransition returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("Transition");
+	            $current = factory.create(grammarAccess.prTransition().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
@@ -455,7 +455,7 @@ ruleTransition returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create("Transition");
+	            $current = factory.create(grammarAccess.prTransition().getRule().getType().getType());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslParser.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslParser.java
index c3881b8..46ca7c7 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslParser.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslParser.java
@@ -163,7 +163,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("Statemachine");
+            	    	            current = factory.create(grammarAccess.prStatemachine().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -224,7 +224,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("Statemachine");
+            	    	            current = factory.create(grammarAccess.prStatemachine().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -278,7 +278,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("Statemachine");
+            	    	            current = factory.create(grammarAccess.prStatemachine().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -394,7 +394,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
                         
 
                     	        if (current==null) {
-                    	            current = factory.create("Event");
+                    	            current = factory.create(grammarAccess.prEvent().getRule().getType().getType());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -420,7 +420,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("Event");
+            	            current = factory.create(grammarAccess.prEvent().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -446,7 +446,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("Event");
+            	            current = factory.create(grammarAccess.prEvent().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -543,7 +543,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("Command");
+            	            current = factory.create(grammarAccess.prCommand().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -566,7 +566,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("Command");
+            	            current = factory.create(grammarAccess.prCommand().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -677,7 +677,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
             	
 
             	        if (current==null) {
-            	            current = factory.create("State");
+            	            current = factory.create(grammarAccess.prState().getRule().getType().getType());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -739,7 +739,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
                     	    {
 
                     	    			if (current==null) {
-                    	    	            current = factory.create("State");
+                    	    	            current = factory.create(grammarAccess.prState().getRule().getType().getType());
                     	    	            associateNodeWithAstElement(currentNode, current);
                     	    	        }
                     	            
@@ -800,7 +800,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create("State");
+            	    	            current = factory.create(grammarAccess.prState().getRule().getType().getType());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -906,7 +906,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser {
             {
 
             			if (current==null) {
-            	            current = factory.create("Transition");
+            	            current = factory.create(grammarAccess.prTransition().getRule().getType().getType());