diff --git a/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/degree_12_mul.asm b/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/degree_12_mul.asm
index 013822ec..21e11a36 100644
--- a/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/degree_12_mul.asm
+++ b/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/degree_12_mul.asm
@@ -211,7 +211,7 @@ global mul_fp254_12_sparse:
     // stack:                      inB, f, f', inB, f, inB, f', out, f, inB, f', inA, inB, out
     %mload_kernel_general
     // stack:                      g0 , f, f', inB, f, inB, f', out, f, inB, f', inA, inB, out
-    %mul_fp254__fp254_6
+    %scale_re_fp254_6
     // stack:                      g0 * f, f', inB, f, inB, f', out, f, inB, f', inA, inB, out
     %stack (x: 6, y: 6) -> (y, x)
     // stack:                    f'  , g0 * f, inB, f, inB, f', out, f, inB, f', inA, inB, out
@@ -220,7 +220,7 @@ global mul_fp254_12_sparse:
     // stack:           inB2,    f'  , g0 * f, inB, f, inB, f', out, f, inB, f', inA, inB, out
     %load_fp254_2
     // stack:           G2  ,    f'  , g0 * f, inB, f, inB, f', out, f, inB, f', inA, inB, out
-    %mul_fp254_2_fp254_6_sh2
+    %scale_fp254_6_sh2
     // stack:           G2 * sh2(f') , g0 * f, inB, f, inB, f', out, f, inB, f', inA, inB, out
     %add_fp254_6
     // stack:           G2 * sh2(f') + g0 * f, inB, f, inB, f', out, f, inB, f', inA, inB, out
@@ -230,7 +230,7 @@ global mul_fp254_12_sparse:
     // stack: inB1,    f , inB, G2 * sh2(f') + g0 * f, inB, f', out, f, inB, f', inA, inB, out
     %load_fp254_2
     // stack:  G1 ,    f , inB, G2 * sh2(f') + g0 * f, inB, f', out, f, inB, f', inA, inB, out
-    %mul_fp254_2_fp254_6_sh
+    %scale_fp254_6_sh
     // stack:  G1 * sh(f), inB, G2 * sh2(f') + g0 * f, inB, f', out, f, inB, f', inA, inB, out
     %add_fp254_6_hole
     // stack:      G1 * sh(f) + G2 * sh2(f') + g0 * f, inB, f', out, f, inB, f', inA, inB, out
@@ -240,7 +240,7 @@ global mul_fp254_12_sparse:
     // stack:                                          inB, f', out, f, inB, f', inA, inB, out
     %mload_kernel_general
     // stack:                                          g0 , f', out, f, inB, f', inA, inB, out
-    %mul_fp254__fp254_6
+    %scale_re_fp254_6
     // stack:                                          g0 * f', out, f, inB, f', inA, inB, out
     %swap_fp254_6_hole
     // stack:                                        f  , out, g0 * f', inB, f', inA, inB, out
@@ -249,7 +249,7 @@ global mul_fp254_12_sparse:
     // stack:                               inB2,    f  , out, g0 * f', inB, f', inA, inB, out
     %load_fp254_2
     // stack:                                G2 ,    f  , out, g0 * f', inB, f', inA, inB, out
-    %mul_fp254_2_fp254_6_sh
+    %scale_fp254_6_sh
     // stack:                                G2 * sh(f) , out, g0 * f', inB, f', inA, inB, out
     %add_fp254_6_hole
     // stack:                                     G2 * sh(f) + g0 * f', inB, f', inA, inB, out
@@ -260,7 +260,7 @@ global mul_fp254_12_sparse:
     // stack:                           inB1,    f' , inB, G2 * sh(f) + g0 * f', inA, inB, out
     %load_fp254_2
     // stack:                            G1 ,    f' , inB, G2 * sh(f) + g0 * f', inA, inB, out
-    %mul_fp254_2_fp254_6_sh
+    %scale_fp254_6_sh
     // stack:                            G1 * sh(f'), inB, G2 * sh(f) + g0 * f', inA, inB, out
     %add_fp254_6_hole
     // stack:                                G1 * sh(f') + G2 * sh(f) + g0 * f', inA, inB, out
diff --git a/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/frobenius.asm b/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/frobenius.asm
index a9b29689..ee1e4679 100644
--- a/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/frobenius.asm
+++ b/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/frobenius.asm
@@ -214,25 +214,25 @@ global test_frob_fp254_6_3:
     %frob_fp254_6_1
     PUSH 0x246996f3b4fae7e6a6327cfe12150b8e747992778eeec7e5ca5cf05f80f362ac
     PUSH 0x1284b71c2865a7dfe8b99fdd76e68b605c521e08292f2176d60b35dadcc9e470
-    %mul_fp254_2_fp254_6
+    %scale_fp254_6
 %endmacro
 
 %macro frobz_2
     %frob_fp254_6_2
     PUSH 0x30644e72e131a0295e6dd9e7e0acccb0c28f069fbb966e3de4bd44e5607cfd49
-    %mul_fp254__fp254_6
+    %scale_re_fp254_6
 %endmacro
 
 %macro frobz_3
     %frob_fp254_6_3
     PUSH 0xabf8b60be77d7306cbeee33576139d7f03a5e397d439ec7694aa2bf4c0c101
     PUSH 0x19dc81cfcc82e4bbefe9608cd0acaa90894cb38dbe55d24ae86f7d391ed4a67f
-    %mul_fp254_2_fp254_6
+    %scale_fp254_6
 %endmacro
 
 %macro frobz_6
     PUSH 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46
-    %mul_fp254__fp254_6
+    %scale_re_fp254_6
 %endmacro
 
 
diff --git a/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/util.asm b/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/util.asm
index 676f8c59..87cba2eb 100644
--- a/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/util.asm
+++ b/evm/src/cpu/kernel/asm/curve/bn254/field_arithmetic/util.asm
@@ -569,7 +569,7 @@
 %endmacro
 
 // cost: 21
-%macro mul_fp254__fp254_6
+%macro scale_re_fp254_6
     // stack: c , f0,      f1,    f2,     f3,     f4,     f5
     SWAP6
     DUP7
@@ -609,7 +609,7 @@
 /// G1 = (a+bi)(f1+f1_i) = (af1 - bf1_) + (bf1 + af1_)i
 /// G2 = (a+bi)(f2+f2_i) = (af2 - bf2_) + (bf2 + af2_)i
 
-%macro mul_fp254_2_fp254_6
+%macro scale_fp254_6
     // stack:             a, b, f0, f0_, f1, f1_, f2, f2_
     DUP2
     DUP5
@@ -700,7 +700,7 @@
 /// G1 = (a+bi)(f0+f0_i) = (af0 - bf0_) + (bf0 + af0_)i
 /// G2 = (a+bi)(f1+f1_i) = (af1 - bf1_) + (bf1 + af1_)i
 
-%macro mul_fp254_2_fp254_6_sh
+%macro scale_fp254_6_sh
     // stack:             a, b, f0, f0_, f1, f1_, f2, f2_
     DUP6
     DUP3
@@ -794,7 +794,7 @@
 /// G1 = (a+bi)(f2+f2_i) = (cf2 - df2_) + (df2 + cf2_)i
 /// G2 = (a+bi)(f0+f0_i) = (af0 - bf0_) + (bf0 + af0_)i
 
-%macro mul_fp254_2_fp254_6_sh2
+%macro scale_fp254_6_sh2
     // stack:             a, b, f0, f0_, f1, f1_, f2, f2_
     DUP4
     DUP3