Renamed some var*-s