Fix some missed renames.