Fix a few forgotten renames.