Fix TokenType.
Rename tokens, map of name tokens.