Renamed a few variables.