How do you propose fixing that? Let the kids take both parents last names? In few generations you end with kids having their entire family tree as their last name! It might even make marrying within the tribe attractive again to keep last name single word!