FIX: Better autoswap naming