This naming scheme gives us the best support for readthedocs. References #2814
This avoids some merge conflicts to allow git blame to detect renames properly.