[PLAT-3085] Swap conventions