diff --git a/site/src/pages/tools/fcc-compliance-check.astro b/site/src/pages/tools/fcc-compliance-check.astro
index 65c6c1e..479b657 100644
--- a/site/src/pages/tools/fcc-compliance-check.astro
+++ b/site/src/pages/tools/fcc-compliance-check.astro
@@ -490,10 +490,13 @@ import Base from "../../layouts/Base.astro";
         if (check.due_date) inner += `<p class="text-xs ${c.textColor} opacity-75 mt-0.5">Due: ${check.due_date}</p>`;
         if (check.detail) inner += `<p class="text-sm ${c.textColor} mt-1">${check.detail}</p>`;
 
+        // Entity name for contextual questions
+        const eName = (data.entity_name || "").toUpperCase() || "THIS ENTITY";
+
         // RMD special — ask if they provide voice services when RMD not found
         if (check.id === "rmd_filing" && status === "red" && (check.detail || "").includes("Not found")) {
           inner += `<div class="mt-3">
-            <p class="text-sm font-medium ${c.textColor} mb-2">Do you provide any voice services?</p>
+            <p class="text-sm font-medium ${c.textColor} mb-2">Does ${eName} provide any voice services?</p>
             <div class="flex gap-2">
               <button class="rmd-yes bg-red-500 hover:bg-red-600 text-white text-sm font-semibold px-4 py-1.5 rounded-lg transition">Yes</button>
               <button class="rmd-no bg-green-600 hover:bg-green-700 text-white text-sm font-semibold px-4 py-1.5 rounded-lg transition">No — data only</button>
@@ -504,11 +507,11 @@ import Base from "../../layouts/Base.astro";
         // 499-A special — ask qualifying questions when past due
         if (check.id === "form_499a" && (status === "red" || status === "yellow")) {
           inner += `<div class="mt-3 border-t border-red-200 pt-3">
-            <p class="text-sm font-medium ${c.textColor} mb-2">Did you bill customers for voice or data telecom services during the overdue filing period(s)?</p>
+            <p class="text-sm font-medium ${c.textColor} mb-2">Did ${eName} bill customers for voice or data telecom services during the overdue filing period(s)?</p>
             <div class="flex gap-2 flex-wrap">
-              <button class="f499-yes bg-red-500 hover:bg-red-600 text-white text-sm font-semibold px-4 py-1.5 rounded-lg transition">Yes — I need to file</button>
-              <button class="f499-no bg-amber-500 hover:bg-amber-600 text-white text-sm font-semibold px-4 py-1.5 rounded-lg transition">No — I had no telecom revenue</button>
-              <button class="f499-cancel bg-gray-500 hover:bg-gray-600 text-white text-sm font-semibold px-4 py-1.5 rounded-lg transition">I want to cancel my 499 registration</button>
+              <button class="f499-yes bg-red-500 hover:bg-red-600 text-white text-sm font-semibold px-4 py-1.5 rounded-lg transition">Yes — need to file</button>
+              <button class="f499-no bg-amber-500 hover:bg-amber-600 text-white text-sm font-semibold px-4 py-1.5 rounded-lg transition">No — no telecom revenue</button>
+              <button class="f499-cancel bg-gray-500 hover:bg-gray-600 text-white text-sm font-semibold px-4 py-1.5 rounded-lg transition">Cancel 499 registration</button>
             </div>
           </div>`;
         }
@@ -516,7 +519,7 @@ import Base from "../../layouts/Base.astro";
         // BDC special
         if (check.id === "bdc_filing" && status === "unknown") {
           inner += `<div class="mt-3">
-            <p class="text-sm font-medium ${c.textColor} mb-2">Do you provide broadband internet access?</p>
+            <p class="text-sm font-medium ${c.textColor} mb-2">Does ${eName} provide broadband internet access?</p>
             <div class="flex gap-2">
               <button class="bdc-yes bg-amber-500 hover:bg-amber-600 text-white text-sm font-semibold px-4 py-1.5 rounded-lg transition">Yes</button>
               <button class="bdc-no bg-green-600 hover:bg-green-700 text-white text-sm font-semibold px-4 py-1.5 rounded-lg transition">No</button>
@@ -613,7 +616,7 @@ import Base from "../../layouts/Base.astro";
                 <div class="flex-1">
                   <p class="font-semibold ${c.textColor}">${check.label}</p>
                   <p class="text-sm ${c.textColor} mt-1">${check.detail}</p>
-                  <p class="text-sm ${c.textColor} mt-1 font-medium">You had telecom revenue — filing is required for each missed year.</p>
+                  <p class="text-sm ${c.textColor} mt-1 font-medium">${eName} had telecom revenue — filing is required for each missed year.</p>
                   <button class="f499-undo text-xs underline ${c.textColor} mt-1 opacity-75">Change answer</button>
                 </div>`;
             } else if (action === "zero") {