Another renaming commit, mostly cleaning up