Merge "Fix DEX type name for `long`"