Renamed related things.