diff --git a/src/components/CCIP/Chain/ChainTokenGrid.tsx b/src/components/CCIP/Chain/ChainTokenGrid.tsx
index c74a8fa0211..c7c329a7677 100644
--- a/src/components/CCIP/Chain/ChainTokenGrid.tsx
+++ b/src/components/CCIP/Chain/ChainTokenGrid.tsx
@@ -55,6 +55,7 @@ function ChainTokenGrid({ tokens, network, environment }: ChainTokenGridProps) {
                       tokenDecimals: data[key].decimals,
                       tokenAddress: data[key].tokenAddress,
                       tokenPoolType: (data[key].pool?.type || data[key].poolType) as PoolType,
+                      tokenPoolRawType: data[key].pool?.rawType || "",
                       tokenPoolAddress: data[key].pool?.address || data[key].poolAddress || "",
                       tokenPoolVersion: data[key].pool?.version || "",
                       explorer: network.explorer,
diff --git a/src/components/CCIP/ChainHero/TokenDetailsHero.tsx b/src/components/CCIP/ChainHero/TokenDetailsHero.tsx
index 382b2f849bb..a1b6a8ae766 100644
--- a/src/components/CCIP/ChainHero/TokenDetailsHero.tsx
+++ b/src/components/CCIP/ChainHero/TokenDetailsHero.tsx
@@ -1,7 +1,6 @@
 import Address from "~/components/AddressReact.tsx"
 import { getExplorerAddressUrl, fallbackTokenIconUrl } from "~/features/utils/index.ts"
 import { PoolType } from "~/config/data/ccip/types.ts"
-import { tokenPoolDisplay } from "~/config/data/ccip/utils.ts"
 import "./ChainHero.css"
 import { ExplorerInfo, ChainType } from "~/config/types.ts"
 import { getNetworkIconUrl } from "~/config/data/ccip/data.ts"
@@ -21,6 +20,7 @@ interface TokenDetailsHeroProps {
     decimals: number
     address: string
     poolType: PoolType
+    poolRawType: string
     poolAddress: string
   }
   inDrawer?: boolean
@@ -69,7 +69,7 @@ function TokenDetailsHero({ network, token, inDrawer = false }: TokenDetailsHero
           </div>
           <div className="ccip-chain-hero__details__item">
             <div className="ccip-chain-hero__details__label">Token pool type</div>
-            <div className="ccip-chain-hero__details__value">{tokenPoolDisplay(token.poolType)}</div>
+            <div className="ccip-chain-hero__details__value">{token.poolRawType}</div>
           </div>
           <div className="ccip-chain-hero__details__item">
             <div className="ccip-chain-hero__details__label">Token pool address</div>
diff --git a/src/components/CCIP/Drawer/TokenDrawer.tsx b/src/components/CCIP/Drawer/TokenDrawer.tsx
index 2cbf4fba382..f5e5fd65ca3 100644
--- a/src/components/CCIP/Drawer/TokenDrawer.tsx
+++ b/src/components/CCIP/Drawer/TokenDrawer.tsx
@@ -55,6 +55,7 @@ function TokenDrawer({
     tokenDecimals: number
     tokenAddress: string
     tokenPoolType: PoolType
+    tokenPoolRawType: string
     tokenPoolAddress: string
     explorer: ExplorerInfo
   }
@@ -174,6 +175,7 @@ function TokenDrawer({
           decimals: network.tokenDecimals,
           address: network.tokenAddress,
           poolType: network.tokenPoolType,
+          poolRawType: network.tokenPoolRawType,
           poolAddress: network.tokenPoolAddress,
         }}
         network={{
diff --git a/src/components/CCIP/Tables/TokenChainsTable.tsx b/src/components/CCIP/Tables/TokenChainsTable.tsx
index 7ddfe2e0a38..a42b65958c5 100644
--- a/src/components/CCIP/Tables/TokenChainsTable.tsx
+++ b/src/components/CCIP/Tables/TokenChainsTable.tsx
@@ -1,7 +1,7 @@
 import Address from "~/components/AddressReact.tsx"
 import "./Table.css"
 import { drawerContentStore, DrawerWidth, drawerWidthStore } from "../Drawer/drawerStore.ts"
-import { Environment, SupportedTokenConfig, tokenPoolDisplay, PoolType } from "~/config/data/ccip/index.ts"
+import { Environment, SupportedTokenConfig, PoolType } from "~/config/data/ccip/index.ts"
 import { areAllLanesPaused } from "~/config/data/ccip/utils.ts"
 import { ChainType, ExplorerInfo } from "~/config/types.ts"
 import TableSearchInput from "./TableSearchInput.tsx"
@@ -24,6 +24,7 @@ interface TableProps {
     tokenDecimals: number
     tokenAddress: string
     tokenPoolType: PoolType
+    tokenPoolRawType: string
     tokenPoolAddress: string
     tokenPoolVersion: string
     explorer: ExplorerInfo
@@ -139,7 +140,7 @@ function TokenChainsTable({ networks, token, lanes, environment }: TableProps) {
                         endLength={4}
                       />
                     </td>
-                    <td>{tokenPoolDisplay(network.tokenPoolType)}</td>
+                    <td>{network.tokenPoolRawType}</td>
                     <td data-clipboard-type="token-pool">
                       <Address
                         contractUrl={getExplorerAddressUrl(
diff --git a/src/components/CCIP/Token/Token.astro b/src/components/CCIP/Token/Token.astro
index 8718769da7f..181d90814f6 100644
--- a/src/components/CCIP/Token/Token.astro
+++ b/src/components/CCIP/Token/Token.astro
@@ -158,7 +158,8 @@ const tokenStructuredData = generateTokenStructuredData(token, environment, chai
               tokenDecimals: data[key]?.decimals ?? 0,
               tokenAddress: data[key]?.tokenAddress ?? "",
               tokenPoolType: data[key]?.pool?.type,
-              tokenPoolAddress: data[key]?.pool?.address ?? "",
+              tokenPoolRawType: data[key]?.pool?.rawType || "",
+              tokenPoolAddress: data[key]?.pool?.address ?? data[key]?.poolAddress ?? "",
               tokenPoolVersion: data[key]?.pool?.version ?? "",
               explorer: explorer,
               chainType: chainType,
diff --git a/src/config/data/ccip/utils.ts b/src/config/data/ccip/utils.ts
index 014fd16d1a3..96e186fcbab 100644
--- a/src/config/data/ccip/utils.ts
+++ b/src/config/data/ccip/utils.ts
@@ -31,17 +31,6 @@ export const determineTokenMechanism = (
   return POOL_MECHANISM_MAP[key] ?? TokenMechanism.Unsupported
 }
 
-export const tokenPoolDisplay = (poolType?: PoolType) => {
-  const poolTypeMapping: Record<PoolType, string> = {
-    lockRelease: "LockRelease",
-    burnMint: "BurnMint",
-    usdc: "BurnMint",
-    feeTokenOnly: "Fee Token Only",
-  }
-
-  return poolType ? (poolTypeMapping[poolType] ?? "Unsupported") : "Unsupported"
-}
-
 export const calculateNetworkFeesForTokenMechanismDirect = (
   mechanism: TokenMechanism,
   laneSpecificFeeKey: LaneSpecificFeeKey