diff --git a/sdc-plugin/tests/counter/counter.golden.sdc b/sdc-plugin/tests/counter/counter.golden.sdc
index 0ab3ac8..852ce4f 100644
--- a/sdc-plugin/tests/counter/counter.golden.sdc
+++ b/sdc-plugin/tests/counter/counter.golden.sdc
@@ -1,5 +1,5 @@
-create_clock -period 10 -name clk_int_1 -waveform {0 5} clk_int_1 clk_int_2 ibuf_out middle_inst_1.clk middle_inst_1.clk_int middle_inst_2.clk middle_inst_2.clk_int middle_inst_3.clk middle_inst_3.clk_int
-create_clock -period 10 -name clk -waveform {0 5} clk clk2
+create_clock -period 10 -waveform {0 5} clk_int_1
+create_clock -period 10 -waveform {0 5} clk
 create_clock -period 10 -waveform {1 6} ibuf_proxy_out
-create_clock -period 10 -waveform {2 7} $auto$clkbufmap.cc:247:execute$1918
-create_clock -period 10 -waveform {1 6} $auto$clkbufmap.cc:247:execute$1920
+create_clock -period 10 -waveform {2 7} \$auto\$clkbufmap.cc:247:execute\$1918
+create_clock -period 10 -waveform {1 6} \$auto\$clkbufmap.cc:247:execute\$1920
diff --git a/sdc-plugin/tests/pll/pll.golden.sdc b/sdc-plugin/tests/pll/pll.golden.sdc
index 72d68b1..a37f828 100644
--- a/sdc-plugin/tests/pll/pll.golden.sdc
+++ b/sdc-plugin/tests/pll/pll.golden.sdc
@@ -1,7 +1,7 @@
 create_clock -period 10 -waveform {0 5} clk
-create_clock -period 10 -waveform {0 5} $auto$clkbufmap.cc:247:execute$1829
-create_clock -period 2.5 -waveform {0 1.25} $auto$clkbufmap.cc:247:execute$1831
-create_clock -period 10 -waveform {1 6} $auto$clkbufmap.cc:247:execute$1827
+create_clock -period 10 -waveform {1 6} \$auto\$clkbufmap.cc:247:execute\$1827
+create_clock -period 10 -waveform {2 7} \$techmap1716\FDCE_0.C
+create_clock -period 10 -waveform {0 5} \$auto\$clkbufmap.cc:247:execute\$1829
+create_clock -period 2.5 -waveform {0 1.25} \$auto\$clkbufmap.cc:247:execute\$1831
 create_clock -period 10 -waveform {1 6} main_clkout0
 create_clock -period 2.5 -waveform {1 2.25} main_clkout1
-create_clock -period 10 -waveform {2 7} $techmap1716\FDCE_0.C