build: more adjustments for the ABI type name maps