Renamed references of token to id.