Update class and filenames to match