Fix a couple missed renames