diff --git a/python/quantum-pecos/src/pecos/slr/gen_codes/gen_qasm.py b/python/quantum-pecos/src/pecos/slr/gen_codes/gen_qasm.py
index 69540c93a..2d615b75c 100644
--- a/python/quantum-pecos/src/pecos/slr/gen_codes/gen_qasm.py
+++ b/python/quantum-pecos/src/pecos/slr/gen_codes/gen_qasm.py
@@ -227,23 +227,35 @@ def process_qgate(self, op):
                     )
 
                 case "F":
-                    op_str = " ".join(
-                        [f"rx(pi/2) {str(q)};\nrz(pi/2) {str(q)};" for q in op.qargs],
+                    op_str = "\n".join(
+                        [
+                            self.qgate_sq_qasm(op, "rx(pi/2)"),
+                            self.qgate_sq_qasm(op, "rz(pi/2)"),
+                        ],
                     )
 
                 case "Fdg":
-                    op_str = " ".join(
-                        [f"ry(-pi/2) {str(q)};\nrz(-pi/2) {str(q)};" for q in op.qargs],
+                    op_str = "\n".join(
+                        [
+                            self.qgate_sq_qasm(op, "ry(-pi/2)"),
+                            self.qgate_sq_qasm(op, "rz(-pi/2)"),
+                        ],
                     )
 
                 case "F4":
-                    op_str = " ".join(
-                        [f"ry(-pi/2) {str(q)};\nrz(pi/2) {str(q)};" for q in op.qargs],
+                    op_str = "\n".join(
+                        [
+                            self.qgate_sq_qasm(op, "ry(-pi/2)"),
+                            self.qgate_sq_qasm(op, "rz(pi/2)"),
+                        ],
                     )
 
                 case "F4dg":
-                    op_str = " ".join(
-                        [f"rx(-pi/2) {str(q)};\nrz(-pi/2) {str(q)};" for q in op.qargs],
+                    op_str = "\n".join(
+                        [
+                            self.qgate_sq_qasm(op, "rx(-pi/2)"),
+                            self.qgate_sq_qasm(op, "rz(-pi/2)"),
+                        ],
                     )
 
                 case "Prep":
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_X.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_X.qasm
index aa7252b43..9f331119a 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_X.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_X.qasm
@@ -340,8 +340,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -854,8 +866,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_Y.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_Y.qasm
index 5b8003e8f..ebe56c995 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_Y.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_Y.qasm
@@ -340,8 +340,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -856,8 +868,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_Z.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_Z.qasm
index 86e76d51d..057a31551 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_Z.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+X_Z.qasm
@@ -340,8 +340,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -846,8 +858,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_X.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_X.qasm
index f482779d0..9cf7dee1a 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_X.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_X.qasm
@@ -340,8 +340,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -854,8 +866,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_Y.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_Y.qasm
index b5118ac0c..76c0b6341 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_Y.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_Y.qasm
@@ -340,8 +340,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -856,8 +868,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_Z.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_Z.qasm
index c03fae9aa..f65d98c83 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_Z.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Y_Z.qasm
@@ -340,8 +340,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -846,8 +858,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_X.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_X.qasm
index ab8214208..31a71eab3 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_X.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_X.qasm
@@ -333,8 +333,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -847,8 +859,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_Y.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_Y.qasm
index 774f6f569..c99a85a47 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_Y.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_Y.qasm
@@ -333,8 +333,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -849,8 +861,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_Z.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_Z.qasm
index 8d85e992d..0bc59800e 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_Z.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_+Z_Z.qasm
@@ -333,8 +333,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -839,8 +851,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_X.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_X.qasm
index 67349f5ab..777176553 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_X.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_X.qasm
@@ -344,8 +344,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -858,8 +870,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_Y.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_Y.qasm
index c7a4db4e2..46c811c39 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_Y.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_Y.qasm
@@ -344,8 +344,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -860,8 +872,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_Z.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_Z.qasm
index 35c1ee7ce..986618a0c 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_Z.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-X_Z.qasm
@@ -344,8 +344,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -850,8 +862,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_X.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_X.qasm
index 432eb4d36..95d37e5c9 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_X.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_X.qasm
@@ -340,8 +340,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -854,8 +866,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_Y.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_Y.qasm
index eb1bd6eb8..318f8c8ed 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_Y.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_Y.qasm
@@ -340,8 +340,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -856,8 +868,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_Z.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_Z.qasm
index 2e4fe9cec..5fe839261 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_Z.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Y_Z.qasm
@@ -340,8 +340,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -846,8 +858,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_X.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_X.qasm
index 87ddec865..0785eba59 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_X.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_X.qasm
@@ -336,8 +336,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -850,8 +862,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_Y.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_Y.qasm
index b952af584..17b7533f6 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_Y.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_Y.qasm
@@ -336,8 +336,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -852,8 +864,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_Z.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_Z.qasm
index 8e4059fe0..3c1ebc271 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_Z.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/local_steane_code_program.t_gate_-Z_Z.qasm
@@ -336,8 +336,20 @@ if(saux_flags == 0) saux_flags = saux_flag_x | saux_flags_z;
 
 saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
 
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[0] = saux_scratch[2];
 // Transversal Logical CX
 barrier sin_d, saux_d;
@@ -842,8 +854,20 @@ if(saux_scratch[2] != 0) saux_flag_x[2] = saux_flag_x[2] ^ saux_last_raw_syn_x[2
 if(saux_scratch[2] != 0) saux_flags = saux_flag_x | saux_flags_z;
 
 if(saux_scratch[2] != 0) saux_scratch[2] = (((saux_scratch[0] | saux_scratch[1]) | saux_flags[0]) | saux_flags[1]) | saux_flags[2];
-rx(-pi/2) saux_d;
-rz(-pi/2) saux_d;
+rx(-pi/2) saux_d[0];
+rx(-pi/2) saux_d[1];
+rx(-pi/2) saux_d[2];
+rx(-pi/2) saux_d[3];
+rx(-pi/2) saux_d[4];
+rx(-pi/2) saux_d[5];
+rx(-pi/2) saux_d[6];
+rz(-pi/2) saux_d[0];
+rz(-pi/2) saux_d[1];
+rz(-pi/2) saux_d[2];
+rz(-pi/2) saux_d[3];
+rz(-pi/2) saux_d[4];
+rz(-pi/2) saux_d[5];
+rz(-pi/2) saux_d[6];
 m_reject[1] = saux_scratch[2];
 
 barrier sin_d[0], sin_d[1], sin_d[2], sin_d[3], sin_d[4], sin_d[5], sin_d[6], sin_a[0];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.gates_sq.face_rots.F.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.gates_sq.face_rots.F.qasm
index 6f17dfd14..f3a47a68a 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.gates_sq.face_rots.F.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.gates_sq.face_rots.F.qasm
@@ -1,2 +1,14 @@
-rx(-pi/2) q_test;
-rz(-pi/2) q_test;
+rx(-pi/2) q_test[0];
+rx(-pi/2) q_test[1];
+rx(-pi/2) q_test[2];
+rx(-pi/2) q_test[3];
+rx(-pi/2) q_test[4];
+rx(-pi/2) q_test[5];
+rx(-pi/2) q_test[6];
+rz(-pi/2) q_test[0];
+rz(-pi/2) q_test[1];
+rz(-pi/2) q_test[2];
+rz(-pi/2) q_test[3];
+rz(-pi/2) q_test[4];
+rz(-pi/2) q_test[5];
+rz(-pi/2) q_test[6];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.gates_sq.face_rots.Fdg.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.gates_sq.face_rots.Fdg.qasm
index 6f17dfd14..f3a47a68a 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.gates_sq.face_rots.Fdg.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.gates_sq.face_rots.Fdg.qasm
@@ -1,2 +1,14 @@
-rx(-pi/2) q_test;
-rz(-pi/2) q_test;
+rx(-pi/2) q_test[0];
+rx(-pi/2) q_test[1];
+rx(-pi/2) q_test[2];
+rx(-pi/2) q_test[3];
+rx(-pi/2) q_test[4];
+rx(-pi/2) q_test[5];
+rx(-pi/2) q_test[6];
+rz(-pi/2) q_test[0];
+rz(-pi/2) q_test[1];
+rz(-pi/2) q_test[2];
+rz(-pi/2) q_test[3];
+rz(-pi/2) q_test[4];
+rz(-pi/2) q_test[5];
+rz(-pi/2) q_test[6];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFT.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFT.qasm
index 6386786c9..d0dbee43e 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFT.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFT.qasm
@@ -199,5 +199,17 @@ if(flags_test == 0) flag_x_test[2] = flag_x_test[2] ^ last_raw_syn_x_test[2];
 if(flags_test == 0) flags_test = flag_x_test | flag_z_test;
 
 reject_test[0] = (((out_test[0] | out_test[1]) | flags_test[0]) | flags_test[1]) | flags_test[2];
-rx(-pi/2) q_test;
-rz(-pi/2) q_test;
+rx(-pi/2) q_test[0];
+rx(-pi/2) q_test[1];
+rx(-pi/2) q_test[2];
+rx(-pi/2) q_test[3];
+rx(-pi/2) q_test[4];
+rx(-pi/2) q_test[5];
+rx(-pi/2) q_test[6];
+rz(-pi/2) q_test[0];
+rz(-pi/2) q_test[1];
+rz(-pi/2) q_test[2];
+rz(-pi/2) q_test[3];
+rz(-pi/2) q_test[4];
+rz(-pi/2) q_test[5];
+rz(-pi/2) q_test[6];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_1.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_1.qasm
index aef2de397..eb6b68ee7 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_1.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_1.qasm
@@ -200,5 +200,17 @@ if(flags_test == 0) flags_test = flag_x_test | flag_z_test;
 
 reject_test[0] = (((out_test[0] | out_test[1]) | flags_test[0]) | flags_test[1]) | flags_test[2];
 
-rx(-pi/2) q_test;
-rz(-pi/2) q_test;
+rx(-pi/2) q_test[0];
+rx(-pi/2) q_test[1];
+rx(-pi/2) q_test[2];
+rx(-pi/2) q_test[3];
+rx(-pi/2) q_test[4];
+rx(-pi/2) q_test[5];
+rx(-pi/2) q_test[6];
+rz(-pi/2) q_test[0];
+rz(-pi/2) q_test[1];
+rz(-pi/2) q_test[2];
+rz(-pi/2) q_test[3];
+rz(-pi/2) q_test[4];
+rz(-pi/2) q_test[5];
+rz(-pi/2) q_test[6];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_2.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_2.qasm
index c50b2754e..e9faee00a 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_2.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_2.qasm
@@ -400,5 +400,17 @@ if(reject_test[0] != 0) flag_x_test[2] = flag_x_test[2] ^ last_raw_syn_x_test[2]
 if(reject_test[0] != 0) flags_test = flag_x_test | flag_z_test;
 
 if(reject_test[0] != 0) reject_test[0] = (((out_test[0] | out_test[1]) | flags_test[0]) | flags_test[1]) | flags_test[2];
-rx(-pi/2) q_test;
-rz(-pi/2) q_test;
+rx(-pi/2) q_test[0];
+rx(-pi/2) q_test[1];
+rx(-pi/2) q_test[2];
+rx(-pi/2) q_test[3];
+rx(-pi/2) q_test[4];
+rx(-pi/2) q_test[5];
+rx(-pi/2) q_test[6];
+rz(-pi/2) q_test[0];
+rz(-pi/2) q_test[1];
+rz(-pi/2) q_test[2];
+rz(-pi/2) q_test[3];
+rz(-pi/2) q_test[4];
+rz(-pi/2) q_test[5];
+rz(-pi/2) q_test[6];
diff --git a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_3.qasm b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_3.qasm
index bc240f665..5bb8f0821 100644
--- a/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_3.qasm
+++ b/python/tests/pecos/regression/test_qasm/regression_qasm/pecos.qeclib.steane.preps.t_plus_state.PrepEncodeTPlusFTRUS_3.qasm
@@ -601,5 +601,17 @@ if(reject_test[0] != 0) flag_x_test[2] = flag_x_test[2] ^ last_raw_syn_x_test[2]
 if(reject_test[0] != 0) flags_test = flag_x_test | flag_z_test;
 
 if(reject_test[0] != 0) reject_test[0] = (((out_test[0] | out_test[1]) | flags_test[0]) | flags_test[1]) | flags_test[2];
-rx(-pi/2) q_test;
-rz(-pi/2) q_test;
+rx(-pi/2) q_test[0];
+rx(-pi/2) q_test[1];
+rx(-pi/2) q_test[2];
+rx(-pi/2) q_test[3];
+rx(-pi/2) q_test[4];
+rx(-pi/2) q_test[5];
+rx(-pi/2) q_test[6];
+rz(-pi/2) q_test[0];
+rz(-pi/2) q_test[1];
+rz(-pi/2) q_test[2];
+rz(-pi/2) q_test[3];
+rz(-pi/2) q_test[4];
+rz(-pi/2) q_test[5];
+rz(-pi/2) q_test[6];