Renamed statistics files and class name