Renamed some tokens