Fixed filenames to match class names.