diff --git a/Cargo.lock b/Cargo.lock
index 17ef0f4..598d317 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -300,7 +300,7 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 [[package]]
 name = "fayalite"
 version = "0.3.0"
-source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#3771cea78e34fd28af6ef4a76c1013eb2406de1d"
+source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#e3a2ccd41c89eb659dde86d3d7f0581a17d45509"
 dependencies = [
  "bitvec",
  "blake3",
@@ -325,7 +325,7 @@ dependencies = [
 [[package]]
 name = "fayalite-proc-macros"
 version = "0.3.0"
-source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#3771cea78e34fd28af6ef4a76c1013eb2406de1d"
+source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#e3a2ccd41c89eb659dde86d3d7f0581a17d45509"
 dependencies = [
  "fayalite-proc-macros-impl",
 ]
@@ -333,7 +333,7 @@ dependencies = [
 [[package]]
 name = "fayalite-proc-macros-impl"
 version = "0.3.0"
-source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#3771cea78e34fd28af6ef4a76c1013eb2406de1d"
+source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#e3a2ccd41c89eb659dde86d3d7f0581a17d45509"
 dependencies = [
  "base16ct",
  "num-bigint",
@@ -348,7 +348,7 @@ dependencies = [
 [[package]]
 name = "fayalite-visit-gen"
 version = "0.3.0"
-source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#3771cea78e34fd28af6ef4a76c1013eb2406de1d"
+source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#e3a2ccd41c89eb659dde86d3d7f0581a17d45509"
 dependencies = [
  "indexmap",
  "prettyplease",
diff --git a/crates/cpu/tests/expected/reg_alloc.vcd b/crates/cpu/tests/expected/reg_alloc.vcd
index ea43839..1012150 100644
--- a/crates/cpu/tests/expected/reg_alloc.vcd
+++ b/crates/cpu/tests/expected/reg_alloc.vcd
@@ -6,7 +6,7 @@ $var wire 1 " rst $end
 $upscope $end
 $scope struct fetch_decode_interface $end
 $scope struct decoded_insns $end
-$scope struct [0] $end
+$scope struct \[0] $end
 $scope struct data $end
 $var string 1 # \$tag $end
 $scope struct HdlSome $end
@@ -147,7 +147,7 @@ $upscope $end
 $upscope $end
 $var wire 1 g ready $end
 $upscope $end
-$scope struct [1] $end
+$scope struct \[1] $end
 $scope struct data $end
 $var string 1 h \$tag $end
 $scope struct HdlSome $end
@@ -302,21 +302,21 @@ $var wire 1 Q" ready $end
 $upscope $end
 $upscope $end
 $scope struct available_units $end
-$scope struct [0] $end
+$scope struct \[0] $end
 $var wire 1 R" \[0] $end
 $upscope $end
-$scope struct [1] $end
+$scope struct \[1] $end
 $var wire 1 S" \[0] $end
 $upscope $end
 $upscope $end
 $scope struct selected_unit_nums $end
-$scope struct [0] $end
+$scope struct \[0] $end
 $var string 1 T" \$tag $end
 $scope struct HdlSome $end
 $var wire 1 U" value $end
 $upscope $end
 $upscope $end
-$scope struct [1] $end
+$scope struct \[1] $end
 $var string 1 V" \$tag $end
 $scope struct HdlSome $end
 $var wire 1 W" value $end
@@ -336,17 +336,17 @@ $upscope $end
 $scope struct unit_num $end
 $var wire 1 \" value $end
 $upscope $end
-$var string 1 ]" unit_kind $end
-$scope struct available_units_for_kind $end
+$var string 1 ]" unit_kind_2 $end
+$scope struct available_units_for_kind_2 $end
 $var wire 1 ^" \[0] $end
 $upscope $end
-$scope struct selected_unit_leaf $end
+$scope struct selected_unit_leaf_2 $end
 $var string 1 _" \$tag $end
 $scope struct HdlSome $end
 $var wire 1 `" value $end
 $upscope $end
 $upscope $end
-$scope struct unit_num $end
+$scope struct unit_num_2 $end
 $var wire 1 a" value $end
 $upscope $end
 $scope struct unit_0 $end
@@ -367,7 +367,7 @@ $var wire 1 Q# clk $end
 $var wire 1 R# rst $end
 $upscope $end
 $scope struct free_in $end
-$scope struct [0] $end
+$scope struct \[0] $end
 $scope struct data $end
 $var string 1 S# \$tag $end
 $var wire 4 T# HdlSome $end
@@ -376,7 +376,7 @@ $var wire 1 U# ready $end
 $upscope $end
 $upscope $end
 $scope struct alloc_out $end
-$scope struct [0] $end
+$scope struct \[0] $end
 $scope struct data $end
 $var string 1 V# \$tag $end
 $var wire 4 W# HdlSome $end
@@ -391,7 +391,7 @@ $var wire 1 f" clk $end
 $var wire 1 g" rst $end
 $upscope $end
 $scope struct free_in $end
-$scope struct [0] $end
+$scope struct \[0] $end
 $scope struct data $end
 $var string 1 h" \$tag $end
 $var wire 4 i" HdlSome $end
@@ -400,7 +400,7 @@ $var wire 1 j" ready $end
 $upscope $end
 $upscope $end
 $scope struct alloc_out $end
-$scope struct [0] $end
+$scope struct \[0] $end
 $scope struct data $end
 $var string 1 k" \$tag $end
 $var wire 4 l" HdlSome $end
@@ -505,7 +505,7 @@ $var wire 1 M# reduced_count_overflowed_0_16 $end
 $scope struct reduced_alloc_nums_0_16 $end
 $var wire 4 N# \[0] $end
 $upscope $end
-$scope struct firing_data $end
+$scope struct firing_data_2 $end
 $var string 1 O# \$tag $end
 $var wire 4 P# HdlSome $end
 $upscope $end