Renamed some vars