Renamed some vars.