Adjust name and full_name field