PLT-399 Refactored references to swaps