Renamed a few vars.