Add last name and rename fields