add rename_field and tests