Renamed variables to match convention