Harmonize class names with file names