Renamed some identifiers.