ASSIGNED - bug 261364: Bug in ContentAssist for Assignments

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

27 files changed, 432 insertions, 393 deletions

diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
index c70d0ae..e234417 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore
@@ -16,12 +16,12 @@
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Person">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/>
   <eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/>
diff --git a/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 57709a4..72c221a 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
@@ -24,25 +24,25 @@ T24 : 'GELB' ;
 T25 : 'GRÜN' ;
 T26 : 'type' ;
 
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 722
+// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 722
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 724
+// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 724
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 726
+// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 726
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 728
+// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 728
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 730
+// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 730
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 732
+// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 732
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 734
+// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 734
 RULE_ANY_OTHER : .;
 
 
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel.ecore b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel.ecore
index 6d74b1d..9f2974c 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel.ecore
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel.ecore
@@ -34,10 +34,10 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="//TypedElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="TypedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TypeRef">
     <eStructuralFeatures xsi:type="ecore:EReference" name="referenced" eType="//Type"/>
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 b170841..9d8acc3 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g
@@ -24,25 +24,25 @@ T24 : ',' ;
 T25 : ')' ;
 T26 : '.' ;
 
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1020
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1020
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1022
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1022
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1024
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1024
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1026
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1026
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1028
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1028
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1030
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1030
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1032
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1032
 RULE_ANY_OTHER : .;
 
 
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 c78cd9b..6e0d9b4 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g
@@ -17,25 +17,25 @@ T17 : '{' ;
 T18 : '}' ;
 T19 : '=>' ;
 
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 476
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 476
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 478
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 478
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 480
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 480
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 482
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 482
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 484
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 484
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 486
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 486
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 488
+// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 488
 RULE_ANY_OTHER : .;
 
 
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/AbstractXtendProposalProvider.java b/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/AbstractXtendProposalProvider.java
index 63023ef..e9d792a 100644
--- a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/AbstractXtendProposalProvider.java
+++ b/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/AbstractXtendProposalProvider.java
@@ -54,6 +54,7 @@ import org.eclipse.xtext.util.Strings;
  *  </code>
  * 
  * @author Jan K&ouml;hnlein
+ * @author Michael Clay
  * 
  * @see IProposalProvider
  * @see AbstractJavaProposalProvider
@@ -62,6 +63,9 @@ public abstract class AbstractXtendProposalProvider extends AbstractXtendService
 
 	protected final Logger logger = Logger.getLogger(IProposalProvider.class);
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeKeyword(Keyword, IContentAssistContext)
+	 */
 	public List<? extends ICompletionProposal> completeKeyword(Keyword keyword,
 			IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
@@ -72,6 +76,9 @@ public abstract class AbstractXtendProposalProvider extends AbstractXtendService
 				.singletonList(new XtextCompletionProposal(keyword, keyword.getValue(), contentAssistContext));
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeRuleCall(RuleCall, IContentAssistContext)
+	 */
 	public List<? extends ICompletionProposal> completeRuleCall(RuleCall ruleCall,
 			IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
@@ -85,17 +92,20 @@ public abstract class AbstractXtendProposalProvider extends AbstractXtendService
 		}
 		else if (calledRule.getType() != null) {
 			TypeRef typeRef = calledRule.getType();
-			return invokeExtension("complete" + Strings.toFirstUpper(typeRef.getMetamodel().getAlias())
+			return invokeExtension("complete" + Strings.toFirstUpper(typeRef.getMetamodel().getAlias()) + "_"
 					+ Strings.toFirstUpper(typeRef.getType().getName()), Arrays.asList(ruleCall, contentAssistContext
 					.getModel(), contentAssistContext));
 		}
 		return Collections.emptyList();
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeAssignment(Assignment, IContentAssistContext)
+	 */
 	public List<? extends ICompletionProposal> completeAssignment(Assignment assignment,
 			IContentAssistContext contentAssistContext) {
 		ParserRule parserRule = GrammarUtil.containingParserRule(assignment);
-		return invokeExtension("complete" + Strings.toFirstUpper(parserRule.getName())
+		return invokeExtension("complete" + Strings.toFirstUpper(parserRule.getName()) + "_"
 				+ Strings.toFirstUpper(assignment.getFeature()), Arrays.asList(assignment, contentAssistContext));
 	}
 
@@ -118,14 +128,23 @@ public abstract class AbstractXtendProposalProvider extends AbstractXtendService
 		return null;
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplateContextType(Keyword, IContentAssistContext)
+	 */
 	public TemplateContextType getTemplateContextType(Keyword keyword, IContentAssistContext contentAssistContext) {
 		return null;
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplateContextType(RuleCall, IContentAssistContext)
+	 */
 	public TemplateContextType getTemplateContextType(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
 		return null;
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplates(String)
+	 */
 	public Template[] getTemplates(String contextTypeId) {
 		return new Template[] {};
 	}
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractJavaProposalProvider.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractJavaProposalProvider.java
index a2f23c9..f89db7f 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractJavaProposalProvider.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractJavaProposalProvider.java
@@ -40,6 +40,7 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
 import org.eclipse.xtext.util.Strings;
 
 /**
+ * @author Michael Clay - Initial contribution and API
  * @author Jan Köhnlein - Initial contribution and API
  */
 public abstract class AbstractJavaProposalProvider implements IProposalProvider {
@@ -61,6 +62,9 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
 		invoker = new JavaReflectiveMethodInvoker(this);
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeKeyword(Keyword, IContentAssistContext)
+	 */
 	public List<? extends ICompletionProposal> completeKeyword(Keyword keyword,
 			IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
@@ -70,6 +74,9 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
 		return Collections.singletonList(createCompletionProposal(keyword, keyword.getValue(), contentAssistContext));
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeRuleCall(RuleCall, IContentAssistContext)
+	 */
 	public List<? extends ICompletionProposal> completeRuleCall(RuleCall ruleCall,
 			IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
@@ -87,7 +94,7 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
 
 			TypeRef typeRef = calledRule.getType();
 
-			return invokeMethod("complete" + Strings.toFirstUpper(typeRef.getMetamodel().getAlias())
+			return invokeMethod("complete" + Strings.toFirstUpper(typeRef.getMetamodel().getAlias()) + "_"
 					+ Strings.toFirstUpper(typeRef.getType().getName()), Arrays.<Class<?>> asList(RuleCall.class,
 					contentAssistContext.getModel() == null ? EObject.class : contentAssistContext.getModel()
 							.getClass(), IContentAssistContext.class), Arrays.asList(ruleCall, contentAssistContext
@@ -96,11 +103,14 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
 		return Collections.emptyList();
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeAssignment(Assignment, IContentAssistContext)
+	 */
 	public List<? extends ICompletionProposal> completeAssignment(Assignment assignment,
 			IContentAssistContext contentAssistContext) {
 		ParserRule parserRule = GrammarUtil.containingParserRule(assignment);
 		// TODO : Better call completeRuleCall ?
-		return invokeMethod("complete" + Strings.toFirstUpper(parserRule.getName())
+		return invokeMethod("complete" + Strings.toFirstUpper(parserRule.getName()) + "_"
 				+ Strings.toFirstUpper(assignment.getFeature()), Arrays.<Class<?>> asList(Assignment.class,
 				IContentAssistContext.class), Arrays.asList(assignment, contentAssistContext));
 	}
@@ -120,14 +130,23 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
 		return (List<? extends ICompletionProposal>) invoker.invoke(methodName, parameterTypes, parameterValues);
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplateContextType(Keyword, IContentAssistContext)
+	 */
 	public TemplateContextType getTemplateContextType(Keyword keyword, IContentAssistContext contentAssistContext) {
 		return null;
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplateContextType(RuleCall, IContentAssistContext)
+	 */
 	public TemplateContextType getTemplateContextType(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
 		return null;
 	}
 
+	/**
+	 * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplates(String)
+	 */
 	public Template[] getTemplates(String contextTypeId) {
 		return new Template[] {};
 	}
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/JavaReflectiveMethodInvoker.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/JavaReflectiveMethodInvoker.java
index f6375db..fe2dd04 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/JavaReflectiveMethodInvoker.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/JavaReflectiveMethodInvoker.java
@@ -21,6 +21,7 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
  * map.
  * 
  * @author Jan K&ouml;hnlein - Initial contribution and API
+ * @author Michael Clay
  * 
  */
 public class JavaReflectiveMethodInvoker {
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
index 8d076d0..050e1ba 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
@@ -14,10 +14,10 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="rules" unique="false" upperBound="-1" eType="//AbstractRule" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractRule">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g
index 79ef5cc..32de776 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage__.g
@@ -41,25 +41,25 @@ T41 : '..' ;
 T42 : '[' ;
 T43 : ']' ;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2219
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2219
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2221
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2221
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2223
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2223
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2225
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2225
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2227
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2227
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2229
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2229
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2231
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/antlr/internal/InternalXtextGrammarTestLanguage.g" 2231
 RULE_ANY_OTHER : .;
 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
index d0d0a55..8d02c8e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
@@ -13,12 +13,12 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="familie" unique="false" upperBound="-1" eType="//Familie" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Person">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/>
   <eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g
index 302bcb7..0372934 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage__.g
@@ -15,25 +15,25 @@ T15 : ';' ;
 T16 : 'rule' ;
 T17 : ':' ;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 356
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 356
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 358
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 358
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 360
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 360
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 362
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 362
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 364
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 364
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 366
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 366
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 368
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalContentAssistTestLanguage.g" 368
 RULE_ANY_OTHER : .;
 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g
index ae247e8..4cdf777 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage__.g
@@ -23,25 +23,25 @@ T23 : 'familie' ;
 T24 : 'keyword' ;
 T25 : ',' ;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 636
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 636
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 638
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 638
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 640
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 640
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 642
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 642
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 644
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 644
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 646
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 646
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 648
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalReferenceGrammarTestLanguage.g" 648
 RULE_ANY_OTHER : .;
 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g
index 2fcb6a2..4f6a11f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage__.g
@@ -12,25 +12,25 @@ T12 : ')' ;
 T13 : '{' ;
 T14 : '};' ;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 213
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 213
 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 215
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 215
 RULE_INT : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 217
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 217
 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 219
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 219
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 221
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 221
 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 223
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 223
 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
 
-// $ANTLR src "../org.eclipse.xtext.ui.common.tests//../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 225
+// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/antlr/internal/InternalTreeTestLanguage.g" 225
 RULE_ANY_OTHER : .;
 
 
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java
index 8cd6b59..40fc3e2 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java
@@ -21,159 +21,159 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
  */
 public class GenXtextGrammarTestLanguageProposalProvider extends AbstractJavaProposalProvider {
 	// constants
-	private static final String UI_PLUGIN_ID  = "";
+	private static final String UI_PLUGIN_ID  = ".";
 	
 	
 			
-	public List<? extends ICompletionProposal> completeGrammarAbstract(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeGrammar_Abstract(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeGrammarAbstract feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeGrammar_Abstract feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeGrammarIdElements(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeGrammar_IdElements(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeGrammarIdElements feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeGrammar_IdElements feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "GrammarIdElements", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Grammar_IdElements", contentAssistContext));
 	}
 			
 			
-	public List<? extends ICompletionProposal> completeGrammarSuperGrammarIdElements(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeGrammar_SuperGrammarIdElements(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeGrammarSuperGrammarIdElements feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeGrammar_SuperGrammarIdElements feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "GrammarSuperGrammarIdElements", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Grammar_SuperGrammarIdElements", contentAssistContext));
 	}
 			
 			
-	public List<? extends ICompletionProposal> completeGrammarMetamodelDeclarations(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeGrammar_MetamodelDeclarations(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeGrammarMetamodelDeclarations feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeGrammar_MetamodelDeclarations feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeGrammarRules(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeGrammar_Rules(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeGrammarRules feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeGrammar_Rules feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeGeneratedMetamodelName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeGeneratedMetamodel_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeGeneratedMetamodelName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeGeneratedMetamodel_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "GeneratedMetamodelName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "GeneratedMetamodel_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeGeneratedMetamodelEPackage(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeGeneratedMetamodel_EPackage(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeGeneratedMetamodelEPackage feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeGeneratedMetamodel_EPackage feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeGeneratedMetamodelAlias(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeGeneratedMetamodel_Alias(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeGeneratedMetamodelAlias feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeGeneratedMetamodel_Alias feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "GeneratedMetamodelAlias", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "GeneratedMetamodel_Alias", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeReferencedMetamodelEPackage(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeReferencedMetamodel_EPackage(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeReferencedMetamodelEPackage feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeReferencedMetamodel_EPackage feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeReferencedMetamodelAlias(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeReferencedMetamodel_Alias(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeReferencedMetamodelAlias feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeReferencedMetamodel_Alias feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "ReferencedMetamodelAlias", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "ReferencedMetamodel_Alias", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeLexerRuleName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeLexerRule_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeLexerRuleName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeLexerRule_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "LexerRuleName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "LexerRule_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeLexerRuleType(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeLexerRule_Type(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeLexerRuleType feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeLexerRule_Type feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeLexerRuleBody(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeLexerRule_Body(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeLexerRuleBody feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeLexerRule_Body feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "\"LexerRuleBody\"", contentAssistContext));		
+		return Collections.singletonList(createCompletionProposal(assignment, "\"LexerRule_Body\"", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeParserRuleName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeParserRule_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeParserRuleName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeParserRule_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "ParserRuleName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "ParserRule_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeParserRuleType(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeParserRule_Type(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeParserRuleType feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeParserRule_Type feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeParserRuleDefinesHiddenTokens(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeParserRule_DefinesHiddenTokens(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeParserRuleDefinesHiddenTokens feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeParserRule_DefinesHiddenTokens feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeParserRuleHiddenTokens(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeParserRule_HiddenTokens(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeParserRuleHiddenTokens feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeParserRule_HiddenTokens feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
@@ -181,243 +181,243 @@ public class GenXtextGrammarTestLanguageProposalProvider extends AbstractJavaPro
 	}
 			
 			
-	public List<? extends ICompletionProposal> completeParserRuleAlternatives(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeParserRule_Alternatives(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeParserRuleAlternatives feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeParserRule_Alternatives feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeTerminalRuleTerminal(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTerminalRule_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTerminalRuleTerminal feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTerminalRule_Terminal feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeTerminalRuleName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTerminalRule_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTerminalRuleName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTerminalRule_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "TerminalRuleName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "TerminalRule_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeTerminalRuleType(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTerminalRule_Type(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTerminalRuleType feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTerminalRule_Type feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeTerminalRuleAlternatives(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTerminalRule_Alternatives(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTerminalRuleAlternatives feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTerminalRule_Alternatives feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeTypeRefMetamodel(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTypeRef_Metamodel(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTypeRefMetamodel feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTypeRef_Metamodel feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeTypeRefType(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTypeRef_Type(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTypeRefType feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTypeRef_Type feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeAlternativesGroups(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAlternatives_Groups(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeAlternativesGroups feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAlternatives_Groups feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeTerminalAlternativesGroups(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTerminalAlternatives_Groups(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTerminalAlternativesGroups feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTerminalAlternatives_Groups feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeGroupAbstractTokens(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeGroup_AbstractTokens(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeGroupAbstractTokens feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeGroup_AbstractTokens feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeTerminalGroupAbstractTokens(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTerminalGroup_AbstractTokens(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTerminalGroupAbstractTokens feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTerminalGroup_AbstractTokens feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeAbstractTokenCardinality(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAbstractToken_Cardinality(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeAbstractTokenCardinality feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAbstractToken_Cardinality feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeTerminalTokenCardinality(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeTerminalToken_Cardinality(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeTerminalTokenCardinality feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeTerminalToken_Cardinality feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeAssignmentFeature(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAssignment_Feature(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeAssignmentFeature feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAssignment_Feature feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "AssignmentFeature", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Assignment_Feature", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeAssignmentOperator(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAssignment_Operator(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeAssignmentOperator feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAssignment_Operator feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeAssignmentTerminal(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAssignment_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeAssignmentTerminal feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAssignment_Terminal feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeActionTypeName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAction_TypeName(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeActionTypeName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAction_TypeName feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeActionFeature(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAction_Feature(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeActionFeature feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAction_Feature feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "ActionFeature", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Action_Feature", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeActionOperator(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAction_Operator(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeActionOperator feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAction_Operator feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeNegatedTokenTerminal(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeNegatedToken_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeNegatedTokenTerminal feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeNegatedToken_Terminal feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeUpToTokenTerminal(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeUpToToken_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeUpToTokenTerminal feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeUpToToken_Terminal feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeWildcardIsWildcard(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeWildcard_IsWildcard(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeWildcardIsWildcard feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeWildcard_IsWildcard feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeCharacterRangeRight(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeCharacterRange_Right(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeCharacterRangeRight feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeCharacterRange_Right feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeCrossReferenceType(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeCrossReference_Type(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeCrossReferenceType feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeCrossReference_Type feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeCrossReferenceRule(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeCrossReference_Rule(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeCrossReferenceRule feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeCrossReference_Rule feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeKeywordValue(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeKeyword_Value(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeKeywordValue feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeKeyword_Value feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "\"KeywordValue\"", contentAssistContext));		
+		return Collections.singletonList(createCompletionProposal(assignment, "\"Keyword_Value\"", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeRuleCallRule(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeRuleCall_Rule(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeRuleCallRule feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeRuleCall_Rule feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.ext
index 93903ab..92933b1 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.ext
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposals.ext
@@ -23,269 +23,269 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 	 
-List[ICompletionProposal] completeGrammarAbstract(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeGrammarAbstract feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeGrammar_Abstract(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeGrammar_Abstract feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeGrammarIdElements(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeGrammarIdElements feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeGrammar_IdElements(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeGrammar_IdElements feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "GrammarIdElements", contentAssistContext) };
+    { newProposal(assignment, "Grammar_IdElements", contentAssistContext) };
 
 	 
-List[ICompletionProposal] completeGrammarSuperGrammarIdElements(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeGrammarSuperGrammarIdElements feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeGrammar_SuperGrammarIdElements(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeGrammar_SuperGrammarIdElements feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "GrammarSuperGrammarIdElements", contentAssistContext) };
+    { newProposal(assignment, "Grammar_SuperGrammarIdElements", contentAssistContext) };
 
 	 
-List[ICompletionProposal] completeGrammarMetamodelDeclarations(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeGrammarMetamodelDeclarations feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeGrammar_MetamodelDeclarations(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeGrammar_MetamodelDeclarations feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeGrammarRules(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeGrammarRules feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeGrammar_Rules(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeGrammar_Rules feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeGeneratedMetamodelName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeGeneratedMetamodelName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeGeneratedMetamodel_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeGeneratedMetamodel_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "GeneratedMetamodelName", contentAssistContext) };
+    { newProposal(assignment, "GeneratedMetamodel_Name", contentAssistContext) };
 	 
-List[ICompletionProposal] completeGeneratedMetamodelEPackage(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeGeneratedMetamodelEPackage feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeGeneratedMetamodel_EPackage(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeGeneratedMetamodel_EPackage feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
 	 
-List[ICompletionProposal] completeGeneratedMetamodelAlias(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeGeneratedMetamodelAlias feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeGeneratedMetamodel_Alias(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeGeneratedMetamodel_Alias feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "GeneratedMetamodelAlias", contentAssistContext) };
+    { newProposal(assignment, "GeneratedMetamodel_Alias", contentAssistContext) };
 	 
-List[ICompletionProposal] completeReferencedMetamodelEPackage(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeReferencedMetamodelEPackage feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeReferencedMetamodel_EPackage(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeReferencedMetamodel_EPackage feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
 	 
-List[ICompletionProposal] completeReferencedMetamodelAlias(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeReferencedMetamodelAlias feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeReferencedMetamodel_Alias(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeReferencedMetamodel_Alias feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "ReferencedMetamodelAlias", contentAssistContext) };
+    { newProposal(assignment, "ReferencedMetamodel_Alias", contentAssistContext) };
 	 
-List[ICompletionProposal] completeLexerRuleName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeLexerRuleName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeLexerRule_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeLexerRule_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "LexerRuleName", contentAssistContext) };
+    { newProposal(assignment, "LexerRule_Name", contentAssistContext) };
 	 
-List[ICompletionProposal] completeLexerRuleType(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeLexerRuleType feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeLexerRule_Type(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeLexerRule_Type feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeLexerRuleBody(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeLexerRuleBody feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeLexerRule_Body(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeLexerRule_Body feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-	{ newProposal(assignment, "\"LexerRuleBody\"", contentAssistContext) };
+	{ newProposal(assignment, "\"LexerRule_Body\"", contentAssistContext) };
 	 
-List[ICompletionProposal] completeParserRuleName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeParserRuleName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeParserRule_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeParserRule_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "ParserRuleName", contentAssistContext) };
+    { newProposal(assignment, "ParserRule_Name", contentAssistContext) };
 	 
-List[ICompletionProposal] completeParserRuleType(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeParserRuleType feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeParserRule_Type(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeParserRule_Type feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeParserRuleDefinesHiddenTokens(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeParserRuleDefinesHiddenTokens feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeParserRule_DefinesHiddenTokens(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeParserRule_DefinesHiddenTokens feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeParserRuleHiddenTokens(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeParserRuleHiddenTokens feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeParserRule_HiddenTokens(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeParserRule_HiddenTokens feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
 
 	 
-List[ICompletionProposal] completeParserRuleAlternatives(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeParserRuleAlternatives feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeParserRule_Alternatives(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeParserRule_Alternatives feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeTerminalRuleTerminal(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeTerminalRuleTerminal feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeTerminalRule_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeTerminalRule_Terminal feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeTerminalRuleName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeTerminalRuleName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeTerminalRule_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeTerminalRule_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "TerminalRuleName", contentAssistContext) };
+    { newProposal(assignment, "TerminalRule_Name", contentAssistContext) };
 	 
-List[ICompletionProposal] completeTerminalRuleType(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeTerminalRuleType feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeTerminalRule_Type(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeTerminalRule_Type feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeTerminalRuleAlternatives(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeTerminalRuleAlternatives feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeTerminalRule_Alternatives(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeTerminalRule_Alternatives feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeTypeRefMetamodel(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeTypeRefMetamodel feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeTypeRef_Metamodel(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeTypeRef_Metamodel feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
 	 
-List[ICompletionProposal] completeTypeRefType(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeTypeRefType feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeTypeRef_Type(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeTypeRef_Type feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
 	 
-List[ICompletionProposal] completeAlternativesGroups(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeAlternativesGroups feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeAlternatives_Groups(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeAlternatives_Groups feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeTerminalAlternativesGroups(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeTerminalAlternativesGroups feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeTerminalAlternatives_Groups(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeTerminalAlternatives_Groups feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeGroupAbstractTokens(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeGroupAbstractTokens feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeGroup_AbstractTokens(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeGroup_AbstractTokens feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeTerminalGroupAbstractTokens(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeTerminalGroupAbstractTokens feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeTerminalGroup_AbstractTokens(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeTerminalGroup_AbstractTokens feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeAbstractTokenCardinality(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeAbstractTokenCardinality feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeAbstractToken_Cardinality(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeAbstractToken_Cardinality feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeTerminalTokenCardinality(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeTerminalTokenCardinality feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeTerminalToken_Cardinality(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeTerminalToken_Cardinality feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeAssignmentFeature(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeAssignmentFeature feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeAssignment_Feature(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeAssignment_Feature feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "AssignmentFeature", contentAssistContext) };
+    { newProposal(assignment, "Assignment_Feature", contentAssistContext) };
 	 
-List[ICompletionProposal] completeAssignmentOperator(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeAssignmentOperator feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeAssignment_Operator(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeAssignment_Operator feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeAssignmentTerminal(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeAssignmentTerminal feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeAssignment_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeAssignment_Terminal feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeActionTypeName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeActionTypeName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeAction_TypeName(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeAction_TypeName feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeActionFeature(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeActionFeature feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeAction_Feature(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeAction_Feature feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "ActionFeature", contentAssistContext) };
+    { newProposal(assignment, "Action_Feature", contentAssistContext) };
 	 
-List[ICompletionProposal] completeActionOperator(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeActionOperator feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeAction_Operator(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeAction_Operator feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeNegatedTokenTerminal(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeNegatedTokenTerminal feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeNegatedToken_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeNegatedToken_Terminal feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeUpToTokenTerminal(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeUpToTokenTerminal feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeUpToToken_Terminal(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeUpToToken_Terminal feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeWildcardIsWildcard(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeWildcardIsWildcard feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeWildcard_IsWildcard(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeWildcard_IsWildcard feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeCharacterRangeRight(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeCharacterRangeRight feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeCharacterRange_Right(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeCharacterRange_Right feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeCrossReferenceType(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeCrossReferenceType feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeCrossReference_Type(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeCrossReference_Type feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeCrossReferenceRule(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeCrossReferenceRule feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeCrossReference_Rule(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeCrossReference_Rule feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
 	 
-List[ICompletionProposal] completeKeywordValue(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeKeywordValue feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeKeyword_Value(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeKeyword_Value feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-	{ newProposal(assignment, "\"KeywordValue\"", contentAssistContext) };
+	{ newProposal(assignment, "\"Keyword_Value\"", contentAssistContext) };
 	 
-List[ICompletionProposal] completeRuleCallRule(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeRuleCallRule feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeRuleCall_Rule(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeRuleCall_Rule feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java
index 8e19fa2..4705caa 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/XtendXtextGrammarTestLanguageProposalProvider.java
@@ -11,7 +11,7 @@ import org.eclipse.xtext.ui.common.xtend.contentassist.AbstractXtendProposalProv
  */
 public class XtendXtextGrammarTestLanguageProposalProvider extends AbstractXtendProposalProvider {
 
-	private static final String UI_PLUGIN_ID = "";
+	private static final String UI_PLUGIN_ID = ".";
 		
 	@Override
 	protected ClassLoader getClassLoader() {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java
index 1f8bfd3..fcbf0e1 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java
@@ -21,58 +21,58 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
  */
 public class GenContentAssistTestLanguageProposalProvider extends AbstractJavaProposalProvider {
 	// constants
-	private static final String UI_PLUGIN_ID  = "";
+	private static final String UI_PLUGIN_ID  = ".";
 	
 	
 			
-	public List<? extends ICompletionProposal> completeStartRules(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeStart_Rules(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeStartRules feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeStart_Rules feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeFirstAbstractRuleChildName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFirstAbstractRuleChild_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFirstAbstractRuleChildName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFirstAbstractRuleChild_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "FirstAbstractRuleChildName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "FirstAbstractRuleChild_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeFirstAbstractRuleChildElements(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFirstAbstractRuleChild_Elements(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFirstAbstractRuleChildElements feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFirstAbstractRuleChild_Elements feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeSecondAbstractRuleChildName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSecondAbstractRuleChild_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSecondAbstractRuleChildName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSecondAbstractRuleChild_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "SecondAbstractRuleChildName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "SecondAbstractRuleChild_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeSecondAbstractRuleChildRule(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSecondAbstractRuleChild_Rule(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSecondAbstractRuleChildRule feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSecondAbstractRuleChild_Rule feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeAbstractRuleCallRule(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeAbstractRuleCall_Rule(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeAbstractRuleCallRule feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeAbstractRuleCall_Rule feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposals.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposals.ext
index 4b40d67..b4a3a76 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposals.ext
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposals.ext
@@ -22,38 +22,38 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 	 
-List[ICompletionProposal] completeStartRules(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeStartRules feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeStart_Rules(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeStart_Rules feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeFirstAbstractRuleChildName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeFirstAbstractRuleChildName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeFirstAbstractRuleChild_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeFirstAbstractRuleChild_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "FirstAbstractRuleChildName", contentAssistContext) };
+    { newProposal(assignment, "FirstAbstractRuleChild_Name", contentAssistContext) };
 	 
-List[ICompletionProposal] completeFirstAbstractRuleChildElements(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeFirstAbstractRuleChildElements feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeFirstAbstractRuleChild_Elements(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeFirstAbstractRuleChild_Elements feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeSecondAbstractRuleChildName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeSecondAbstractRuleChildName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeSecondAbstractRuleChild_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeSecondAbstractRuleChild_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "SecondAbstractRuleChildName", contentAssistContext) };
+    { newProposal(assignment, "SecondAbstractRuleChild_Name", contentAssistContext) };
 	 
-List[ICompletionProposal] completeSecondAbstractRuleChildRule(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeSecondAbstractRuleChildRule feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeSecondAbstractRuleChild_Rule(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeSecondAbstractRuleChild_Rule feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeAbstractRuleCallRule(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeAbstractRuleCallRule feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeAbstractRuleCall_Rule(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeAbstractRuleCall_Rule feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java
index 4a7a4c1..0546244 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java
@@ -21,148 +21,148 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
  */
 public class GenReferenceGrammarTestLanguageProposalProvider extends AbstractJavaProposalProvider {
 	// constants
-	private static final String UI_PLUGIN_ID  = "";
+	private static final String UI_PLUGIN_ID  = ".";
 	
 	
 			
-	public List<? extends ICompletionProposal> completeSpielplatzGroesse(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Groesse(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzGroesse feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Groesse feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.singletonList(createCompletionProposal(assignment, "1", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzBeschreibung(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Beschreibung(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzBeschreibung feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Beschreibung feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "\"SpielplatzBeschreibung\"", contentAssistContext));		
+		return Collections.singletonList(createCompletionProposal(assignment, "\"Spielplatz_Beschreibung\"", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzKinder(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Kinder(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzKinder feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Kinder feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzErzieher(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Erzieher(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzErzieher feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Erzieher feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzSpielzeuge(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Spielzeuge(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzSpielzeuge feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Spielzeuge feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielplatzFamilie(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielplatz_Familie(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielplatzFamilie feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielplatz_Familie feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeKindName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeKind_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeKindName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeKind_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "KindName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Kind_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeKindAge(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeKind_Age(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeKindAge feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeKind_Age feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.singletonList(createCompletionProposal(assignment, "1", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeErwachsenerName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeErwachsener_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeErwachsenerName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeErwachsener_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "ErwachsenerName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Erwachsener_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeErwachsenerAge(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeErwachsener_Age(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeErwachsenerAge feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeErwachsener_Age feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.singletonList(createCompletionProposal(assignment, "1", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielzeugName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielzeug_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielzeugName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielzeug_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "SpielzeugName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Spielzeug_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeSpielzeugFarbe(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeSpielzeug_Farbe(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeSpielzeugFarbe feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeSpielzeug_Farbe feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeFamilieName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFamilie_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFamilieName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFamilie_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeFamilieMutter(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFamilie_Mutter(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFamilieMutter feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFamilie_Mutter feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeFamilieVater(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFamilie_Vater(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFamilieVater feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFamilie_Vater feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
 	}
 			
-	public List<? extends ICompletionProposal> completeFamilieKinder(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeFamilie_Kinder(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeFamilieKinder feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeFamilie_Kinder feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposals.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposals.ext
index 0077d6d..25db999 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposals.ext
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposals.ext
@@ -22,98 +22,98 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 	 
-List[ICompletionProposal] completeSpielplatzGroesse(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeSpielplatzGroesse feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeSpielplatz_Groesse(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeSpielplatz_Groesse feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{ newProposal(assignment, "1", contentAssistContext) };
 	 
-List[ICompletionProposal] completeSpielplatzBeschreibung(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeSpielplatzBeschreibung feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeSpielplatz_Beschreibung(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeSpielplatz_Beschreibung feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-	{ newProposal(assignment, "\"SpielplatzBeschreibung\"", contentAssistContext) };
+	{ newProposal(assignment, "\"Spielplatz_Beschreibung\"", contentAssistContext) };
 	 
-List[ICompletionProposal] completeSpielplatzKinder(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeSpielplatzKinder feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeSpielplatz_Kinder(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeSpielplatz_Kinder feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeSpielplatzErzieher(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeSpielplatzErzieher feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeSpielplatz_Erzieher(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeSpielplatz_Erzieher feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeSpielplatzSpielzeuge(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeSpielplatzSpielzeuge feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeSpielplatz_Spielzeuge(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeSpielplatz_Spielzeuge feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeSpielplatzFamilie(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeSpielplatzFamilie feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeSpielplatz_Familie(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeSpielplatz_Familie feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeKindName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeKindName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeKind_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeKind_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "KindName", contentAssistContext) };
+    { newProposal(assignment, "Kind_Name", contentAssistContext) };
 	 
-List[ICompletionProposal] completeKindAge(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeKindAge feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeKind_Age(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeKind_Age feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{ newProposal(assignment, "1", contentAssistContext) };
 	 
-List[ICompletionProposal] completeErwachsenerName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeErwachsenerName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeErwachsener_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeErwachsener_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "ErwachsenerName", contentAssistContext) };
+    { newProposal(assignment, "Erwachsener_Name", contentAssistContext) };
 	 
-List[ICompletionProposal] completeErwachsenerAge(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeErwachsenerAge feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeErwachsener_Age(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeErwachsener_Age feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{ newProposal(assignment, "1", contentAssistContext) };
 	 
-List[ICompletionProposal] completeSpielzeugName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeSpielzeugName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeSpielzeug_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeSpielzeug_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "SpielzeugName", contentAssistContext) };
+    { newProposal(assignment, "Spielzeug_Name", contentAssistContext) };
 	 
-List[ICompletionProposal] completeSpielzeugFarbe(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeSpielzeugFarbe feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeSpielzeug_Farbe(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeSpielzeug_Farbe feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeFamilieName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeFamilieName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeFamilie_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeFamilie_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeFamilieMutter(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeFamilieMutter feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeFamilie_Mutter(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeFamilie_Mutter feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
 	 
-List[ICompletionProposal] completeFamilieVater(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeFamilieVater feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeFamilie_Vater(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeFamilie_Vater feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
 	 
-List[ICompletionProposal] completeFamilieKinder(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeFamilieKinder feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeFamilie_Kinder(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeFamilie_Kinder feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	lookupCrossReference(((CrossReference)assignment.terminal), contentAssistContext);
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java
index 19b0c04..a7170fe 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java
@@ -21,40 +21,40 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
  */
 public class GenTreeTestLanguageProposalProvider extends AbstractJavaProposalProvider {
 	// constants
-	private static final String UI_PLUGIN_ID  = "";
+	private static final String UI_PLUGIN_ID  = ".";
 	
 	
 			
-	public List<? extends ICompletionProposal> completeModelChildren(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeModel_Children(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeModelChildren feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeModel_Children feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
 		return Collections.emptyList();
 	}
 			
-	public List<? extends ICompletionProposal> completeNodeName(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeNode_Name(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeNodeName feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeNode_Name feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "NodeName", contentAssistContext));
+		return Collections.singletonList(createCompletionProposal(assignment, "Node_Name", contentAssistContext));
 	}
 			
-	public List<? extends ICompletionProposal> completeNodeAttrib(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeNode_Attrib(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeNodeAttrib feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeNode_Attrib feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
-		return Collections.singletonList(createCompletionProposal(assignment, "\"NodeAttrib\"", contentAssistContext));		
+		return Collections.singletonList(createCompletionProposal(assignment, "\"Node_Attrib\"", contentAssistContext));		
 	}
 			
-	public List<? extends ICompletionProposal> completeNodeChildren(Assignment assignment, IContentAssistContext contentAssistContext) {
+	public List<? extends ICompletionProposal> completeNode_Children(Assignment assignment, IContentAssistContext contentAssistContext) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("completeNodeChildren feature '" + assignment.getFeature() + "' terminal '"
+			logger.debug("completeNode_Children feature '" + assignment.getFeature() + "' terminal '"
 					+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
 					+ contentAssistContext.getMatchString().trim() + "'");
 		}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposals.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposals.ext
index 81b8348..ef198c6 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposals.ext
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposals.ext
@@ -22,26 +22,26 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 	 
-List[ICompletionProposal] completeModelChildren(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeModelChildren feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeModel_Children(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeModel_Children feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
 	 
-List[ICompletionProposal] completeNodeName(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeNodeName feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeNode_Name(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeNode_Name feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-    { newProposal(assignment, "NodeName", contentAssistContext) };
+    { newProposal(assignment, "Node_Name", contentAssistContext) };
 	 
-List[ICompletionProposal] completeNodeAttrib(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeNodeAttrib feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeNode_Attrib(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeNode_Attrib feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
-	{ newProposal(assignment, "\"NodeAttrib\"", contentAssistContext) };
+	{ newProposal(assignment, "\"Node_Attrib\"", contentAssistContext) };
 	 
-List[ICompletionProposal] completeNodeChildren(Assignment assignment, IContentAssistContext contentAssistContext) :
-	debug("completeNodeChildren feature '" + assignment.feature + "' terminal '"
+List[ICompletionProposal] completeNode_Children(Assignment assignment, IContentAssistContext contentAssistContext) :
+	debug("completeNode_Children feature '" + assignment.feature + "' terminal '"
 					+ assignment.terminal + "' cardinality '" + assignment.cardinality + "' and prefix '"
 					+ contentAssistContext.matchString.trim() + "'") ->
 	{};
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendContentAssistTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendContentAssistTestLanguageProposalProvider.java
index a77ccd1..197294a 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendContentAssistTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendContentAssistTestLanguageProposalProvider.java
@@ -11,7 +11,7 @@ import org.eclipse.xtext.ui.common.xtend.contentassist.AbstractXtendProposalProv
  */
 public class XtendContentAssistTestLanguageProposalProvider extends AbstractXtendProposalProvider {
 
-	private static final String UI_PLUGIN_ID = "";
+	private static final String UI_PLUGIN_ID = ".";
 		
 	@Override
 	protected ClassLoader getClassLoader() {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendReferenceGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendReferenceGrammarTestLanguageProposalProvider.java
index 45172fd..86a2388 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendReferenceGrammarTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendReferenceGrammarTestLanguageProposalProvider.java
@@ -11,7 +11,7 @@ import org.eclipse.xtext.ui.common.xtend.contentassist.AbstractXtendProposalProv
  */
 public class XtendReferenceGrammarTestLanguageProposalProvider extends AbstractXtendProposalProvider {
 
-	private static final String UI_PLUGIN_ID = "";
+	private static final String UI_PLUGIN_ID = ".";
 		
 	@Override
 	protected ClassLoader getClassLoader() {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendTreeTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendTreeTestLanguageProposalProvider.java
index 671879b..89d352b 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendTreeTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/XtendTreeTestLanguageProposalProvider.java
@@ -11,7 +11,7 @@ import org.eclipse.xtext.ui.common.xtend.contentassist.AbstractXtendProposalProv
  */
 public class XtendTreeTestLanguageProposalProvider extends AbstractXtendProposalProvider {
 
-	private static final String UI_PLUGIN_ID = "";
+	private static final String UI_PLUGIN_ID = ".";
 		
 	@Override
 	protected ClassLoader getClassLoader() {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistProcessorTest.java b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistProcessorTest.java
index 80d026a..fcf185a 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistProcessorTest.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/DefaultContentAssistProcessorTest.java
@@ -70,15 +70,15 @@ public class DefaultContentAssistProcessorTest extends AbstractUiTest
 	public void testComputeCompletionProposalsText() throws Exception {

 		contentAssistProcessorTestBuilder.assertText("spielplatz")

 			.applyText().assertText("1")

-			.applyText().assertText("\"SpielplatzBeschreibung\"","{")

+			.applyText().assertText("\"Spielplatz_Beschreibung\"","{")

 			.applyText().assertText("{")

 			.applyText().assertText("erwachsener", "familie", "spielzeug", "kind", "}")

 			.append("erwachsener ").assertText("(")

-			.applyText().assertText("ErwachsenerName")

+			.applyText().assertText("Erwachsener_Name")

 			.append("e1 ").assertText("1")

 			.applyText().assertText(")")

 			.applyText().append("erwachsener (e2 0) kind ").assertText("(")

-			.applyText().assertText("KindName")

+			.applyText().assertText("Kind_Name")

 			.append("k1 ").assertText("1")

 			.applyText().assertText(")")

 			.applyText().append("kind (k2 0) familie ").assertText("(")

@@ -154,7 +154,7 @@ public class DefaultContentAssistProcessorTest extends AbstractUiTest
 					"R1", 

 					"R2",

 					"R3",

-					"\"KeywordValue\"", 

+					"\"Keyword_Value\"", 

 					"(", 

 					"[", 

 					"+=" // TODO: Why does this proposal come up?