Rename the token-related methods