Renamed various private variables.