Renamed class per code review