Fix filenames that were not consistent with classes