modified edit_name-cr