diff --git a/src/test/ref/c64dtv-gfxexplorer.log b/src/test/ref/c64dtv-gfxexplorer.log
index 5929b8e00..9fcc27783 100644
--- a/src/test/ref/c64dtv-gfxexplorer.log
+++ b/src/test/ref/c64dtv-gfxexplorer.log
@@ -30003,18 +30003,18 @@ FINAL SYMBOL TABLE
 (byte) render_preset_name::idx#1 reg byte a 202.0
 (byte) render_preset_name::idx#10 reg byte a 11.363636363636362
 (byte*) render_preset_name::name
-(const byte*) render_preset_name::name#1 = (string) "Standard Charset              "
-(const byte*) render_preset_name::name#10 = (string) "Sixs Fred 2                   "
-(const byte*) render_preset_name::name#11 = (string) "8bpp Pixel Cell               "
+(const byte*) render_preset_name::name#1 name_1 = (string) "Standard Charset              "
+(const byte*) render_preset_name::name#10 name_10 = (string) "Sixs Fred 2                   "
+(const byte*) render_preset_name::name#11 name_11 = (string) "8bpp Pixel Cell               "
 (byte*) render_preset_name::name#13 name zp[2]:6 2.0
-(const byte*) render_preset_name::name#2 = (string) "Extended Color Charset        "
-(const byte*) render_preset_name::name#3 = (string) "Standard Bitmap               "
-(const byte*) render_preset_name::name#4 = (string) "Multicolor Bitmap             "
-(const byte*) render_preset_name::name#5 = (string) "Hicolor Charset               "
-(const byte*) render_preset_name::name#6 = (string) "Hicolor Extended Color Charset"
-(const byte*) render_preset_name::name#7 = (string) "Twoplane Bitmap               "
-(const byte*) render_preset_name::name#8 = (string) "Chunky 8bpp                   "
-(const byte*) render_preset_name::name#9 = (string) "Sixs Fred                     "
+(const byte*) render_preset_name::name#2 name_2 = (string) "Extended Color Charset        "
+(const byte*) render_preset_name::name#3 name_3 = (string) "Standard Bitmap               "
+(const byte*) render_preset_name::name#4 name_4 = (string) "Multicolor Bitmap             "
+(const byte*) render_preset_name::name#5 name_5 = (string) "Hicolor Charset               "
+(const byte*) render_preset_name::name#6 name_6 = (string) "Hicolor Extended Color Charset"
+(const byte*) render_preset_name::name#7 name_7 = (string) "Twoplane Bitmap               "
+(const byte*) render_preset_name::name#8 name_8 = (string) "Chunky 8bpp                   "
+(const byte*) render_preset_name::name#9 name_9 = (string) "Sixs Fred                     "
 
 reg byte x [ gfx_mode::dtv_control#12 gfx_mode::dtv_control#6 gfx_mode::dtv_control#13 gfx_mode::dtv_control#5 gfx_mode::dtv_control#11 gfx_mode::dtv_control#4 gfx_mode::dtv_control#10 gfx_mode::dtv_control#3 gfx_mode::dtv_control#15 gfx_mode::dtv_control#14 gfx_mode::dtv_control#2 ]
 reg byte x [ gfx_mode::vic_control#4 gfx_mode::vic_control#2 gfx_mode::vic_control#5 ]
diff --git a/src/test/ref/c64dtv-gfxexplorer.sym b/src/test/ref/c64dtv-gfxexplorer.sym
index 072c88824..74ffd9213 100644
--- a/src/test/ref/c64dtv-gfxexplorer.sym
+++ b/src/test/ref/c64dtv-gfxexplorer.sym
@@ -1185,18 +1185,18 @@
 (byte) render_preset_name::idx#1 reg byte a 202.0
 (byte) render_preset_name::idx#10 reg byte a 11.363636363636362
 (byte*) render_preset_name::name
-(const byte*) render_preset_name::name#1 = (string) "Standard Charset              "
-(const byte*) render_preset_name::name#10 = (string) "Sixs Fred 2                   "
-(const byte*) render_preset_name::name#11 = (string) "8bpp Pixel Cell               "
+(const byte*) render_preset_name::name#1 name_1 = (string) "Standard Charset              "
+(const byte*) render_preset_name::name#10 name_10 = (string) "Sixs Fred 2                   "
+(const byte*) render_preset_name::name#11 name_11 = (string) "8bpp Pixel Cell               "
 (byte*) render_preset_name::name#13 name zp[2]:6 2.0
-(const byte*) render_preset_name::name#2 = (string) "Extended Color Charset        "
-(const byte*) render_preset_name::name#3 = (string) "Standard Bitmap               "
-(const byte*) render_preset_name::name#4 = (string) "Multicolor Bitmap             "
-(const byte*) render_preset_name::name#5 = (string) "Hicolor Charset               "
-(const byte*) render_preset_name::name#6 = (string) "Hicolor Extended Color Charset"
-(const byte*) render_preset_name::name#7 = (string) "Twoplane Bitmap               "
-(const byte*) render_preset_name::name#8 = (string) "Chunky 8bpp                   "
-(const byte*) render_preset_name::name#9 = (string) "Sixs Fred                     "
+(const byte*) render_preset_name::name#2 name_2 = (string) "Extended Color Charset        "
+(const byte*) render_preset_name::name#3 name_3 = (string) "Standard Bitmap               "
+(const byte*) render_preset_name::name#4 name_4 = (string) "Multicolor Bitmap             "
+(const byte*) render_preset_name::name#5 name_5 = (string) "Hicolor Charset               "
+(const byte*) render_preset_name::name#6 name_6 = (string) "Hicolor Extended Color Charset"
+(const byte*) render_preset_name::name#7 name_7 = (string) "Twoplane Bitmap               "
+(const byte*) render_preset_name::name#8 name_8 = (string) "Chunky 8bpp                   "
+(const byte*) render_preset_name::name#9 name_9 = (string) "Sixs Fred                     "
 
 reg byte x [ gfx_mode::dtv_control#12 gfx_mode::dtv_control#6 gfx_mode::dtv_control#13 gfx_mode::dtv_control#5 gfx_mode::dtv_control#11 gfx_mode::dtv_control#4 gfx_mode::dtv_control#10 gfx_mode::dtv_control#3 gfx_mode::dtv_control#15 gfx_mode::dtv_control#14 gfx_mode::dtv_control#2 ]
 reg byte x [ gfx_mode::vic_control#4 gfx_mode::vic_control#2 gfx_mode::vic_control#5 ]
diff --git a/src/test/ref/inline-string-2.log b/src/test/ref/inline-string-2.log
index 25ad73007..17b0feb04 100644
--- a/src/test/ref/inline-string-2.log
+++ b/src/test/ref/inline-string-2.log
@@ -745,8 +745,8 @@ FINAL SYMBOL TABLE
 (byte) print_msg::idx
 (byte) print_msg::idx#2 reg byte x 2.0
 (byte*) print_msg::msg
-(const byte*) print_msg::msg#1 = (string) "Hello "
-(const byte*) print_msg::msg#2 = (string) "World!"
+(const byte*) print_msg::msg#1 msg_1 = (string) "Hello "
+(const byte*) print_msg::msg#2 msg_2 = (string) "World!"
 (byte*) print_msg::msg#3 msg zp[2]:4 2.0
 (byte*) screen
 (byte*) screen#14 screen zp[2]:2 4.625
diff --git a/src/test/ref/inline-string-2.sym b/src/test/ref/inline-string-2.sym
index bf477562e..18068b226 100644
--- a/src/test/ref/inline-string-2.sym
+++ b/src/test/ref/inline-string-2.sym
@@ -19,8 +19,8 @@
 (byte) print_msg::idx
 (byte) print_msg::idx#2 reg byte x 2.0
 (byte*) print_msg::msg
-(const byte*) print_msg::msg#1 = (string) "Hello "
-(const byte*) print_msg::msg#2 = (string) "World!"
+(const byte*) print_msg::msg#1 msg_1 = (string) "Hello "
+(const byte*) print_msg::msg#2 msg_2 = (string) "World!"
 (byte*) print_msg::msg#3 msg zp[2]:4 2.0
 (byte*) screen
 (byte*) screen#14 screen zp[2]:2 4.625
diff --git a/src/test/ref/memcpy-1.asm b/src/test/ref/memcpy-1.asm
index ea1609a13..4c78460ce 100644
--- a/src/test/ref/memcpy-1.asm
+++ b/src/test/ref/memcpy-1.asm
@@ -37,9 +37,9 @@ main: {
     sta.z sc2
     lda #>SCREEN+$28
     sta.z sc2+1
-    lda #<reigns_0
+    lda #<reigns_1
     sta.z reigns
-    lda #>reigns_0
+    lda #>reigns_1
     sta.z reigns+1
   __b2:
     ldy #0
@@ -85,7 +85,7 @@ main: {
     rts
     __8: .text "rules"
     .byte 0
-    reigns_0: .text "reigns"
+    reigns_1: .text "reigns"
     .byte 0
 }
 // Copy block of memory (forwards)
diff --git a/src/test/ref/memcpy-1.log b/src/test/ref/memcpy-1.log
index 555e80f77..1456e4815 100644
--- a/src/test/ref/memcpy-1.log
+++ b/src/test/ref/memcpy-1.log
@@ -610,9 +610,9 @@ main: {
     lda #>SCREEN+$28
     sta.z sc2+1
     // [11] phi (byte*) main::reigns#2 = (const byte*) main::reigns#0 [phi:main::@1->main::@2#2] -- pbuz1=pbuc1 
-    lda #<reigns_0
+    lda #<reigns_1
     sta.z reigns
-    lda #>reigns_0
+    lda #>reigns_1
     sta.z reigns+1
     jmp __b2
     // [11] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
@@ -699,7 +699,7 @@ main: {
     rts
     __8: .text "rules"
     .byte 0
-    reigns_0: .text "reigns"
+    reigns_1: .text "reigns"
     .byte 0
 }
   // memcpy
@@ -909,9 +909,9 @@ main: {
     lda #>SCREEN+$28
     sta.z sc2+1
     // [11] phi (byte*) main::reigns#2 = (const byte*) main::reigns#0 [phi:main::@1->main::@2#2] -- pbuz1=pbuc1 
-    lda #<reigns_0
+    lda #<reigns_1
     sta.z reigns
-    lda #>reigns_0
+    lda #>reigns_1
     sta.z reigns+1
     jmp __b2
     // [11] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
@@ -997,7 +997,7 @@ main: {
     rts
     __8: .text "rules"
     .byte 0
-    reigns_0: .text "reigns"
+    reigns_1: .text "reigns"
     .byte 0
 }
   // memcpy
@@ -1136,7 +1136,7 @@ FINAL SYMBOL TABLE
 (byte) main::i1#1 reg byte x 16.5
 (byte) main::i1#2 reg byte x 5.5
 (byte*) main::reigns
-(const byte*) main::reigns#0 = (string) "reigns"
+(const byte*) main::reigns#0 reigns_1 = (string) "reigns"
 (byte*) main::reigns#1 reigns zp[2]:8 7.333333333333333
 (byte*) main::reigns#2 reigns zp[2]:8 11.0
 (byte*) main::sc
@@ -1249,9 +1249,9 @@ main: {
     lda #>SCREEN+$28
     sta.z sc2+1
     // [11] phi (byte*) main::reigns#2 = (const byte*) main::reigns#0 [phi:main::@1->main::@2#2] -- pbuz1=pbuc1 
-    lda #<reigns_0
+    lda #<reigns_1
     sta.z reigns
-    lda #>reigns_0
+    lda #>reigns_1
     sta.z reigns+1
     // [11] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
     // [11] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@2->main::@2#0] -- register_copy 
@@ -1329,7 +1329,7 @@ main: {
     rts
     __8: .text "rules"
     .byte 0
-    reigns_0: .text "reigns"
+    reigns_1: .text "reigns"
     .byte 0
 }
   // memcpy
diff --git a/src/test/ref/memcpy-1.sym b/src/test/ref/memcpy-1.sym
index 92f0d45fa..19d25ac53 100644
--- a/src/test/ref/memcpy-1.sym
+++ b/src/test/ref/memcpy-1.sym
@@ -20,7 +20,7 @@
 (byte) main::i1#1 reg byte x 16.5
 (byte) main::i1#2 reg byte x 5.5
 (byte*) main::reigns
-(const byte*) main::reigns#0 = (string) "reigns"
+(const byte*) main::reigns#0 reigns_1 = (string) "reigns"
 (byte*) main::reigns#1 reigns zp[2]:8 7.333333333333333
 (byte*) main::reigns#2 reigns zp[2]:8 11.0
 (byte*) main::sc
diff --git a/src/test/ref/test-comparisons-sword.log b/src/test/ref/test-comparisons-sword.log
index bf7254407..0fcfc6d68 100644
--- a/src/test/ref/test-comparisons-sword.log
+++ b/src/test/ref/test-comparisons-sword.log
@@ -4375,12 +4375,12 @@ FINAL SYMBOL TABLE
 (byte) compare::op
 (byte) compare::op#0 reg byte x 168.8333333333334
 (byte*) compare::ops
-(const byte*) compare::ops#1 = (string) "!="
-(const byte*) compare::ops#2 = (string) "=="
-(const byte*) compare::ops#3 = (string) ">="
-(const byte*) compare::ops#4 = (string) "> "
-(const byte*) compare::ops#5 = (string) "<="
-(const byte*) compare::ops#6 = (string) "< "
+(const byte*) compare::ops#1 ops_1 = (string) "!="
+(const byte*) compare::ops#2 ops_2 = (string) "=="
+(const byte*) compare::ops#3 ops_3 = (string) ">="
+(const byte*) compare::ops#4 ops_4 = (string) "> "
+(const byte*) compare::ops#5 ops_5 = (string) "<="
+(const byte*) compare::ops#6 ops_6 = (string) "< "
 (byte*) compare::ops#7 ops zp[2]:5 0.6666666666666666
 (byte) compare::r
 (byte) compare::r#10 r zp[1]:7 1.9999999999999996
diff --git a/src/test/ref/test-comparisons-sword.sym b/src/test/ref/test-comparisons-sword.sym
index 9358c0743..a0f663a16 100644
--- a/src/test/ref/test-comparisons-sword.sym
+++ b/src/test/ref/test-comparisons-sword.sym
@@ -45,12 +45,12 @@
 (byte) compare::op
 (byte) compare::op#0 reg byte x 168.8333333333334
 (byte*) compare::ops
-(const byte*) compare::ops#1 = (string) "!="
-(const byte*) compare::ops#2 = (string) "=="
-(const byte*) compare::ops#3 = (string) ">="
-(const byte*) compare::ops#4 = (string) "> "
-(const byte*) compare::ops#5 = (string) "<="
-(const byte*) compare::ops#6 = (string) "< "
+(const byte*) compare::ops#1 ops_1 = (string) "!="
+(const byte*) compare::ops#2 ops_2 = (string) "=="
+(const byte*) compare::ops#3 ops_3 = (string) ">="
+(const byte*) compare::ops#4 ops_4 = (string) "> "
+(const byte*) compare::ops#5 ops_5 = (string) "<="
+(const byte*) compare::ops#6 ops_6 = (string) "< "
 (byte*) compare::ops#7 ops zp[2]:5 0.6666666666666666
 (byte) compare::r
 (byte) compare::r#10 r zp[1]:7 1.9999999999999996
diff --git a/src/test/ref/test-comparisons-word.log b/src/test/ref/test-comparisons-word.log
index 6239c10b7..2f551f18f 100644
--- a/src/test/ref/test-comparisons-word.log
+++ b/src/test/ref/test-comparisons-word.log
@@ -4083,12 +4083,12 @@ FINAL SYMBOL TABLE
 (byte) compare::op
 (byte) compare::op#0 reg byte x 168.8333333333334
 (byte*) compare::ops
-(const byte*) compare::ops#1 = (string) "!="
-(const byte*) compare::ops#2 = (string) "=="
-(const byte*) compare::ops#3 = (string) ">="
-(const byte*) compare::ops#4 = (string) "> "
-(const byte*) compare::ops#5 = (string) "<="
-(const byte*) compare::ops#6 = (string) "< "
+(const byte*) compare::ops#1 ops_1 = (string) "!="
+(const byte*) compare::ops#2 ops_2 = (string) "=="
+(const byte*) compare::ops#3 ops_3 = (string) ">="
+(const byte*) compare::ops#4 ops_4 = (string) "> "
+(const byte*) compare::ops#5 ops_5 = (string) "<="
+(const byte*) compare::ops#6 ops_6 = (string) "< "
 (byte*) compare::ops#7 ops zp[2]:5 0.6666666666666666
 (byte) compare::r
 (byte) compare::r#10 r zp[1]:7 1.9999999999999996
diff --git a/src/test/ref/test-comparisons-word.sym b/src/test/ref/test-comparisons-word.sym
index 5bff2749b..697611a98 100644
--- a/src/test/ref/test-comparisons-word.sym
+++ b/src/test/ref/test-comparisons-word.sym
@@ -40,12 +40,12 @@
 (byte) compare::op
 (byte) compare::op#0 reg byte x 168.8333333333334
 (byte*) compare::ops
-(const byte*) compare::ops#1 = (string) "!="
-(const byte*) compare::ops#2 = (string) "=="
-(const byte*) compare::ops#3 = (string) ">="
-(const byte*) compare::ops#4 = (string) "> "
-(const byte*) compare::ops#5 = (string) "<="
-(const byte*) compare::ops#6 = (string) "< "
+(const byte*) compare::ops#1 ops_1 = (string) "!="
+(const byte*) compare::ops#2 ops_2 = (string) "=="
+(const byte*) compare::ops#3 ops_3 = (string) ">="
+(const byte*) compare::ops#4 ops_4 = (string) "> "
+(const byte*) compare::ops#5 ops_5 = (string) "<="
+(const byte*) compare::ops#6 ops_6 = (string) "< "
 (byte*) compare::ops#7 ops zp[2]:5 0.6666666666666666
 (byte) compare::r
 (byte) compare::r#10 r zp[1]:7 1.9999999999999996