diff --git a/cranelift/filetests/isa/intel/abi64.cton b/cranelift/filetests/isa/intel/abi64.cton
index ec943203ee..d56a31d479 100644
--- a/cranelift/filetests/isa/intel/abi64.cton
+++ b/cranelift/filetests/isa/intel/abi64.cton
@@ -21,7 +21,7 @@ ebb0:
 
 function %pass_stack_int64(i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64 vmctx) spiderwasm {
     sig0 = (i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64 vmctx) spiderwasm
-    fn0 = sig0 #00000000
+    fn0 = sig0 u0:0
 
 ebb0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v8: i64, v9: i64, v10: i64, v11: i64, v12: i64, v13: i64, v14: i64, v15: i64, v16: i64, v17: i64, v18: i64, v19: i64, v20: i64):
     call fn0(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
diff --git a/cranelift/filetests/isa/intel/legalize-memory.cton b/cranelift/filetests/isa/intel/legalize-memory.cton
index b9e8e99696..0257c7001c 100644
--- a/cranelift/filetests/isa/intel/legalize-memory.cton
+++ b/cranelift/filetests/isa/intel/legalize-memory.cton
@@ -31,7 +31,7 @@ ebb1(v1: i64):
 
 function %sym() -> i64 {
     gv0 = globalsym %something
-    gv1 = globalsym #d0bad180d0b5d182d0bed0bd
+    gv1 = globalsym u123:456
 
 ebb1:
     v0 = global_addr.i64 gv0
diff --git a/cranelift/filetests/parser/memory.cton b/cranelift/filetests/parser/memory.cton
index 6fa594c4c1..0b137335c9 100644
--- a/cranelift/filetests/parser/memory.cton
+++ b/cranelift/filetests/parser/memory.cton
@@ -39,8 +39,8 @@ ebb0:
 function %sym() -> i32 {
     gv0 = globalsym %something
     ; check: $gv0 = globalsym %something
-    gv1 = globalsym #d0bad180d0b5d182d0bed0bd
-    ; check: $gv1 = globalsym #d0bad180d0b5d182d0bed0bd
+    gv1 = globalsym u8:9
+    ; check: $gv1 = globalsym u8:9
 ebb0:
     v0 = global_addr.i32 gv0
     ; check: $v0 = global_addr.i32 $gv0
diff --git a/cranelift/filetests/regalloc/iterate.cton b/cranelift/filetests/regalloc/iterate.cton
index 6f7e6547fd..2c585e941d 100644
--- a/cranelift/filetests/regalloc/iterate.cton
+++ b/cranelift/filetests/regalloc/iterate.cton
@@ -2,7 +2,7 @@ test regalloc
 set is_64bit
 isa intel haswell
 
-function #00000009(i64 [%rdi], f32 [%xmm0], f64 [%xmm1], i32 [%rsi], i32 [%rdx], i64 vmctx [%r14]) -> i64 [%rax] spiderwasm {
+function u0:9(i64 [%rdi], f32 [%xmm0], f64 [%xmm1], i32 [%rsi], i32 [%rdx], i64 vmctx [%r14]) -> i64 [%rax] spiderwasm {
 ebb0(v0: i64, v1: f32, v2: f64, v3: i32, v4: i32, v5: i64):
     v32 = iconst.i32 0
     v6 = bitcast.f32 v32
@@ -104,7 +104,7 @@ ebb1(v31: i64):
     return v31
 }
 
-function #0000001a(i64 vmctx [%r14]) -> i64 [%rax] spiderwasm {
+function u0:26(i64 vmctx [%r14]) -> i64 [%rax] spiderwasm {
     gv0 = vmctx+48
     sig0 = (i32 [%rdi], i64 [%rsi], i64 vmctx [%r14], i64 sigid [%rbx]) -> i64 [%rax] spiderwasm