Changing file names with `git mv` is fine. Please file a separate PR.