Renamed lots of variables