Renamed a bunch of variables