Renamed several variables.