Fix some missed renames