Renamed variables for consistency