Renamed several variables