Renamed some variables