diff --git a/packages/app/src/pages/market.tsx b/packages/app/src/pages/market.tsx
index 560bc81793..3dad8a5994 100644
--- a/packages/app/src/pages/market.tsx
+++ b/packages/app/src/pages/market.tsx
@@ -124,18 +124,18 @@ const Market: MarketComponent = () => {
 			)}
 			{showPositionModal?.type === 'futures_edit_position_size' && <EditPositionSizeModal />}
 			{showPositionModal?.type === 'futures_edit_position_margin' && <EditPositionMarginModal />}
-			{openModal === 'futures_isolated_transfer' && (
+			{openModal === 'futures_deposit_withdraw_cross_margin' && (
 				<TransferIsolatedMarginModal
 					defaultTab="deposit"
 					onDismiss={() => dispatch(setOpenModal(null))}
 				/>
 			)}
-			{openModal === 'futures_cross_withdraw' && (
+			{openModal === 'futures_withdraw_smart_margin' && (
 				<WithdrawSmartMargin onDismiss={() => dispatch(setOpenModal(null))} />
 			)}
 
 			{openModal === 'futures_confirm_smart_margin_trade' && <TradeConfirmationModalCrossMargin />}
-			{openModal === 'futures_confirm_isolated_margin_trade' && <DelayedOrderConfirmationModal />}
+			{openModal === 'futures_confirm_cross_margin_trade' && <DelayedOrderConfirmationModal />}
 		</>
 	)
 }
diff --git a/packages/app/src/sections/futures/Trade/ManagePosition.tsx b/packages/app/src/sections/futures/Trade/ManagePosition.tsx
index 3813adcb0a..9b0fb3f741 100644
--- a/packages/app/src/sections/futures/Trade/ManagePosition.tsx
+++ b/packages/app/src/sections/futures/Trade/ManagePosition.tsx
@@ -82,7 +82,7 @@ const ManagePosition: React.FC = () => {
 			setOpenModal(
 				selectedAccountType === FuturesMarginType.SMART_MARGIN
 					? 'futures_confirm_smart_margin_trade'
-					: 'futures_confirm_isolated_margin_trade'
+					: 'futures_confirm_cross_margin_trade'
 			)
 		)
 	}, [selectedAccountType, smartMarginAccount, dispatch])
diff --git a/packages/app/src/sections/futures/Trade/MarketActions.tsx b/packages/app/src/sections/futures/Trade/MarketActions.tsx
index 7533bd5303..e12aa946ba 100644
--- a/packages/app/src/sections/futures/Trade/MarketActions.tsx
+++ b/packages/app/src/sections/futures/Trade/MarketActions.tsx
@@ -29,7 +29,7 @@ const MarketActions: React.FC = () => {
 				<MarketActionButton
 					data-testid="futures-market-trade-button-deposit"
 					disabled={marketInfo?.isSuspended || !isL2 || !walletAddress}
-					onClick={() => dispatch(setOpenModal('futures_isolated_transfer'))}
+					onClick={() => dispatch(setOpenModal('futures_deposit_withdraw_cross_margin'))}
 					noOutline
 				>
 					{t('futures.market.trade.button.deposit')}
@@ -42,20 +42,20 @@ const MarketActions: React.FC = () => {
 						!isL2 ||
 						!walletAddress
 					}
-					onClick={() => dispatch(setOpenModal('futures_isolated_transfer'))}
+					onClick={() => dispatch(setOpenModal('futures_deposit_withdraw_cross_margin'))}
 					noOutline
 				>
 					{t('futures.market.trade.button.withdraw')}
 				</MarketActionButton>
 			</MarketActionsContainer>
-			{openModal === 'futures_isolated_transfer' && (
+			{openModal === 'futures_deposit_withdraw_cross_margin' && (
 				<TransferIsolatedMarginModal
 					defaultTab="deposit"
 					onDismiss={() => dispatch(setOpenModal(null))}
 				/>
 			)}
 
-			{openModal === 'futures_isolated_transfer' && (
+			{openModal === 'futures_deposit_withdraw_cross_margin' && (
 				<TransferIsolatedMarginModal
 					defaultTab="withdraw"
 					onDismiss={() => dispatch(setOpenModal(null))}
diff --git a/packages/app/src/sections/futures/Trade/TradeBalance.tsx b/packages/app/src/sections/futures/Trade/TradeBalance.tsx
index 38da3dd56a..450c747bb4 100644
--- a/packages/app/src/sections/futures/Trade/TradeBalance.tsx
+++ b/packages/app/src/sections/futures/Trade/TradeBalance.tsx
@@ -167,8 +167,8 @@ const TradeBalance: React.FC<TradeBalanceProps> = memo(({ isMobile = false }) =>
 								dispatch(
 									setOpenModal(
 										accountType === FuturesMarginType.CROSS_MARGIN
-											? 'futures_isolated_transfer'
-											: 'futures_cross_withdraw'
+											? 'futures_deposit_withdraw_cross_margin'
+											: 'futures_withdraw_smart_margin'
 									)
 								)
 							}}
diff --git a/packages/app/src/state/app/types.ts b/packages/app/src/state/app/types.ts
index de607aec96..880ef1095f 100644
--- a/packages/app/src/state/app/types.ts
+++ b/packages/app/src/state/app/types.ts
@@ -4,10 +4,10 @@ import { FuturesTransactionType } from 'state/futures/common/types'
 
 export type ModalType =
 	| 'futures_close_position_confirm'
-	| 'futures_cross_withdraw'
-	| 'futures_isolated_transfer'
+	| 'futures_withdraw_smart_margin'
+	| 'futures_deposit_withdraw_cross_margin'
 	| 'futures_confirm_smart_margin_trade'
-	| 'futures_confirm_isolated_margin_trade'
+	| 'futures_confirm_cross_margin_trade'
 	| 'futures_withdraw_keeper_balance'
 	| 'futures_smart_margin_onboard'
 	| 'futures_smart_margin_socket'