diff --git a/src/lib/pleading-variables.ts b/src/lib/pleading-variables.ts
index 86446c4..3bfc482 100644
--- a/src/lib/pleading-variables.ts
+++ b/src/lib/pleading-variables.ts
@@ -132,22 +132,39 @@ export function buildChips(ctx: LoadedContext): VarChip[] {
   const out: VarChip[] = [];
   const labelMap: Record<string, string> = {
     "client.name": "Client name",
+    clientName: "Client name",
     "client.address": "Client address (full)",
+    clientAddress: "Client address (full)",
     "client.contact_name": "Client primary contact",
+    clientContactName: "Client primary contact",
     "client.contact_email": "Client contact email",
+    clientContactEmail: "Client contact email",
     "client.contact_phone": "Client contact phone",
+    clientContactPhone: "Client contact phone",
     "client.management_company": "Management company",
+    managementCompany: "Management company",
     "case.number": "Case number",
+    caseNumber: "Case number",
     "case.title": "Case title",
+    caseTitle: "Case title",
     "case.caption": "Case caption",
+    caseCaption: "Case caption",
     "case.court": "Court",
+    court: "Court",
     "case.court_case_number": "Court case number",
+    courtCaseNumber: "Court case number",
     "case.judge": "Judge",
+    judge: "Judge",
     "case.opposing_party": "Opposing party",
+    opposingParty: "Opposing party",
     "case.opposing_counsel": "Opposing counsel",
+    opposingCounsel: "Opposing counsel",
     "case.opposing_counsel_firm": "Opposing counsel firm",
+    opposingCounselFirm: "Opposing counsel firm",
     "case.filing_date": "Filing date",
+    filingDate: "Filing date",
     "case.next_hearing_date": "Next hearing date",
+    nextHearingDate: "Next hearing date",
   };
   for (const key of Object.keys(m)) {
     let label = labelMap[key];