Changed filenames to reflect class names.