Renamed some models to coincide with the standard.