Renamed some variables to align with previous changes.