Remove underscore in canonicalize.