Renamed some misleadingly called members and enum variables.