renamed the Token.name to Token.value