Renamed, and provided deprecated "old names"