Try a more comprehensive such-name deduping approach