Renamed class name and file name