Renamed variables to more modern convention