diff --git a/src/Unit/Exchange/callGenerators/curve.ts b/src/Unit/Exchange/callGenerators/curve.ts
index 5bb68de..42e2123 100644
--- a/src/Unit/Exchange/callGenerators/curve.ts
+++ b/src/Unit/Exchange/callGenerators/curve.ts
@@ -1,12 +1,12 @@
 import { SwapExecutor__factory, CurveRegistry__factory } from "@orionprotocol/contracts/lib/ethers-v5/index.js"
 import type { BigNumberish, providers } from "ethers"
-import type { SwapInfo } from "../generateSwapCalldata.js"
+import type { SingleSwap } from "../generateSwapCalldata.js"
 import { addCallParams } from "./utils.js"
 
 export async function generateCurveStableSwapCall(
   amount: BigNumberish,
   to: string,
-  swap: SwapInfo,
+  swap: SingleSwap,
   provider: providers.JsonRpcProvider,
   curveRegistry: string
 ) {
diff --git a/src/Unit/Exchange/callGenerators/uniswapV2.ts b/src/Unit/Exchange/callGenerators/uniswapV2.ts
index 37f57a5..bec62de 100644
--- a/src/Unit/Exchange/callGenerators/uniswapV2.ts
+++ b/src/Unit/Exchange/callGenerators/uniswapV2.ts
@@ -3,11 +3,11 @@ import { SafeArray } from "../../../utils/safeGetters.js"
 import { BigNumber } from "ethers"
 import type { BytesLike, BigNumberish } from "ethers"
 import { defaultAbiCoder, concat } from "ethers/lib/utils.js"
-import type { SwapInfo } from "../generateSwapCalldata.js"
+import type { SingleSwap } from "../generateSwapCalldata.js"
 import { addCallParams, generateCalls } from "./utils.js"
 
 export async function generateUni2Calls(
-  path: SafeArray<SwapInfo>,
+  path: SafeArray<SingleSwap>,
   recipient: string
 ) {
   const executorInterface = SwapExecutor__factory.createInterface()
diff --git a/src/Unit/Exchange/callGenerators/uniswapV3.ts b/src/Unit/Exchange/callGenerators/uniswapV3.ts
index 21fadd8..f18e05a 100644
--- a/src/Unit/Exchange/callGenerators/uniswapV3.ts
+++ b/src/Unit/Exchange/callGenerators/uniswapV3.ts
@@ -1,11 +1,11 @@
 import { SwapExecutor__factory, UniswapV3Pool__factory } from "@orionprotocol/contracts/lib/ethers-v5/index.js"
 import { type BigNumberish, providers, type BytesLike, ethers } from "ethers"
 import { SafeArray } from "../../../utils/safeGetters.js"
-import type { SwapInfo } from "../generateSwapCalldata.js"
+import type { SingleSwap } from "../generateSwapCalldata.js"
 import { addCallParams, generateCalls } from "./utils.js"
 
 export async function generateUni3Call(
-  swap: SwapInfo,
+  swap: SingleSwap,
   amount: BigNumberish | undefined,
   recipient: string,
   provider: providers.JsonRpcProvider
@@ -20,7 +20,7 @@ export async function generateUni3Call(
 }
 
 export async function generateOrion3Call(
-  swap: SwapInfo,
+  swap: SingleSwap,
   amount: BigNumberish | undefined,
   recipient: string,
   provider: providers.JsonRpcProvider
@@ -35,7 +35,7 @@ export async function generateOrion3Call(
 }
 
 export async function generateUni3Calls(
-  path: SafeArray<SwapInfo>,
+  path: SafeArray<SingleSwap>,
   amount: BigNumberish,
   recipient: string,
   provider: providers.JsonRpcProvider
@@ -53,7 +53,7 @@ export async function generateUni3Calls(
 }
 
 export async function generateOrion3Calls(
-  path: SafeArray<SwapInfo>,
+  path: SafeArray<SingleSwap>,
   amount: BigNumberish,
   recipient: string,
   provider: providers.JsonRpcProvider