Rename some files for consistency throughout the project.