Tokens - rename methods