Clean up a couple more renaming bits