Renamed old references.