diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-2mm.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-2mm.expect
index 3b69b456d7..c637a7bc4b 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-2mm.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-2mm.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       10,
       98,
@@ -81,7 +81,7 @@
       85
     ]
   ],
-  "B_int0_0": [
+  "B_int": [
     [
       39,
       50,
@@ -163,7 +163,7 @@
       73
     ]
   ],
-  "C_int0_0": [
+  "C_int": [
     [
       7,
       47,
@@ -245,7 +245,7 @@
       40
     ]
   ],
-  "D_int0_0": [
+  "D_int": [
     [
       285128881,
       677093601,
@@ -327,13 +327,13 @@
       316273951
     ]
   ],
-  "alpha_int0": [
+  "alpha_int": [
     50
   ],
-  "beta_int0": [
+  "beta_int": [
     51
   ],
-  "tmp_int0_0": [
+  "tmp_int": [
     [
       1505050,
       877150,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-2mm.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-2mm.fuse.data
index c961777d64..8e016e5adb 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-2mm.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-2mm.fuse.data
@@ -1,5 +1,5 @@
 {
-  "alpha_int0": {
+  "alpha_int": {
     "data": [
       50
     ],
@@ -9,7 +9,7 @@
       "width": 32
     }
   },
-  "beta_int0": {
+  "beta_int": {
     "data": [
       51
     ],
@@ -19,7 +19,7 @@
       "width": 32
     }
   },
-  "tmp_int0_0": {
+  "tmp_int": {
     "data": [
       [
         93,
@@ -108,7 +108,7 @@
       "width": 32
     }
   },
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         10,
@@ -197,7 +197,7 @@
       "width": 32
     }
   },
-  "B_int0_0": {
+  "B_int": {
     "data": [
       [
         39,
@@ -286,7 +286,7 @@
       "width": 32
     }
   },
-  "C_int0_0": {
+  "C_int": {
     "data": [
       [
         7,
@@ -375,7 +375,7 @@
       "width": 32
     }
   },
-  "D_int0_0": {
+  "D_int": {
     "data": [
       [
         31,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-3mm.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-3mm.expect
index d0357ad7e4..c6de3c942b 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-3mm.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-3mm.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       61,
       72,
@@ -81,7 +81,7 @@
       98
     ]
   ],
-  "B_int0_0": [
+  "B_int": [
     [
       94,
       32,
@@ -163,7 +163,7 @@
       98
     ]
   ],
-  "C_int0_0": [
+  "C_int": [
     [
       95,
       65,
@@ -245,7 +245,7 @@
       0
     ]
   ],
-  "D_int0_0": [
+  "D_int": [
     [
       3,
       82,
@@ -327,7 +327,7 @@
       17
     ]
   ],
-  "E_int0_0": [
+  "E_int": [
     [
       23854,
       26000,
@@ -409,7 +409,7 @@
       30430
     ]
   ],
-  "F_int0_0": [
+  "F_int": [
     [
       17567,
       22938,
@@ -491,7 +491,7 @@
       13934
     ]
   ],
-  "G_int0_0": [
+  "G_int": [
     [
       4134887983,
       259879444,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-3mm.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-3mm.fuse.data
index e02937530a..cfd1508a01 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-3mm.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-3mm.fuse.data
@@ -1,5 +1,5 @@
 {
-  "E_int0_0": {
+  "E_int": {
     "data": [
       [
         46,
@@ -88,7 +88,7 @@
       "width": 32
     }
   },
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         61,
@@ -177,7 +177,7 @@
       "width": 32
     }
   },
-  "B_int0_0": {
+  "B_int": {
     "data": [
       [
         94,
@@ -266,7 +266,7 @@
       "width": 32
     }
   },
-  "F_int0_0": {
+  "F_int": {
     "data": [
       [
         53,
@@ -355,7 +355,7 @@
       "width": 32
     }
   },
-  "C_int0_0": {
+  "C_int": {
     "data": [
       [
         95,
@@ -444,7 +444,7 @@
       "width": 32
     }
   },
-  "D_int0_0": {
+  "D_int": {
     "data": [
       [
         3,
@@ -533,7 +533,7 @@
       "width": 32
     }
   },
-  "G_int0_0": {
+  "G_int": {
     "data": [
       [
         63,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-atax.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-atax.expect
index 78f82853f4..645f37edc4 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-atax.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-atax.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       48,
       68,
@@ -81,7 +81,7 @@
       58
     ]
   ],
-  "tmp_int0": [
+  "tmp_int": [
     14244,
     16527,
     34104,
@@ -91,7 +91,7 @@
     24923,
     29000
   ],
-  "x_int0": [
+  "x_int": [
     40,
     88,
     47,
@@ -101,7 +101,7 @@
     83,
     88
   ],
-  "y_int0": [
+  "y_int": [
     6933849,
     7389774,
     13276843,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-atax.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-atax.fuse.data
index b697008cfe..108cbc0b21 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-atax.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-atax.fuse.data
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         48,
@@ -88,7 +88,7 @@
       "width": 32
     }
   },
-  "x_int0": {
+  "x_int": {
     "data": [
       40,
       88,
@@ -105,7 +105,7 @@
       "width": 32
     }
   },
-  "y_int0": {
+  "y_int": {
     "data": [
       48,
       61,
@@ -122,7 +122,7 @@
       "width": 32
     }
   },
-  "tmp_int0": {
+  "tmp_int": {
     "data": [
       17,
       57,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-bicg.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-bicg.expect
index 785c62e5f7..d5c6d95c3f 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-bicg.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-bicg.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       78,
       89,
@@ -81,7 +81,7 @@
       0
     ]
   ],
-  "p_int0": [
+  "p_int": [
     48,
     15,
     11,
@@ -91,7 +91,7 @@
     16,
     88
   ],
-  "q_int0": [
+  "q_int": [
     14244,
     16852,
     11472,
@@ -101,7 +101,7 @@
     14434,
     13078
   ],
-  "r_int0": [
+  "r_int": [
     10,
     78,
     18,
@@ -111,7 +111,7 @@
     54,
     1
   ],
-  "s_int0": [
+  "s_int": [
     20412,
     10531,
     8959,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-bicg.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-bicg.fuse.data
index 75023f6138..8ae6b0ee97 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-bicg.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-bicg.fuse.data
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         78,
@@ -88,7 +88,7 @@
       "width": 32
     }
   },
-  "s_int0": {
+  "s_int": {
     "data": [
       41,
       24,
@@ -105,7 +105,7 @@
       "width": 32
     }
   },
-  "q_int0": {
+  "q_int": {
     "data": [
       59,
       33,
@@ -122,7 +122,7 @@
       "width": 32
     }
   },
-  "p_int0": {
+  "p_int": {
     "data": [
       48,
       15,
@@ -139,7 +139,7 @@
       "width": 32
     }
   },
-  "r_int0": {
+  "r_int": {
     "data": [
       10,
       78,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-cholesky.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-cholesky.expect
index 09331f22a3..6a5dcf8dce 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-cholesky.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-cholesky.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       6,
       90,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-cholesky.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-cholesky.fuse.data
index 90a05531c7..cd7dbd496c 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-cholesky.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-cholesky.fuse.data
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         47,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-doitgen.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-doitgen.expect
index 4f1e0b58f2..267412d961 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-doitgen.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-doitgen.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0_0": [
+  "A_int": [
     [
       [
         12512,
@@ -657,7 +657,7 @@
       ]
     ]
   ],
-  "C4_int0_0": [
+  "C4_int": [
     [
       12,
       97,
@@ -739,7 +739,7 @@
       59
     ]
   ],
-  "sum_int0": [
+  "sum_int": [
     9001,
     16399,
     25180,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-doitgen.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-doitgen.fuse.data
index e4c9be6fae..d6ee52b8b9 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-doitgen.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-doitgen.fuse.data
@@ -1,5 +1,5 @@
 {
-  "A_int0_0_0": {
+  "A_int": {
     "data": [
       [
         [
@@ -664,7 +664,7 @@
       "width": 32
     }
   },
-  "C4_int0_0": {
+  "C4_int": {
     "data": [
       [
         12,
@@ -753,7 +753,7 @@
       "width": 32
     }
   },
-  "sum_int0": {
+  "sum_int": {
     "data": [
       40,
       65,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-durbin.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-durbin.expect
index edb68255c6..fbac37d4b8 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-durbin.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-durbin.expect
@@ -1,5 +1,5 @@
 {
-  "r_int0": [
+  "r_int": [
     80,
     54,
     53,
@@ -9,7 +9,7 @@
     3,
     92
   ],
-  "y_int0": [
+  "y_int": [
     0,
     4294967295,
     0,
@@ -19,7 +19,7 @@
     0,
     0
   ],
-  "z_int0": [
+  "z_int": [
     0,
     4294967295,
     0,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-durbin.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-durbin.fuse.data
index 4ff179bffa..f09529820a 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-durbin.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-durbin.fuse.data
@@ -1,5 +1,5 @@
 {
-  "r_int0": {
+  "r_int": {
     "data": [
       80,
       54,
@@ -16,7 +16,7 @@
       "width": 32
     }
   },
-  "y_int0": {
+  "y_int": {
     "data": [
       67,
       73,
@@ -33,7 +33,7 @@
       "width": 32
     }
   },
-  "z_int0": {
+  "z_int": {
     "data": [
       29,
       5,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemm.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemm.expect
index fc9a3ba94b..c7b7a401c5 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemm.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemm.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       30,
       15,
@@ -81,7 +81,7 @@
       82
     ]
   ],
-  "B_int0_0": [
+  "B_int": [
     [
       67,
       87,
@@ -163,7 +163,7 @@
       97
     ]
   ],
-  "C_int0_0": [
+  "C_int": [
     [
       224800,
       333447,
@@ -245,10 +245,10 @@
       642358
     ]
   ],
-  "alpha_int0": [
+  "alpha_int": [
     25
   ],
-  "beta_int0": [
+  "beta_int": [
     94
   ]
 }
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemm.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemm.fuse.data
index 977a6f8704..a0aa8c70a5 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemm.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemm.fuse.data
@@ -1,5 +1,5 @@
 {
-  "alpha_int0": {
+  "alpha_int": {
     "data": [
       25
     ],
@@ -9,7 +9,7 @@
       "width": 32
     }
   },
-  "beta_int0": {
+  "beta_int": {
     "data": [
       94
     ],
@@ -19,7 +19,7 @@
       "width": 32
     }
   },
-  "C_int0_0": {
+  "C_int": {
     "data": [
       [
         0,
@@ -108,7 +108,7 @@
       "width": 32
     }
   },
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         30,
@@ -197,7 +197,7 @@
       "width": 32
     }
   },
-  "B_int0_0": {
+  "B_int": {
     "data": [
       [
         67,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemver.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemver.expect
index b538e9374e..7aaded20ac 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemver.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemver.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       1158,
       779,
@@ -81,13 +81,13 @@
       8577
     ]
   ],
-  "alpha_int0": [
+  "alpha_int": [
     87
   ],
-  "beta_int0": [
+  "beta_int": [
     35
   ],
-  "u1_int0": [
+  "u1_int": [
     3,
     22,
     65,
@@ -97,7 +97,7 @@
     43,
     81
   ],
-  "u2_int0": [
+  "u2_int": [
     19,
     15,
     81,
@@ -107,7 +107,7 @@
     66,
     83
   ],
-  "v1_int0": [
+  "v1_int": [
     28,
     20,
     89,
@@ -117,7 +117,7 @@
     49,
     14
   ],
-  "v2_int0": [
+  "v2_int": [
     56,
     35,
     85,
@@ -127,7 +127,7 @@
     62,
     89
   ],
-  "w_int0": [
+  "w_int": [
     2550846912,
     2987456512,
     3372713567,
@@ -137,7 +137,7 @@
     3543689434,
     1291069916
   ],
-  "x_int0": [
+  "x_int": [
     54584155,
     35574806,
     108460862,
@@ -147,7 +147,7 @@
     70548875,
     69966960
   ],
-  "y_int0": [
+  "y_int": [
     47,
     14,
     34,
@@ -157,7 +157,7 @@
     77,
     69
   ],
-  "z_int0": [
+  "z_int": [
     53,
     45,
     39,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemver.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemver.fuse.data
index 5cb38d4f45..ce79b92323 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemver.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gemver.fuse.data
@@ -1,5 +1,5 @@
 {
-  "alpha_int0": {
+  "alpha_int": {
     "data": [
       87
     ],
@@ -9,7 +9,7 @@
       "width": 32
     }
   },
-  "beta_int0": {
+  "beta_int": {
     "data": [
       35
     ],
@@ -19,7 +19,7 @@
       "width": 32
     }
   },
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         10,
@@ -108,7 +108,7 @@
       "width": 32
     }
   },
-  "u1_int0": {
+  "u1_int": {
     "data": [
       3,
       22,
@@ -125,7 +125,7 @@
       "width": 32
     }
   },
-  "v1_int0": {
+  "v1_int": {
     "data": [
       28,
       20,
@@ -142,7 +142,7 @@
       "width": 32
     }
   },
-  "u2_int0": {
+  "u2_int": {
     "data": [
       19,
       15,
@@ -159,7 +159,7 @@
       "width": 32
     }
   },
-  "v2_int0": {
+  "v2_int": {
     "data": [
       56,
       35,
@@ -176,7 +176,7 @@
       "width": 32
     }
   },
-  "w_int0": {
+  "w_int": {
     "data": [
       47,
       53,
@@ -193,7 +193,7 @@
       "width": 32
     }
   },
-  "x_int0": {
+  "x_int": {
     "data": [
       27,
       96,
@@ -210,7 +210,7 @@
       "width": 32
     }
   },
-  "y_int0": {
+  "y_int": {
     "data": [
       47,
       14,
@@ -227,7 +227,7 @@
       "width": 32
     }
   },
-  "z_int0": {
+  "z_int": {
     "data": [
       53,
       45,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gesummv.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gesummv.expect
index 702e97d01e..3af33c7d5c 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gesummv.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gesummv.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       47,
       12,
@@ -81,7 +81,7 @@
       91
     ]
   ],
-  "B_int0_0": [
+  "B_int": [
     [
       11,
       70,
@@ -163,13 +163,13 @@
       2
     ]
   ],
-  "alpha_int0": [
+  "alpha_int": [
     37
   ],
-  "beta_int0": [
+  "beta_int": [
     11
   ],
-  "tmp_int0": [
+  "tmp_int": [
     16604,
     21001,
     18520,
@@ -179,7 +179,7 @@
     14211,
     19877
   ],
-  "x_int0": [
+  "x_int": [
     72,
     87,
     20,
@@ -189,7 +189,7 @@
     0,
     51
   ],
-  "y_int0": [
+  "y_int": [
     836152,
     960715,
     941463,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gesummv.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gesummv.fuse.data
index 55442af719..a9f5d8e428 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gesummv.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gesummv.fuse.data
@@ -1,5 +1,5 @@
 {
-  "alpha_int0": {
+  "alpha_int": {
     "data": [
       37
     ],
@@ -9,7 +9,7 @@
       "width": 32
     }
   },
-  "beta_int0": {
+  "beta_int": {
     "data": [
       11
     ],
@@ -19,7 +19,7 @@
       "width": 32
     }
   },
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         47,
@@ -108,7 +108,7 @@
       "width": 32
     }
   },
-  "B_int0_0": {
+  "B_int": {
     "data": [
       [
         11,
@@ -197,7 +197,7 @@
       "width": 32
     }
   },
-  "tmp_int0": {
+  "tmp_int": {
     "data": [
       79,
       94,
@@ -214,7 +214,7 @@
       "width": 32
     }
   },
-  "x_int0": {
+  "x_int": {
     "data": [
       72,
       87,
@@ -231,7 +231,7 @@
       "width": 32
     }
   },
-  "y_int0": {
+  "y_int": {
     "data": [
       77,
       27,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gramschmidt.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gramschmidt.expect
index 075a0cf81f..e2f1867c8b 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gramschmidt.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gramschmidt.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       50,
       70,
@@ -113,7 +113,7 @@
       6
     ]
   ],
-  "Q_int0_0": [
+  "Q_int": [
     [
       0,
       0,
@@ -227,7 +227,7 @@
       0
     ]
   ],
-  "R_int0_0": [
+  "R_int": [
     [
       161,
       0,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gramschmidt.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gramschmidt.fuse.data
index aa0c572939..cd3cd43608 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-gramschmidt.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-gramschmidt.fuse.data
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         50,
@@ -120,7 +120,7 @@
       "width": 32
     }
   },
-  "R_int0_0": {
+  "R_int": {
     "data": [
       [
         6,
@@ -297,7 +297,7 @@
       "width": 32
     }
   },
-  "Q_int0_0": {
+  "Q_int": {
     "data": [
       [
         63,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-lu.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-lu.expect
index 85b96f6106..68c58a75e2 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-lu.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-lu.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       9,
       52,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-lu.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-lu.fuse.data
index 0de6f51e73..841d39e6fc 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-lu.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-lu.fuse.data
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         9,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-ludcmp.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-ludcmp.expect
index 037a9fc9d3..018f425748 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-ludcmp.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-ludcmp.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       20,
       96,
@@ -81,7 +81,7 @@
       3579139355
     ]
   ],
-  "b_int0": [
+  "b_int": [
     23,
     13,
     88,
@@ -91,7 +91,7 @@
     30,
     76
   ],
-  "x_int0": [
+  "x_int": [
     17895700,
     0,
     0,
@@ -101,7 +101,7 @@
     1,
     0
   ],
-  "y_int0": [
+  "y_int": [
     23,
     4294967240,
     121,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-ludcmp.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-ludcmp.fuse.data
index 0a74e5e94e..56155501aa 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-ludcmp.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-ludcmp.fuse.data
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         20,
@@ -88,7 +88,7 @@
       "width": 32
     }
   },
-  "b_int0": {
+  "b_int": {
     "data": [
       23,
       13,
@@ -105,7 +105,7 @@
       "width": 32
     }
   },
-  "x_int0": {
+  "x_int": {
     "data": [
       8,
       83,
@@ -122,7 +122,7 @@
       "width": 32
     }
   },
-  "y_int0": {
+  "y_int": {
     "data": [
       49,
       39,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-mvt.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-mvt.expect
index cd0029eb04..0c763ae8bf 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-mvt.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-mvt.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       12,
       1,
@@ -81,7 +81,7 @@
       76
     ]
   ],
-  "x1_int0": [
+  "x1_int": [
     9907,
     16588,
     16680,
@@ -91,7 +91,7 @@
     19186,
     16922
   ],
-  "x2_int0": [
+  "x2_int": [
     21877,
     17594,
     23436,
@@ -101,7 +101,7 @@
     9286,
     22185
   ],
-  "y1_int0": [
+  "y1_int": [
     18,
     43,
     11,
@@ -111,7 +111,7 @@
     14,
     63
   ],
-  "y2_int0": [
+  "y2_int": [
     12,
     40,
     88,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-mvt.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-mvt.fuse.data
index 8139e043f6..60e90fe6c9 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-mvt.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-mvt.fuse.data
@@ -1,5 +1,5 @@
 {
-  "x1_int0": {
+  "x1_int": {
     "data": [
       38,
       47,
@@ -16,7 +16,7 @@
       "width": 32
     }
   },
-  "x2_int0": {
+  "x2_int": {
     "data": [
       16,
       27,
@@ -33,7 +33,7 @@
       "width": 32
     }
   },
-  "y1_int0": {
+  "y1_int": {
     "data": [
       18,
       43,
@@ -50,7 +50,7 @@
       "width": 32
     }
   },
-  "y2_int0": {
+  "y2_int": {
     "data": [
       12,
       40,
@@ -67,7 +67,7 @@
       "width": 32
     }
   },
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         12,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-symm.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-symm.expect
index 7a25b04798..bda10f2791 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-symm.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-symm.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       91,
       30,
@@ -81,7 +81,7 @@
       55
     ]
   ],
-  "B_int0_0": [
+  "B_int": [
     [
       66,
       12,
@@ -195,7 +195,7 @@
       43
     ]
   ],
-  "C_int0_0": [
+  "C_int": [
     [
       98104,
       49035,
@@ -309,10 +309,10 @@
       77186
     ]
   ],
-  "alpha_int0": [
+  "alpha_int": [
     4
   ],
-  "beta_int0": [
+  "beta_int": [
     31
   ]
 }
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-symm.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-symm.fuse.data
index 5277065b98..80c0dda548 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-symm.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-symm.fuse.data
@@ -1,5 +1,5 @@
 {
-  "alpha_int0": {
+  "alpha_int": {
     "data": [
       4
     ],
@@ -19,7 +19,7 @@
       "width": 32
     }
   },
-  "C_int0_0": {
+  "C_int": {
     "data": [
       [
         52,
@@ -140,7 +140,7 @@
       "width": 32
     }
   },
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         91,
@@ -229,7 +229,7 @@
       "width": 32
     }
   },
-  "B_int0_0": {
+  "B_int": {
     "data": [
       [
         66,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-syr2k.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-syr2k.expect
index a46ab2a7fd..221b4c349a 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-syr2k.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-syr2k.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       96,
       86,
@@ -121,7 +121,7 @@
       80
     ]
   ],
-  "B_int0_0": [
+  "B_int": [
     [
       50,
       26,
@@ -243,7 +243,7 @@
       8
     ]
   ],
-  "C_int0_0": [
+  "C_int": [
     [
       3079074,
       2,
@@ -413,10 +413,10 @@
       3560037
     ]
   ],
-  "alpha_int0": [
+  "alpha_int": [
     75
   ],
-  "beta_int0": [
+  "beta_int": [
     21
   ]
 }
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-syr2k.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-syr2k.fuse.data
index 2023638dcc..20208f5b94 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-syr2k.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-syr2k.fuse.data
@@ -1,5 +1,5 @@
 {
-  "alpha_int0": {
+  "alpha_int": {
     "data": [
       75
     ],
@@ -9,7 +9,7 @@
       "width": 32
     }
   },
-  "beta_int0": {
+  "beta_int": {
     "data": [
       21
     ],
@@ -19,7 +19,7 @@
       "width": 32
     }
   },
-  "C_int0_0": {
+  "C_int": {
     "data": [
       [
         44,
@@ -196,7 +196,7 @@
       "width": 32
     }
   },
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         96,
@@ -325,7 +325,7 @@
       "width": 32
     }
   },
-  "B_int0_0": {
+  "B_int": {
     "data": [
       [
         50,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-syrk.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-syrk.expect
index f7da4e4fe5..6426cf3130 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-syrk.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-syrk.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       32,
       46,
@@ -121,7 +121,7 @@
       95
     ]
   ],
-  "C0_0": [
+  "C": [
     [
       841200,
       44,
@@ -291,10 +291,10 @@
       1293464
     ]
   ],
-  "alpha_int0": [
+  "alpha_int": [
     48
   ],
-  "beta_int0": [
+  "beta_int": [
     19
   ]
 }
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-syrk.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-syrk.fuse.data
index d56ddcbccd..b55e41ab62 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-syrk.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-syrk.fuse.data
@@ -1,5 +1,5 @@
 {
-  "alpha_int0": {
+  "alpha_int": {
     "data": [
       48
     ],
@@ -9,7 +9,7 @@
       "width": 32
     }
   },
-  "beta_int0": {
+  "beta_int": {
     "data": [
       19
     ],
@@ -19,7 +19,7 @@
       "width": 32
     }
   },
-  "C0_0": {
+  "C": {
     "data": [
       [
         96,
@@ -196,7 +196,7 @@
       "width": 32
     }
   },
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         32,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-trisolv.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-trisolv.expect
index c75f44a484..c0121d2f3b 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-trisolv.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-trisolv.expect
@@ -1,5 +1,5 @@
 {
-  "L_int0_0": [
+  "L_int": [
     [
       95,
       39,
@@ -81,7 +81,7 @@
       44
     ]
   ],
-  "b_int0": [
+  "b_int": [
     82,
     97,
     41,
@@ -91,7 +91,7 @@
     49,
     87
   ],
-  "x_int0": [
+  "x_int": [
     0,
     0,
     0,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-trisolv.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-trisolv.fuse.data
index 93e486c958..c9f64b5777 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-trisolv.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-trisolv.fuse.data
@@ -1,5 +1,5 @@
 {
-  "x_int0": {
+  "x_int": {
     "data": [
       81,
       93,
@@ -16,7 +16,7 @@
       "width": 32
     }
   },
-  "b_int0": {
+  "b_int": {
     "data": [
       82,
       97,
@@ -33,7 +33,7 @@
       "width": 32
     }
   },
-  "L_int0_0": {
+  "L_int": {
     "data": [
       [
         95,
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-trmm.expect b/interp/cider2-tests/benchmarks/polybench/linear-algebra-trmm.expect
index 92a0149f5b..b930f82333 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-trmm.expect
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-trmm.expect
@@ -1,5 +1,5 @@
 {
-  "A_int0_0": [
+  "A_int": [
     [
       43,
       54,
@@ -81,7 +81,7 @@
       50
     ]
   ],
-  "B_int0_0": [
+  "B_int": [
     [
       1848464,
       2249308,
@@ -195,7 +195,7 @@
       5888
     ]
   ],
-  "alpha_int0": [
+  "alpha_int": [
     92
   ]
 }
diff --git a/interp/cider2-tests/benchmarks/polybench/linear-algebra-trmm.fuse.data b/interp/cider2-tests/benchmarks/polybench/linear-algebra-trmm.fuse.data
index 15bb65f4c5..32684557f2 100644
--- a/interp/cider2-tests/benchmarks/polybench/linear-algebra-trmm.fuse.data
+++ b/interp/cider2-tests/benchmarks/polybench/linear-algebra-trmm.fuse.data
@@ -1,5 +1,5 @@
 {
-  "alpha_int0": {
+  "alpha_int": {
     "data": [
       92
     ],
@@ -9,7 +9,7 @@
       "width": 32
     }
   },
-  "A_int0_0": {
+  "A_int": {
     "data": [
       [
         43,
@@ -98,7 +98,7 @@
       "width": 32
     }
   },
-  "B_int0_0": {
+  "B_int": {
     "data": [
       [
         64,
diff --git a/interp/cider2-tests/runt.toml b/interp/cider2-tests/runt.toml
index 70d0571a41..0e17516c59 100644
--- a/interp/cider2-tests/runt.toml
+++ b/interp/cider2-tests/runt.toml
@@ -174,6 +174,17 @@ fud2 --from calyx --to dat \
          {} | jq --sort-keys
 """
 
+[[tests]]
+name = "benchmark polybench"
+paths = ["benchmarks/polybench/*.fuse"]
+cmd = """
+fud2 --from dahlia --to dat \
+         --through cider \
+         -s sim.data={}.data \
+         -s calyx.args="--log off" \
+         {} | jq --sort-keys
+"""
+
 # [[tests]]
 # name = "[frontend] systolic array correctness"
 # paths = ["../tests/correctness/systolic/*.systolic"]