Rename classes and files for consistancy.