Renamed some variable