diff --git a/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
index 79b372972..ce79ef5e6 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
@@ -7,13 +7,13 @@
     }
 }
 // ====
-// step: disambiguator
 // dialect: yul
+// step: disambiguator
 // ----
 // {
-//     { let a:u256, b:u256 }
+//     { let a, b }
 //     {
-//         for { let a_1:u256 } a_1 { a_1 := a_1 }
-//         { let b_2:u256 := a_1 }
+//         for { let a_1 } a_1 { a_1 := a_1 }
+//         { let b_2 := a_1 }
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul b/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
index fe54227d3..7a4cfe739 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
@@ -7,17 +7,13 @@
     }
 }
 // ====
-// step: disambiguator
 // dialect: yul
+// step: disambiguator
 // ----
 // {
+//     { let a, b, c, d, f }
 //     {
-//         let a:u256, b:u256, c:u256, d:u256, f:u256
-//     }
-//     {
-//         function f_1(a_2:u256) -> c_3:u256, d_4:u256
-//         {
-//             let b_5:u256, c_1:u256 := f_1(a_2)
-//         }
+//         function f_1(a_2) -> c_3, d_4
+//         { let b_5, c_1 := f_1(a_2) }
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
index 2dee55ae7..def0a2d31 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
@@ -6,11 +6,11 @@
     }
 }
 // ====
-// step: disambiguator
 // dialect: yul
+// step: disambiguator
 // ----
 // {
-//     { let a:u256, b:u256, c:u256 }
+//     { let a, b, c }
 //     {
 //         let a_1:bool
 //         if a_1 { let b_2:bool := a_1 }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/long_names.yul b/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
index b5db97637..b403dc095 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/long_names.yul
@@ -1,13 +1,13 @@
 { { let aanteuhdaoneudbrgkjiuaothduiathudaoeuh:u256 } { let aanteuhdaoneudbrgkjiuaothduiathudaoeuh:u256 } }
 // ====
-// step: disambiguator
 // dialect: yul
+// step: disambiguator
 // ----
 // {
 //     {
-//         let aanteuhdaoneudbrgkjiuaothduiathudaoeuh:u256
+//         let aanteuhdaoneudbrgkjiuaothduiathudaoeuh
 //     }
 //     {
-//         let aanteuhdaoneudbrgkjiuaothduiathudaoeuh_1:u256
+//         let aanteuhdaoneudbrgkjiuaothduiathudaoeuh_1
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
index 647c78fda..0948b51b9 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
@@ -8,15 +8,15 @@
     }
 }
 // ====
-// step: disambiguator
 // dialect: yul
+// step: disambiguator
 // ----
 // {
-//     { let a:u256, b:u256, c:u256 }
+//     { let a, b, c }
 //     {
-//         let a_1:u256
+//         let a_1
 //         switch a_1
-//         case 0:u256 { let b_2:u256 := a_1 }
-//         default { let c_3:u256 := a_1 }
+//         case 0 { let b_2 := a_1 }
+//         default { let c_3 := a_1 }
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables.yul b/test/libyul/yulOptimizerTests/disambiguator/variables.yul
index 319809706..7b197f420 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/variables.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables.yul
@@ -1,9 +1,9 @@
 { { let a:u256 } { let a:u256 } }
 // ====
-// step: disambiguator
 // dialect: yul
+// step: disambiguator
 // ----
 // {
-//     { let a:u256 }
-//     { let a_1:u256 }
+//     { let a }
+//     { let a_1 }
 // }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul b/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
index 9474dfc86..9c72b82ff 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
@@ -1,12 +1,12 @@
 { { let a:u256 let a_1:u256 } { let a:u256 } }
 // ====
-// step: disambiguator
 // dialect: yul
+// step: disambiguator
 // ----
 // {
 //     {
-//         let a:u256
-//         let a_1:u256
+//         let a
+//         let a_1
 //     }
-//     { let a_2:u256 }
+//     { let a_2 }
 // }
diff --git a/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul b/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
index 66d36e431..fecb67a65 100644
--- a/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
@@ -6,18 +6,18 @@
     }
 }
 // ====
-// step: disambiguator
 // dialect: yul
+// step: disambiguator
 // ----
 // {
 //     {
-//         let c:u256
-//         let b:u256
+//         let c
+//         let b
 //     }
-//     function f(a:u256, c_1:u256) -> b_2:u256
-//     { let x:u256 }
+//     function f(a, c_1) -> b_2
+//     { let x }
 //     {
-//         let a_3:u256
-//         let x_4:u256
+//         let a_3
+//         let x_4
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/simple.yul b/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
index c1a1c147e..8c3cd28e3 100644
--- a/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
@@ -3,11 +3,11 @@
     let y:u256 := f()
 }
 // ====
-// step: expressionInliner
 // dialect: yul
+// step: expressionInliner
 // ----
 // {
-//     function f() -> x:u256
-//     { x := 2:u256 }
-//     let y:u256 := 2:u256
+//     function f() -> x
+//     { x := 2 }
+//     let y := 2
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul b/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
index 8dd694aec..5b73ed3fe 100644
--- a/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
@@ -3,11 +3,11 @@
     let y:u256 := f(7:u256)
 }
 // ====
-// step: expressionInliner
 // dialect: yul
+// step: expressionInliner
 // ----
 // {
-//     function f(a:u256) -> x:u256
+//     function f(a) -> x
 //     { x := a }
-//     let y:u256 := 7:u256
+//     let y := 7
 // }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul b/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
index 950118647..f08de996b 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
@@ -1,16 +1,16 @@
 { let a:u256 { } function f() -> x:bool { let b:u256 := 4:u256 {} for {} f() {} {} } }
 // ====
-// step: functionGrouper
 // dialect: yul
+// step: functionGrouper
 // ----
 // {
 //     {
-//         let a:u256
+//         let a
 //         { }
 //     }
 //     function f() -> x:bool
 //     {
-//         let b:u256 := 4:u256
+//         let b := 4
 //         { }
 //         for { } f() { }
 //         { }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul b/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
index 559452a98..5fb398ad7 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
@@ -5,17 +5,17 @@
     let e:u256
 }
 // ====
-// step: functionGrouper
 // dialect: yul
+// step: functionGrouper
 // ----
 // {
 //     {
-//         let a:u256
-//         let c:u256
-//         let e:u256
+//         let a
+//         let c
+//         let e
 //     }
 //     function f()
-//     { let b:u256 }
+//     { let b }
 //     function g()
-//     { let d:u256 }
+//     { let d }
 // }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul b/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
index 14b28fbab..455da2ef5 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
@@ -9,16 +9,16 @@
     }
 }
 // ====
-// step: functionGrouper
 // dialect: yul
+// step: functionGrouper
 // ----
 // {
-//     { let a:u256 }
+//     { let a }
 //     function f()
 //     {
-//         let b:u256
+//         let b
 //         function g()
-//         { let c:u256 }
-//         let d:u256
+//         { let c }
+//         let d
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul b/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
index 94af92287..f7836b6c6 100644
--- a/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
@@ -2,11 +2,11 @@
 	let a:u256 function f() {}
 }
 // ====
-// step: functionGrouper
 // dialect: yul
+// step: functionGrouper
 // ----
 // {
-//     { let a:u256 }
+//     { let a }
 //     function f()
 //     { }
 // }
diff --git a/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul b/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
index 4a7c0a7a2..276fd4b02 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
@@ -8,14 +8,14 @@
     }
 }
 // ====
-// step: functionHoister
 // dialect: yul
+// step: functionHoister
 // ----
 // {
-//     let a:u256
+//     let a
 //     function f() -> x:bool
 //     {
-//         let b:u256 := 4:u256
+//         let b := 4
 //         for { } f() { }
 //         { }
 //     }
diff --git a/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul b/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
index 78e4b49ab..4e9e9604f 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
@@ -6,15 +6,15 @@
     let e:u256
 }
 // ====
-// step: functionHoister
 // dialect: yul
+// step: functionHoister
 // ----
 // {
-//     let a:u256
-//     let c:u256
-//     let e:u256
+//     let a
+//     let c
+//     let e
 //     function f()
-//     { let b:u256 }
+//     { let b }
 //     function g()
-//     { let d:u256 }
+//     { let d }
 // }
diff --git a/test/libyul/yulOptimizerTests/functionHoister/nested.yul b/test/libyul/yulOptimizerTests/functionHoister/nested.yul
index 813598503..89ea5c0ff 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/nested.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/nested.yul
@@ -7,16 +7,16 @@
     }
 }
 // ====
-// step: functionHoister
 // dialect: yul
+// step: functionHoister
 // ----
 // {
-//     let a:u256
+//     let a
 //     function g()
-//     { let c:u256 }
+//     { let c }
 //     function f()
 //     {
-//         let b:u256
-//         let d:u256
+//         let b
+//         let d
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/functionHoister/single.yul b/test/libyul/yulOptimizerTests/functionHoister/single.yul
index 70ecfdb8e..6cc82e68a 100644
--- a/test/libyul/yulOptimizerTests/functionHoister/single.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/single.yul
@@ -3,11 +3,11 @@
     function f() {}
 }
 // ====
-// step: functionHoister
 // dialect: yul
+// step: functionHoister
 // ----
 // {
-//     let a:u256
+//     let a
 //     function f()
 //     { }
 // }
diff --git a/test/libyul/yulOptimizerTests/mainFunction/empty_block.yul b/test/libyul/yulOptimizerTests/mainFunction/empty_block.yul
index 09a04e1d3..741efd42b 100644
--- a/test/libyul/yulOptimizerTests/mainFunction/empty_block.yul
+++ b/test/libyul/yulOptimizerTests/mainFunction/empty_block.yul
@@ -8,18 +8,18 @@
     }
 }
 // ====
-// step: mainFunction
 // dialect: yul
+// step: mainFunction
 // ----
 // {
 //     function main()
 //     {
-//         let a:u256
+//         let a
 //         { }
 //     }
 //     function f() -> x:bool
 //     {
-//         let b:u256 := 4:u256
+//         let b := 4
 //         { }
 //         for { } f() { }
 //         { }
diff --git a/test/libyul/yulOptimizerTests/mainFunction/multi_fun_mixed.yul b/test/libyul/yulOptimizerTests/mainFunction/multi_fun_mixed.yul
index 7aaab11e5..69fb0bef0 100644
--- a/test/libyul/yulOptimizerTests/mainFunction/multi_fun_mixed.yul
+++ b/test/libyul/yulOptimizerTests/mainFunction/multi_fun_mixed.yul
@@ -6,18 +6,18 @@
     let e:u256
 }
 // ====
-// step: mainFunction
 // dialect: yul
+// step: mainFunction
 // ----
 // {
 //     function main()
 //     {
-//         let a:u256
-//         let c:u256
-//         let e:u256
+//         let a
+//         let c
+//         let e
 //     }
 //     function f()
-//     { let b:u256 }
+//     { let b }
 //     function g()
-//     { let d:u256 }
+//     { let d }
 // }
diff --git a/test/libyul/yulOptimizerTests/mainFunction/nested_fun.yul b/test/libyul/yulOptimizerTests/mainFunction/nested_fun.yul
index 61cb67233..b97bb2f4d 100644
--- a/test/libyul/yulOptimizerTests/mainFunction/nested_fun.yul
+++ b/test/libyul/yulOptimizerTests/mainFunction/nested_fun.yul
@@ -7,17 +7,17 @@
     }
 }
 // ====
-// step: mainFunction
 // dialect: yul
+// step: mainFunction
 // ----
 // {
 //     function main()
-//     { let a:u256 }
+//     { let a }
 //     function f()
 //     {
-//         let b:u256
+//         let b
 //         function g()
-//         { let c:u256 }
-//         let d:u256
+//         { let c }
+//         let d
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/mainFunction/sigle_fun.yul b/test/libyul/yulOptimizerTests/mainFunction/single_fun.yul
similarity index 87%
rename from test/libyul/yulOptimizerTests/mainFunction/sigle_fun.yul
rename to test/libyul/yulOptimizerTests/mainFunction/single_fun.yul
index 63154e8c3..1ab108f6b 100644
--- a/test/libyul/yulOptimizerTests/mainFunction/sigle_fun.yul
+++ b/test/libyul/yulOptimizerTests/mainFunction/single_fun.yul
@@ -3,12 +3,12 @@
     function f() {}
 }
 // ====
-// step: mainFunction
 // dialect: yul
+// step: mainFunction
 // ----
 // {
 //     function main()
-//     { let a:u256 }
+//     { let a }
 //     function f()
 //     { }
 // }