diff --git a/Auto/Tactic.lean b/Auto/Tactic.lean
index 609d7c1..42715de 100644
--- a/Auto/Tactic.lean
+++ b/Auto/Tactic.lean
@@ -345,7 +345,7 @@ def querySMTForHints (exportFacts : Array REntry) (exportInds : Array MutualIndI
     match re with
     | .valid [] t => return t
     | _ => throwError "runAuto :: Unexpected error")
-  let commands ← (lamFOL2SMT lamVarTy lamEVarTy exportLamTerms exportInds).run'
+  let (commands, l2hMap) ← (lamFOL2SMTWithL2hMap lamVarTy lamEVarTy exportLamTerms exportInds).run'
   for cmd in commands do
     trace[auto.smt.printCommands] "{cmd}"
   if (auto.smt.save.get (← getOptions)) then
@@ -359,11 +359,12 @@ def querySMTForHints (exportFacts : Array REntry) (exportInds : Array MutualIndI
     trace[auto.smt.unsatCore] "valid_fact_{id}: {vderiv}"
   let mut symbolMap : HashMap String Expr := HashMap.empty
   let varVal ← LamReif.getVarVal
-  let varValWithIndices := varVal.mapIdx (fun idx v => (idx.1, v))
-  for (idx, (vExp, _)) in varValWithIndices do
-    -- The assumption that smt variables are written in the form `smti_{idx}` comes
-    -- from `h2Symb` in Auto.IR.SMT.lean
-    symbolMap := symbolMap.insert s!"smti_{idx}" vExp
+  for (varName, varAtom) in l2hMap.toArray do
+    match varAtom with
+    | .term termNum =>
+      let vExp := varVal[termNum]!.1
+      symbolMap := symbolMap.insert varName vExp
+    | _ => logWarning s!"varName: {varName} maps to an atom other than term"
   let lemmaExps ← theoryLemmas.mapM (fun lemTerm => Parser.SMTTerm.parseTerm lemTerm symbolMap)
   return some lemmaExps
 
diff --git a/Auto/Translation/LamFOL2SMT.lean b/Auto/Translation/LamFOL2SMT.lean
index 74e0477..8c96e32 100644
--- a/Auto/Translation/LamFOL2SMT.lean
+++ b/Auto/Translation/LamFOL2SMT.lean
@@ -447,4 +447,27 @@ def lamFOL2SMT
     addCommand (.assert (.attr sterm #[.symb "named" s!"valid_fact_{idx}"]))
   getCommands
 
+/-- Identical to `lamFOL2SMT` but it also outputs `Auto.IR.SMT.State.l2hMap` -/
+def lamFOL2SMTWithL2hMap
+  (lamVarTy lamEVarTy : Array LamSort)
+  (facts : Array LamTerm) (minds : Array MutualIndInfo) :
+  TransM LamAtom ((Array IR.SMT.Command) × HashMap String LamAtom) := do
+  let _ ← sortAuxDecls.mapM addCommand
+  let _ ← termAuxDecls.mapM addCommand
+  for mind in minds do
+    let (dsdecl, compCtors, compProjs) ← lamMutualIndInfo2STerm mind
+    trace[auto.lamFOL2SMT] "MutualIndInfo translated to command {dsdecl}"
+    addCommand dsdecl
+    let compCtorEqns ← compCtors.mapM (compEqn lamVarTy lamEVarTy)
+    let _ ← compCtorEqns.mapM addCommand
+    let compProjEqns ← compProjs.mapM (compEqn lamVarTy lamEVarTy)
+    let _ ← compProjEqns.mapM addCommand
+  for (t, idx) in facts.zipWithIndex do
+    let sterm ← lamTerm2STerm lamVarTy lamEVarTy t
+    trace[auto.lamFOL2SMT] "λ term {repr t} translated to SMT term {sterm}"
+    addCommand (.assert (.attr sterm #[.symb "named" s!"valid_fact_{idx}"]))
+  let commands ← getCommands
+  let l2hMap ← Auto.IR.SMT.getL2hMap
+  return (commands, l2hMap)
+
 end Auto