Remove dummy token
Rename attributes to match the lexer