Better, faster version of name deduplication