A few renames

Renames of a few different files.