improve family naming handling