Renamed identifiers to better reflect use.