diff --git a/src/dbSta/test/hierclock_out.vok b/src/dbSta/test/hierclock_out.vok
index 6686b000a7..b595262518 100644
--- a/src/dbSta/test/hierclock_out.vok
+++ b/src/dbSta/test/hierclock_out.vok
@@ -61,52 +61,52 @@ module clockgen (clk_i,
  wire [3:0] counter_q;
 
  INV_X1 _28_ (.A(rst_n_i),
-    .ZN(\U1/_11_ ));
- AND2_X1 _29_ (.A1(\U1/_22_ ),
+    .ZN(_11_));
+ AND2_X1 _29_ (.A1(_22_),
     .A2(rst_n_i),
-    .ZN(\U1/_03_ ));
+    .ZN(_03_));
  OAI21_X1 _30_ (.A(rst_n_i),
     .B1(counter_q[1]),
-    .B2(\U1/counter_q [0]),
-    .ZN(\U1/_12_ ));
- AOI21_X1 _31_ (.A(\U1/_12_ ),
+    .B2(counter_q[0]),
+    .ZN(_12_));
+ AOI21_X1 _31_ (.A(_12_),
     .B1(counter_q[1]),
-    .B2(\U1/counter_q [0]),
-    .ZN(\U1/_04_ ));
- AND3_X1 _32_ (.A1(\U1/counter_q [0]),
+    .B2(counter_q[0]),
+    .ZN(_04_));
+ AND3_X1 _32_ (.A1(counter_q[0]),
     .A2(counter_q[1]),
-    .A3(\U1/counter_q [2]),
-    .ZN(\U1/_13_ ));
- AOI21_X1 _33_ (.A(\U1/counter_q [2]),
+    .A3(counter_q[2]),
+    .ZN(_13_));
+ AOI21_X1 _33_ (.A(counter_q[2]),
     .B1(counter_q[1]),
-    .B2(\U1/counter_q [0]),
-    .ZN(\U1/_14_ ));
- NOR3_X1 _34_ (.A1(\U1/_11_ ),
-    .A2(\U1/_13_ ),
-    .A3(\U1/_14_ ),
-    .ZN(\U1/_05_ ));
+    .B2(counter_q[0]),
+    .ZN(_14_));
+ NOR3_X1 _34_ (.A1(_11_),
+    .A2(_13_),
+    .A3(_14_),
+    .ZN(_05_));
  XNOR2_X1 _35_ (.A(counter_q[3]),
-    .B(\U1/_13_ ),
-    .ZN(\U1/_15_ ));
- NOR2_X1 _36_ (.A1(\U1/_11_ ),
-    .A2(\U1/_15_ ),
-    .ZN(\U1/_06_ ));
- DFF_X1 _37_ (.D(\U1/_03_ ),
+    .B(_13_),
+    .ZN(_15_));
+ NOR2_X1 _36_ (.A1(_11_),
+    .A2(_15_),
+    .ZN(_06_));
+ DFF_X1 _37_ (.D(_03_),
     .CK(clk_i),
-    .Q(\U1/counter_q [0]),
-    .QN(\U1/_22_ ));
- DFF_X1 _38_ (.D(\U1/_04_ ),
+    .Q(counter_q[0]),
+    .QN(_22_));
+ DFF_X1 _38_ (.D(_04_),
     .CK(clk_i),
     .Q(counter_q[1]),
-    .QN(\U1/_21_ ));
- DFF_X1 _39_ (.D(\U1/_05_ ),
+    .QN(_21_));
+ DFF_X1 _39_ (.D(_05_),
     .CK(clk_i),
-    .Q(\U1/counter_q [2]),
-    .QN(\U1/_20_ ));
- DFF_X1 _40_ (.D(\U1/_06_ ),
+    .Q(counter_q[2]),
+    .QN(_20_));
+ DFF_X1 _40_ (.D(_06_),
     .CK(clk_i),
     .Q(counter_q[3]),
-    .QN(\U1/_19_ ));
+    .QN(_19_));
 endmodule
 module counter (clk_i,
     rst_n_i,
@@ -124,81 +124,81 @@ module counter (clk_i,
  wire count_valid_q;
  wire [3:0] counter_q;
 
- INV_X1 _49_ (.A(\U2/_41_ ),
-    .ZN(\U2/_26_ ));
+ INV_X1 _49_ (.A(_41_),
+    .ZN(_26_));
  INV_X1 _50_ (.A(load_i),
-    .ZN(\U2/_27_ ));
- AND2_X1 _51_ (.A1(\U2/_27_ ),
+    .ZN(_27_));
+ AND2_X1 _51_ (.A1(_27_),
     .A2(rst_n_i),
-    .ZN(\U2/_12_ ));
+    .ZN(_12_));
  OAI21_X1 _52_ (.A(rst_n_i),
-    .B1(\U2/_27_ ),
+    .B1(_27_),
     .B2(load_value_i[0]),
-    .ZN(\U2/_28_ ));
- AOI21_X1 _53_ (.A(\U2/_28_ ),
-    .B1(\U2/_27_ ),
-    .B2(\U2/_26_ ),
-    .ZN(\U2/_13_ ));
+    .ZN(_28_));
+ AOI21_X1 _53_ (.A(_28_),
+    .B1(_27_),
+    .B2(_26_),
+    .ZN(_13_));
  NAND2_X1 _54_ (.A1(counter_q[0]),
     .A2(counter_q[1]),
-    .ZN(\U2/_29_ ));
+    .ZN(_29_));
  XNOR2_X1 _55_ (.A(counter_q[0]),
     .B(counter_q[1]),
-    .ZN(\U2/_30_ ));
+    .ZN(_30_));
  OAI21_X1 _56_ (.A(rst_n_i),
     .B1(load_value_i[1]),
-    .B2(\U2/_27_ ),
-    .ZN(\U2/_31_ ));
- AOI21_X1 _57_ (.A(\U2/_31_ ),
-    .B1(\U2/_30_ ),
-    .B2(\U2/_27_ ),
-    .ZN(\U2/_14_ ));
+    .B2(_27_),
+    .ZN(_31_));
+ AOI21_X1 _57_ (.A(_31_),
+    .B1(_30_),
+    .B2(_27_),
+    .ZN(_14_));
  NAND3_X1 _58_ (.A1(counter_q[0]),
     .A2(counter_q[1]),
     .A3(counter_q[2]),
-    .ZN(\U2/_32_ ));
+    .ZN(_32_));
  XOR2_X1 _59_ (.A(counter_q[2]),
-    .B(\U2/_29_ ),
-    .Z(\U2/_33_ ));
+    .B(_29_),
+    .Z(_33_));
  OAI21_X1 _60_ (.A(rst_n_i),
     .B1(load_value_i[2]),
-    .B2(\U2/_27_ ),
-    .ZN(\U2/_34_ ));
- AOI21_X1 _61_ (.A(\U2/_34_ ),
-    .B1(\U2/_33_ ),
-    .B2(\U2/_27_ ),
-    .ZN(\U2/_15_ ));
+    .B2(_27_),
+    .ZN(_34_));
+ AOI21_X1 _61_ (.A(_34_),
+    .B1(_33_),
+    .B2(_27_),
+    .ZN(_15_));
  XOR2_X1 _62_ (.A(counter_q[3]),
-    .B(\U2/_32_ ),
-    .Z(\U2/_35_ ));
+    .B(_32_),
+    .Z(_35_));
  OAI21_X1 _63_ (.A(rst_n_i),
     .B1(load_value_i[3]),
-    .B2(\U2/_27_ ),
-    .ZN(\U2/_36_ ));
- AOI21_X1 _64_ (.A(\U2/_36_ ),
-    .B1(\U2/_35_ ),
-    .B2(\U2/_27_ ),
-    .ZN(\U2/_16_ ));
- DFF_X1 _65_ (.D(\U2/_12_ ),
+    .B2(_27_),
+    .ZN(_36_));
+ AOI21_X1 _64_ (.A(_36_),
+    .B1(_35_),
+    .B2(_27_),
+    .ZN(_16_));
+ DFF_X1 _65_ (.D(_12_),
     .CK(clk_i),
     .Q(count_valid_q),
-    .QN(\U2/_42_ ));
- DFF_X1 _66_ (.D(\U2/_13_ ),
+    .QN(_42_));
+ DFF_X1 _66_ (.D(_13_),
     .CK(clk_i),
     .Q(counter_q[0]),
-    .QN(\U2/_41_ ));
- DFF_X1 _67_ (.D(\U2/_14_ ),
+    .QN(_41_));
+ DFF_X1 _67_ (.D(_14_),
     .CK(clk_i),
     .Q(counter_q[1]),
-    .QN(\U2/_40_ ));
- DFF_X1 _68_ (.D(\U2/_15_ ),
+    .QN(_40_));
+ DFF_X1 _68_ (.D(_15_),
     .CK(clk_i),
     .Q(counter_q[2]),
-    .QN(\U2/_39_ ));
- DFF_X1 _69_ (.D(\U2/_16_ ),
+    .QN(_39_));
+ DFF_X1 _69_ (.D(_16_),
     .CK(clk_i),
     .Q(counter_q[3]),
-    .QN(\U2/_38_ ));
+    .QN(_38_));
 endmodule
 module counter_U3 (clk_i,
     rst_n_i,
@@ -216,79 +216,79 @@ module counter_U3 (clk_i,
  wire count_valid_q;
  wire [3:0] counter_q;
 
- INV_X1 _49_ (.A(\U3/_41_ ),
-    .ZN(\U3/_26_ ));
+ INV_X1 _49_ (.A(_41_),
+    .ZN(_26_));
  INV_X1 _50_ (.A(load_i),
-    .ZN(\U3/_27_ ));
- AND2_X1 _51_ (.A1(\U3/_27_ ),
+    .ZN(_27_));
+ AND2_X1 _51_ (.A1(_27_),
     .A2(rst_n_i),
-    .ZN(\U3/_12_ ));
+    .ZN(_12_));
  OAI21_X1 _52_ (.A(rst_n_i),
-    .B1(\U3/_27_ ),
+    .B1(_27_),
     .B2(load_value_i[0]),
-    .ZN(\U3/_28_ ));
- AOI21_X1 _53_ (.A(\U3/_28_ ),
-    .B1(\U3/_27_ ),
-    .B2(\U3/_26_ ),
-    .ZN(\U3/_13_ ));
+    .ZN(_28_));
+ AOI21_X1 _53_ (.A(_28_),
+    .B1(_27_),
+    .B2(_26_),
+    .ZN(_13_));
  NAND2_X1 _54_ (.A1(counter_q[0]),
     .A2(counter_q[1]),
-    .ZN(\U3/_29_ ));
+    .ZN(_29_));
  XNOR2_X1 _55_ (.A(counter_q[0]),
     .B(counter_q[1]),
-    .ZN(\U3/_30_ ));
+    .ZN(_30_));
  OAI21_X1 _56_ (.A(rst_n_i),
     .B1(load_value_i[1]),
-    .B2(\U3/_27_ ),
-    .ZN(\U3/_31_ ));
- AOI21_X1 _57_ (.A(\U3/_31_ ),
-    .B1(\U3/_30_ ),
-    .B2(\U3/_27_ ),
-    .ZN(\U3/_14_ ));
+    .B2(_27_),
+    .ZN(_31_));
+ AOI21_X1 _57_ (.A(_31_),
+    .B1(_30_),
+    .B2(_27_),
+    .ZN(_14_));
  NAND3_X1 _58_ (.A1(counter_q[0]),
     .A2(counter_q[1]),
     .A3(counter_q[2]),
-    .ZN(\U3/_32_ ));
+    .ZN(_32_));
  XOR2_X1 _59_ (.A(counter_q[2]),
-    .B(\U3/_29_ ),
-    .Z(\U3/_33_ ));
+    .B(_29_),
+    .Z(_33_));
  OAI21_X1 _60_ (.A(rst_n_i),
     .B1(load_value_i[2]),
-    .B2(\U3/_27_ ),
-    .ZN(\U3/_34_ ));
- AOI21_X1 _61_ (.A(\U3/_34_ ),
-    .B1(\U3/_33_ ),
-    .B2(\U3/_27_ ),
-    .ZN(\U3/_15_ ));
+    .B2(_27_),
+    .ZN(_34_));
+ AOI21_X1 _61_ (.A(_34_),
+    .B1(_33_),
+    .B2(_27_),
+    .ZN(_15_));
  XOR2_X1 _62_ (.A(counter_q[3]),
-    .B(\U3/_32_ ),
-    .Z(\U3/_35_ ));
+    .B(_32_),
+    .Z(_35_));
  OAI21_X1 _63_ (.A(rst_n_i),
     .B1(load_value_i[3]),
-    .B2(\U3/_27_ ),
-    .ZN(\U3/_36_ ));
- AOI21_X1 _64_ (.A(\U3/_36_ ),
-    .B1(\U3/_35_ ),
-    .B2(\U3/_27_ ),
-    .ZN(\U3/_16_ ));
- DFF_X1 _65_ (.D(\U3/_12_ ),
+    .B2(_27_),
+    .ZN(_36_));
+ AOI21_X1 _64_ (.A(_36_),
+    .B1(_35_),
+    .B2(_27_),
+    .ZN(_16_));
+ DFF_X1 _65_ (.D(_12_),
     .CK(clk_i),
     .Q(count_valid_q),
-    .QN(\U3/_42_ ));
- DFF_X1 _66_ (.D(\U3/_13_ ),
+    .QN(_42_));
+ DFF_X1 _66_ (.D(_13_),
     .CK(clk_i),
     .Q(counter_q[0]),
-    .QN(\U3/_41_ ));
- DFF_X1 _67_ (.D(\U3/_14_ ),
+    .QN(_41_));
+ DFF_X1 _67_ (.D(_14_),
     .CK(clk_i),
     .Q(counter_q[1]),
-    .QN(\U3/_40_ ));
- DFF_X1 _68_ (.D(\U3/_15_ ),
+    .QN(_40_));
+ DFF_X1 _68_ (.D(_15_),
     .CK(clk_i),
     .Q(counter_q[2]),
-    .QN(\U3/_39_ ));
- DFF_X1 _69_ (.D(\U3/_16_ ),
+    .QN(_39_));
+ DFF_X1 _69_ (.D(_16_),
     .CK(clk_i),
     .Q(counter_q[3]),
-    .QN(\U3/_38_ ));
+    .QN(_38_));
 endmodule