Fix rename_by_fields