renamed token types