Removed references to first_name and last_name