Renamed variables once again.