Renamed some member variables.