Rename a few files for consistency.