Revamp name canonicalization code