Renamed file, for more generic class