Renaming, make the lexer more extensible