Fix a few missed renames