Renamed some params