Rewrite to use separate first and last name fields