Lexer renamed to reader