diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend
index 7b60e048d..396f12b1f 100644
--- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend
+++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend
@@ -33,12 +33,20 @@ class GrammarNaming {
 		parserPackage + ".internal"
 	}
 
+	protected def String getInternalLexerPackage(Grammar it) {
+		parserPackage + ".lexer"
+	}
+
 	def AntlrGrammar getParserGrammar(Grammar it) {
 		new AntlrGrammar(internalParserPackage, '''«grammarNamePrefix»Internal«simpleName»«IF !combinedGrammar»Parser«ENDIF»''')
 	}
 
 	def AntlrGrammar getLexerGrammar(Grammar it) {
-		new AntlrGrammar(internalParserPackage, '''«grammarNamePrefix»Internal«simpleName»«IF !combinedGrammar»Lexer«ENDIF»''')
+		if (combinedGrammar) {
+			getParserGrammar
+		} else {
+			new AntlrGrammar(internalLexerPackage, '''«grammarNamePrefix»Internal«simpleName»Lexer''')
+		}
 	}
 	
 	protected def String getGrammarNamePrefix(Grammar it) {