Renamed some ids.