Rename files to avoid name clash with a commit soon to come.