Updated name handling

Improved handling of hyphenated last names, to avoid having repetition
in children's last names.