Another shot at name matching