Renamed class again