diff --git a/src/components/AssetsModal/PositionsView.tsx b/src/components/AssetsModal/PositionsView.tsx
index e8b145fa..ff0e5905 100644
--- a/src/components/AssetsModal/PositionsView.tsx
+++ b/src/components/AssetsModal/PositionsView.tsx
@@ -66,7 +66,7 @@ const TableRow = ({ receivableShares, ticker, onWithdraw }: TableRowProps) => {
     return null;
   }
 
-  const totalBalance = (receivableShares * pool.totalBalance) / pool.totalShares;
+  const totalBalance = (receivableShares * pool.totalBalanceTokens) / pool.totalBalanceShares;
 
   const handleWithdrawClick = () => onWithdraw(ticker);
 
diff --git a/src/components/AssetsModal/WithdrawView.tsx b/src/components/AssetsModal/WithdrawView.tsx
index 3d6265ef..edd91dee 100644
--- a/src/components/AssetsModal/WithdrawView.tsx
+++ b/src/components/AssetsModal/WithdrawView.tsx
@@ -37,7 +37,7 @@ const WithdrawView = ({ ticker, onBack, onSuccess }: WithdrawViewProps) => {
 
   const { receivable_shares } = positions[ticker];
 
-  const totalBalance = (receivable_shares * pool.totalBalance) / pool.totalShares;
+  const totalBalance = (receivable_shares * pool.totalBalanceTokens) / pool.totalBalanceShares;
 
   const max = (totalBalance / SCALAR_7).toString();
 
diff --git a/src/contexts/pool-context.tsx b/src/contexts/pool-context.tsx
index 142ce138..31ac2afd 100644
--- a/src/contexts/pool-context.tsx
+++ b/src/contexts/pool-context.tsx
@@ -9,9 +9,9 @@ export type PriceRecord = {
 };
 
 export type PoolState = {
-  totalBalance: bigint;
-  availableBalance: bigint;
-  totalShares: bigint;
+  totalBalanceTokens: bigint;
+  totalBalanceShares: bigint;
+  availableBalanceTokens: bigint;
   annualInterestRate: bigint;
 };
 
@@ -58,18 +58,18 @@ const fetchPoolState = async (ticker: SupportedCurrency): Promise<PoolState> =>
   if (result.isOk()) {
     const value = result.unwrap();
     return {
-      totalBalance: value.total_balance_tokens,
-      availableBalance: value.available_balance_tokens,
-      totalShares: value.total_balance_shares,
+      totalBalanceTokens: value.total_balance_tokens,
+      totalBalanceShares: value.total_balance_shares,
+      availableBalanceTokens: value.available_balance_tokens,
       annualInterestRate: value.annual_interest_rate,
     };
   }
   const error = result.unwrapErr();
   console.error('Error: ', error);
   return {
-    totalBalance: 0n,
-    availableBalance: 0n,
-    totalShares: 0n,
+    totalBalanceTokens: 0n,
+    totalBalanceShares: 0n,
+    availableBalanceTokens: 0n,
     annualInterestRate: 0n,
   };
 };
diff --git a/src/pages/_borrow/BorrowModal/BorrowStep.tsx b/src/pages/_borrow/BorrowModal/BorrowStep.tsx
index 4c330185..465d3e37 100644
--- a/src/pages/_borrow/BorrowModal/BorrowStep.tsx
+++ b/src/pages/_borrow/BorrowModal/BorrowStep.tsx
@@ -41,7 +41,7 @@ export const BorrowStep = ({ onClose, currency }: BorrowStepProps) => {
 
   if (!pools || !prices || !walletBalances) return null;
 
-  const { annualInterestRate, availableBalance } = pools[ticker];
+  const { annualInterestRate, availableBalanceTokens } = pools[ticker];
 
   const loanBalance = walletBalances[ticker];
   const collateralBalance = walletBalances[collateralTicker];
@@ -128,7 +128,7 @@ export const BorrowStep = ({ onClose, currency }: BorrowStepProps) => {
   const isBorrowDisabled =
     !isTrustline || loanAmount === '0' || collateralAmount === '0' || healthFactor < HEALTH_FACTOR_MIN_THRESHOLD;
 
-  const maxLoan = (availableBalance / 10_000_000n).toString();
+  const maxLoan = (availableBalanceTokens / 10_000_000n).toString();
 
   const maxCollateral = getIntegerPart(collateralBalance.trustLine ? collateralBalance.balanceLine.balance : '0');
 
diff --git a/src/pages/_borrow/BorrowableAsset.tsx b/src/pages/_borrow/BorrowableAsset.tsx
index 4ed5ca07..1ae94550 100644
--- a/src/pages/_borrow/BorrowableAsset.tsx
+++ b/src/pages/_borrow/BorrowableAsset.tsx
@@ -32,7 +32,7 @@ export const BorrowableAsset = ({ currency }: BorrowableAssetCardProps) => {
         .filter(([t, _b]) => t !== ticker)
         .some(([_t, b]) => b.trustLine && !isBalanceZero(b.balanceLine.balance));
 
-  const borrowDisabled = !wallet || !isCollateral || !pool || pool.availableBalance === 0n;
+  const borrowDisabled = !wallet || !isCollateral || !pool || pool.availableBalanceTokens === 0n;
 
   const openModal = () => {
     const modalEl = document.getElementById(modalId) as HTMLDialogElement;
@@ -46,7 +46,7 @@ export const BorrowableAsset = ({ currency }: BorrowableAssetCardProps) => {
 
   const tooltip = useMemo(() => {
     if (!pool) return 'The pool is loading';
-    if (pool.availableBalance === 0n) return 'the pool has no assets to borrow';
+    if (pool.availableBalanceTokens === 0n) return 'the pool has no assets to borrow';
     if (!wallet) return 'Connect a wallet first';
     if (!isCollateral) return 'Another token needed for the collateral';
     return 'Something odd happened.';
@@ -70,9 +70,9 @@ export const BorrowableAsset = ({ currency }: BorrowableAssetCardProps) => {
 
       <td>
         <p className="text-xl font-semibold mt-3 leading-6">
-          {pool ? formatAmount(pool.availableBalance) : <Loading size="xs" />}
+          {pool ? formatAmount(pool.availableBalanceTokens) : <Loading size="xs" />}
         </p>
-        <p>{pool && price ? toDollarsFormatted(price, pool.availableBalance) : null}</p>
+        <p>{pool && price ? toDollarsFormatted(price, pool.availableBalanceTokens) : null}</p>
       </td>
 
       <td>
diff --git a/src/pages/_lend/LendableAsset.tsx b/src/pages/_lend/LendableAsset.tsx
index e83e50fb..97326ee1 100644
--- a/src/pages/_lend/LendableAsset.tsx
+++ b/src/pages/_lend/LendableAsset.tsx
@@ -57,9 +57,9 @@ export const LendableAsset = ({ currency }: LendableAssetProps) => {
 
       <td>
         <p className="text-xl font-semibold leading-6">
-          {pool ? formatAmount(pool.totalBalance) : <Loading size="xs" />}
+          {pool ? formatAmount(pool.totalBalanceTokens) : <Loading size="xs" />}
         </p>
-        <p>{!isNil(price) && !isNil(pool) && toDollarsFormatted(price, pool.totalBalance)}</p>
+        <p>{!isNil(price) && !isNil(pool) && toDollarsFormatted(price, pool.totalBalanceTokens)}</p>
       </td>
 
       <td>