Renamed a few incorrect variables