Renamed class so class name matches file name