Rename some files for clarity.