Renamed and other updates