Renamed some local-scope variables