Renamed according to specs