diff --git a/kerngen/pisa_generators/mod.py b/kerngen/pisa_generators/mod.py
index dabeecc6..4c01e069 100644
--- a/kerngen/pisa_generators/mod.py
+++ b/kerngen/pisa_generators/mod.py
@@ -40,10 +40,12 @@ def to_pisa(self) -> list[PIsaOp]:
         # Immediates
         last_q = self.input0.rns - 1
 
-        it = Immediate(name="it" + self.var_suffix)
+        it = Immediate(name="it" + self.var_suffix + f"_{self.context.current_rns}")
         t = Immediate(name="t", rns=last_q)
         one, r2, iq = common_immediates(
-            r2_rns=last_q, iq_rns=last_q, iq_suffix=self.var_suffix
+            r2_rns=last_q,
+            iq_rns=last_q,
+            iq_suffix=self.var_suffix + f"_{self.context.current_rns}",
         )
 
         # Drop down input rns
diff --git a/kerngen/pisa_generators/rescale.py b/kerngen/pisa_generators/rescale.py
index 5b7441f3..d0683dbf 100644
--- a/kerngen/pisa_generators/rescale.py
+++ b/kerngen/pisa_generators/rescale.py
@@ -42,7 +42,7 @@ def to_pisa(self) -> list[PIsaOp]:
         one, r2, iq = common_immediates(r2_rns=last_q, iq_rns=last_q)
 
         one, r2, iq = common_immediates(
-            r2_rns=last_q, iq_rns=last_q, iq_suffix=self.var_suffix
+            r2_rns=last_q, iq_rns=last_q, iq_suffix=self.var_suffix + f"_{self.context.current_rns}"
         )
 
         q_last_half = Polys("qLastHalf", 1, self.input0.rns)