Completed first pass of renaming classes to match the new filenames.