Finish class & file renaming.