diff --git a/compiler/test_mono/generated/closure_in_list.txt b/compiler/test_mono/generated/closure_in_list.txt
index a4df74e7f6..9fa9aaeae9 100644
--- a/compiler/test_mono/generated/closure_in_list.txt
+++ b/compiler/test_mono/generated/closure_in_list.txt
@@ -4,8 +4,8 @@ procedure List.7 (#Attr.2):
 
 procedure Test.1 (Test.5):
     let Test.2 : Builtin(Int(I64)) = 41i64;
-    let Test.11 : LambdaSet([( #UserApp.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }) = Struct {Test.2};
-    let Test.10 : Builtin(List(LambdaSet([( #UserApp.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }))) = Array [Test.11];
+    let Test.11 : LambdaSet([( Test.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }) = Struct {Test.2};
+    let Test.10 : Builtin(List(LambdaSet([( Test.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }))) = Array [Test.11];
     ret Test.10;
 
 procedure Test.3 (Test.9, #Attr.12):
@@ -14,7 +14,7 @@ procedure Test.3 (Test.9, #Attr.12):
 
 procedure Test.0 ():
     let Test.8 : Struct([]) = Struct {};
-    let Test.4 : Builtin(List(LambdaSet([( #UserApp.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }))) = CallByName Test.1 Test.8;
+    let Test.4 : Builtin(List(LambdaSet([( Test.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }))) = CallByName Test.1 Test.8;
     let Test.6 : Builtin(Int(U64)) = CallByName List.7 Test.4;
     dec Test.4;
     ret Test.6;
diff --git a/compiler/test_mono/generated/empty_list_of_function_type.txt b/compiler/test_mono/generated/empty_list_of_function_type.txt
index 5023ac42e8..e68e0bf85d 100644
--- a/compiler/test_mono/generated/empty_list_of_function_type.txt
+++ b/compiler/test_mono/generated/empty_list_of_function_type.txt
@@ -2,12 +2,12 @@ procedure List.3 (#Attr.2, #Attr.3):
     let Test.20 : Builtin(Int(U64)) = lowlevel ListLen #Attr.2;
     let Test.17 : Builtin(Bool) = lowlevel NumLt #Attr.3 Test.20;
     if Test.17 then
-        let Test.19 : LambdaSet([( #UserApp.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = lowlevel ListGetUnsafe #Attr.2 #Attr.3;
-        let Test.18 : Union(NonRecursive([[Struct([])], [LambdaSet([( #UserApp.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) })]])) = Ok Test.19;
+        let Test.19 : LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = lowlevel ListGetUnsafe #Attr.2 #Attr.3;
+        let Test.18 : Union(NonRecursive([[Struct([])], [LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) })]])) = Ok Test.19;
         ret Test.18;
     else
         let Test.16 : Struct([]) = Struct {};
-        let Test.15 : Union(NonRecursive([[Struct([])], [LambdaSet([( #UserApp.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) })]])) = Err Test.16;
+        let Test.15 : Union(NonRecursive([[Struct([])], [LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) })]])) = Err Test.16;
         ret Test.15;
 
 procedure Test.2 (Test.6):
@@ -18,13 +18,13 @@ procedure Test.0 ():
     let Test.1 : Builtin(List(LambdaSet([]LambdaSet { set: Ok(()), representation: Struct([]) }))) = Array [];
     joinpoint Test.22 Test.3:
         let Test.14 : Builtin(Int(U64)) = 0i64;
-        let Test.7 : Union(NonRecursive([[Struct([])], [LambdaSet([( #UserApp.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) })]])) = CallByName List.3 Test.3 Test.14;
+        let Test.7 : Union(NonRecursive([[Struct([])], [LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) })]])) = CallByName List.3 Test.3 Test.14;
         dec Test.3;
         let Test.11 : Builtin(Int(U8)) = 1i64;
         let Test.12 : Builtin(Int(U8)) = GetTagId Test.7;
         let Test.13 : Builtin(Bool) = lowlevel Eq Test.11 Test.12;
         if Test.13 then
-            let Test.5 : LambdaSet([( #UserApp.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = UnionAtIndex (Id 1) (Index 0) Test.7;
+            let Test.5 : LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = UnionAtIndex (Id 1) (Index 0) Test.7;
             let Test.9 : Builtin(Str) = "foo";
             let Test.8 : Builtin(Str) = CallByName Test.2 Test.9;
             dec Test.9;
@@ -38,6 +38,6 @@ procedure Test.0 ():
         jump Test.22 Test.1;
     else
         dec Test.1;
-        let Test.23 : LambdaSet([( #UserApp.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = Struct {};
-        let Test.21 : Builtin(List(LambdaSet([( #UserApp.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }))) = Array [Test.23];
+        let Test.23 : LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = Struct {};
+        let Test.21 : Builtin(List(LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }))) = Array [Test.23];
         jump Test.22 Test.21;
diff --git a/compiler/test_mono/generated/nested_closure.txt b/compiler/test_mono/generated/nested_closure.txt
index bac3467a25..f8413a0265 100644
--- a/compiler/test_mono/generated/nested_closure.txt
+++ b/compiler/test_mono/generated/nested_closure.txt
@@ -1,6 +1,6 @@
 procedure Test.1 (Test.5):
     let Test.2 : Builtin(Int(I64)) = 42i64;
-    let Test.3 : LambdaSet([( #UserApp.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }) = Struct {Test.2};
+    let Test.3 : LambdaSet([( Test.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }) = Struct {Test.2};
     ret Test.3;
 
 procedure Test.3 (Test.9, #Attr.12):
@@ -9,7 +9,7 @@ procedure Test.3 (Test.9, #Attr.12):
 
 procedure Test.0 ():
     let Test.8 : Struct([]) = Struct {};
-    let Test.4 : LambdaSet([( #UserApp.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }) = CallByName Test.1 Test.8;
+    let Test.4 : LambdaSet([( Test.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }) = CallByName Test.1 Test.8;
     let Test.7 : Struct([]) = Struct {};
     let Test.6 : Builtin(Int(I64)) = CallByName Test.3 Test.7 Test.4;
     ret Test.6;
diff --git a/compiler/test_mono/generated/somehow_drops_definitions.txt b/compiler/test_mono/generated/somehow_drops_definitions.txt
index 0302de94be..0c92ef232e 100644
--- a/compiler/test_mono/generated/somehow_drops_definitions.txt
+++ b/compiler/test_mono/generated/somehow_drops_definitions.txt
@@ -46,8 +46,8 @@ procedure Test.0 ():
     in
     let Test.24 : Builtin(Bool) = true;
     if Test.24 then
-        let Test.3 : LambdaSet([( #UserApp.3, []), ( #UserApp.4, [])]LambdaSet { set: Ok(()), representation: Builtin(Bool) }) = false;
+        let Test.3 : LambdaSet([( Test.3, []), ( Test.4, [])]LambdaSet { set: Ok(()), representation: Builtin(Bool) }) = false;
         jump Test.19 Test.3;
     else
-        let Test.4 : LambdaSet([( #UserApp.3, []), ( #UserApp.4, [])]LambdaSet { set: Ok(()), representation: Builtin(Bool) }) = true;
+        let Test.4 : LambdaSet([( Test.3, []), ( Test.4, [])]LambdaSet { set: Ok(()), representation: Builtin(Bool) }) = true;
         jump Test.19 Test.4;
diff --git a/compiler/test_mono/generated/specialize_closures.txt b/compiler/test_mono/generated/specialize_closures.txt
index 091e079b52..73d49133ce 100644
--- a/compiler/test_mono/generated/specialize_closures.txt
+++ b/compiler/test_mono/generated/specialize_closures.txt
@@ -46,8 +46,8 @@ procedure Test.0 ():
     in
     let Test.26 : Builtin(Bool) = true;
     if Test.26 then
-        let Test.7 : LambdaSet([( #UserApp.7, [Builtin(Int(I64))]), ( #UserApp.8, [Builtin(Int(I64)), Builtin(Bool)])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64)), Builtin(Bool)]])) }) = ClosureTag(Test.7) Test.4;
+        let Test.7 : LambdaSet([( Test.7, [Builtin(Int(I64))]), ( Test.8, [Builtin(Int(I64)), Builtin(Bool)])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64)), Builtin(Bool)]])) }) = ClosureTag(Test.7) Test.4;
         jump Test.22 Test.7;
     else
-        let Test.8 : LambdaSet([( #UserApp.7, [Builtin(Int(I64))]), ( #UserApp.8, [Builtin(Int(I64)), Builtin(Bool)])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64)), Builtin(Bool)]])) }) = ClosureTag(Test.8) Test.5 Test.6;
+        let Test.8 : LambdaSet([( Test.7, [Builtin(Int(I64))]), ( Test.8, [Builtin(Int(I64)), Builtin(Bool)])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64)), Builtin(Bool)]])) }) = ClosureTag(Test.8) Test.5 Test.6;
         jump Test.22 Test.8;
diff --git a/compiler/test_mono/generated/specialize_lowlevel.txt b/compiler/test_mono/generated/specialize_lowlevel.txt
index 96459272bb..3271b1fd41 100644
--- a/compiler/test_mono/generated/specialize_lowlevel.txt
+++ b/compiler/test_mono/generated/specialize_lowlevel.txt
@@ -37,8 +37,8 @@ procedure Test.0 ():
     in
     let Test.22 : Builtin(Bool) = true;
     if Test.22 then
-        let Test.6 : LambdaSet([( #UserApp.6, [Builtin(Int(I64))]), ( #UserApp.7, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64))]])) }) = ClosureTag(Test.6) Test.4;
+        let Test.6 : LambdaSet([( Test.6, [Builtin(Int(I64))]), ( Test.7, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64))]])) }) = ClosureTag(Test.6) Test.4;
         jump Test.19 Test.6;
     else
-        let Test.7 : LambdaSet([( #UserApp.6, [Builtin(Int(I64))]), ( #UserApp.7, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64))]])) }) = ClosureTag(Test.7) Test.5;
+        let Test.7 : LambdaSet([( Test.6, [Builtin(Int(I64))]), ( Test.7, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64))]])) }) = ClosureTag(Test.7) Test.5;
         jump Test.19 Test.7;