Done in this separate commit to make rebasing on this branch work better.
This commit only does the file rename to be friendlier to version control conflicts.