diff --git a/src/components/CCIP/Chain/Chain.astro b/src/components/CCIP/Chain/Chain.astro
index 562ab44bd1e..058483ed1b0 100644
--- a/src/components/CCIP/Chain/Chain.astro
+++ b/src/components/CCIP/Chain/Chain.astro
@@ -46,7 +46,14 @@ const lanes = await getAllNetworkLanes({
 const searchLanes = getSearchLanes({ environment })
 ---
 
-<CcipLayout frontmatter={entry.data} {headings} environment={environment}>
+<CcipLayout
+  frontmatter={{
+    title: `CCIP Supported Networks - ${network.name}`,
+    section: "ccip",
+  }}
+  {headings}
+  environment={environment}
+>
   <Drawer client:only="react" />
   <ChainHero
     chains={networks}
diff --git a/src/components/CCIP/ChainHero/ChainHero.tsx b/src/components/CCIP/ChainHero/ChainHero.tsx
index 3eae91166bb..7c60fb71e6c 100644
--- a/src/components/CCIP/ChainHero/ChainHero.tsx
+++ b/src/components/CCIP/ChainHero/ChainHero.tsx
@@ -120,7 +120,7 @@ function ChainHero({ chains, tokens, network, token, environment, lanes }: Chain
                 name: network?.name || token?.name || "Current",
                 url: network
                   ? `/ccip/supported-networks/${environment}/chain/${network.chain}`
-                  : `/ccip/supported-networks/${environment}/token/${token?.name}`,
+                  : `/ccip/supported-networks/${environment}/token/${token?.symbol}`,
               },
             ]}
           />
diff --git a/src/components/CCIP/Token/Token.astro b/src/components/CCIP/Token/Token.astro
index 049ae208f92..05d107e70ea 100644
--- a/src/components/CCIP/Token/Token.astro
+++ b/src/components/CCIP/Token/Token.astro
@@ -52,7 +52,14 @@ const lanes = getAllTokenLanes({
 const searchLanes = getSearchLanes({ environment })
 ---
 
-<CcipLayout frontmatter={entry.data} {headings} environment={environment}>
+<CcipLayout
+  frontmatter={{
+    title: `CCIP Supported Tokens - ${token}`,
+    section: "ccip",
+  }}
+  {headings}
+  environment={environment}
+>
   <ChainHero
     chains={networks}
     tokens={allTokens}