Renamed a couple of variables