Cleaning up some file names to reflect what they _actually_ do, not what I wish
they _were_.