diff --git a/src/LLVM.hs b/src/LLVM.hs
index 3768c6c2..2a1c4443 100644
--- a/src/LLVM.hs
+++ b/src/LLVM.hs
@@ -485,10 +485,10 @@ writeConstDeclaration spec@(CStringSpec str) n = do
 writeConstDeclaration spec@(ClosureSpec pspec args) n = do
     let closureName = specialName2 "closure" $ show n
     modify $ \s -> s { constNames=Map.insert spec closureName $ constNames s}
-    let pname = show pspec
+    argRep <- typeRep AnyType
     paramTys <- partitionClosureParams pspec args >>= mapM typeRep . (argType <$>) . fst 
     declareStructConstant closureName
-        ((ArgGlobal (GlobalVariable pname) (Representation CPointer), CPointer)
+        ((ArgGlobal (GlobalVariable $ mangleProcSpec pspec) (Representation CPointer), CPointer)
          : zip args paramTys)
         Nothing
 writeConstDeclaration spec@(ArraySpec args) n = do
@@ -1536,7 +1536,7 @@ llvmValue (ArgUndef _) = return "undef"
 
 -- | The LLVMArg translation of a ProcSpec.
 funcRef :: ProcSpec -> LLVMArg
-funcRef pspec = "ptr " ++ llvmGlobalName (show pspec)
+funcRef pspec = "ptr " ++ fst (llvmProcName pspec)
 
 
 -- | The variable name of a PrimArg; report an error if not a variable.
@@ -2171,7 +2171,14 @@ stackAlloc result size = do
 llvmProcName :: ProcSpec -> (LLVMName,String)
 llvmProcName ProcSpec{procSpecMod=[],procSpecName=""} =
     (llvmGlobalName "main", "ccc")
-llvmProcName pspec = (llvmGlobalName $ show pspec, "fastcc")
+llvmProcName pspec = 
+    (llvmGlobalName $ mangleProcSpec pspec, "fastcc")
+
+
+-- | Mangle a proc spec
+mangleProcSpec :: ProcSpec -> String
+mangleProcSpec pspec@ProcSpec{procSpecMod=mod} = 
+    show pspec{procSpecMod=(++ [specialChar]) <$> mod}
 
 
 -- | Make a suitable LLVM name for a global variable or constant.  We prefix it
diff --git a/test-cases/complex/exp/testcase_multi_specz-drone.exp b/test-cases/complex/exp/testcase_multi_specz-drone.exp
index 0fbef651..90587cb1 100644
--- a/test-cases/complex/exp/testcase_multi_specz-drone.exp
+++ b/test-cases/complex/exp/testcase_multi_specz-drone.exp
@@ -633,8 +633,8 @@ target triple   = ???
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"\00", align 8
 
-declare external fastcc void @"command_line.<0>"()
-declare external fastcc void @"drone.<0>"()
+declare external fastcc void @"command_line#.<0>"()
+declare external fastcc void @"drone#.<0>"()
 @"resource#command_line.argc" = external global i64
 @"resource#command_line.arguments" = external global i64
 @"resource#command_line.argv" = external global i64
@@ -649,7 +649,7 @@ define external ccc i64 @main(i64 %"argc##0", i64 %"argv##0") {
   store i64 %"argc##0", ptr @"resource#command_line.argc"
   store i64 %"argv##0", ptr @"resource#command_line.argv"
   call ccc void @gc_init()
-  tail call fastcc void @"drone.<0>"()
+  tail call fastcc void @"drone#.<0>"()
   %"tmp#11##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#9##0" = ptrtoint ptr %"tmp#11##0" to i64
   %"tmp#12##0" = inttoptr i64 %"tmp#9##0" to ptr
@@ -660,7 +660,7 @@ define external ccc i64 @main(i64 %"argc##0", i64 %"argv##0") {
   store i64 %"tmp#9##0", ptr @"resource#command_line.arguments"
   store i64 ptrtoint( ptr @"cstring#0" to i64 ), ptr @"resource#command_line.command"
   store i64 0, ptr @"resource#command_line.exit_code"
-  tail call fastcc void @"command_line.<0>"()
+  tail call fastcc void @"command_line#.<0>"()
   call ccc void @exit(i64 0)
   ret i64 0
 }
@@ -719,7 +719,7 @@ target triple   = ???
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Erroneous program argument vector\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"command_line:18:15\00", align 8
 
-declare external fastcc {i64, i64, i1} @"wybe.c_array.[|]<0>"(i64)
+declare external fastcc {i64, i64, i1} @"wybe#.c_array#.[|]<0>"(i64)
 declare external ccc void @error_exit(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#command_line.argc" = global i64 undef
@@ -728,9 +728,9 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#command_line.command" = global i64 undef
 @"resource#command_line.exit_code" = global i64 undef
 
-define external fastcc void @"command_line.<0>"() {
+define external fastcc void @"command_line#.<0>"() {
   %"arguments##0" = load i64, ptr @"resource#command_line.arguments"
-  %"tmp#11##0" = tail call fastcc {i64, i64, i1} @"wybe.c_array.[|]<0>"(i64 %"arguments##0")
+  %"tmp#11##0" = tail call fastcc {i64, i64, i1} @"wybe#.c_array#.[|]<0>"(i64 %"arguments##0")
   %"command##1" = extractvalue {i64, i64, i1}%"tmp#11##0", 0
   %"arguments##2" = extractvalue {i64, i64, i1}%"tmp#11##0", 1
   %"tmp#8##0" = extractvalue {i64, i64, i1}%"tmp#11##0", 2
@@ -744,7 +744,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"command_line.set_exit_code<0>"(i64 %"code##0") {
+define external fastcc void @"command_line#.set_exit_code<0>"(i64 %"code##0") {
   store i64 %"code##0", ptr @"resource#command_line.exit_code"
   ret void
 }
@@ -1161,8 +1161,8 @@ target triple   = ???
 @"string#6" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 @"string#7" = private unnamed_addr constant {i64, i64} { i64 15, i64 ptrtoint( ptr @"cstring#3" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc i64 @malloc_count()
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
@@ -1170,29 +1170,29 @@ declare external ccc i8 @read_char()
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"drone.<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"drone.drone_init<0>"()
+define external fastcc void @"drone#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"drone#.drone_init<0>"()
   %"ch##0" = call ccc i8 @read_char()
   %"tmp#2##0" = icmp ne i8 %"ch##0", -1
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"drone.loop<0>[410bae77d3]"(i64 %"tmp#0##0", i8 %"ch##0")
-  tail call fastcc void @"drone.#cont#1<0>"()
+  tail call fastcc void @"drone#.loop<0>[410bae77d3]"(i64 %"tmp#0##0", i8 %"ch##0")
+  tail call fastcc void @"drone#.#cont#1<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"drone.#cont#1<0>"()
+  tail call fastcc void @"drone#.#cont#1<0>"()
   ret void
 }
 
-define external fastcc void @"drone.#cont#1<0>"() {
+define external fastcc void @"drone#.#cont#1<0>"() {
   %"mc##0" = call ccc i64 @malloc_count()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @print_int(i64 %"mc##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc {i64, i1} @"drone.do_action<0>"(i64 %"d##0", i8 %"action##0") {
+define external fastcc {i64, i1} @"drone#.do_action<0>"(i64 %"d##0", i8 %"action##0") {
   %"tmp#21##0" = icmp eq i8 %"action##0", 110
   br i1 %"tmp#21##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1207,7 +1207,7 @@ if.then.0:
   %"tmp#69##0" = add i64 %"tmp#68##0", 8
   %"tmp#70##0" = inttoptr i64 %"tmp#69##0" to ptr
   store i64 %"tmp#1##0", ptr %"tmp#70##0"
-  %"tmp#71##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#68##0", i1 1)
+  %"tmp#71##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#68##0", i1 1)
   %"tmp#72##0" = insertvalue {i64, i1} undef, i64 %"tmp#71##0", 0
   %"tmp#73##0" = insertvalue {i64, i1} %"tmp#72##0", i1 1, 1
   ret {i64, i1} %"tmp#73##0"
@@ -1226,7 +1226,7 @@ if.then.1:
   %"tmp#79##0" = add i64 %"tmp#78##0", 8
   %"tmp#80##0" = inttoptr i64 %"tmp#79##0" to ptr
   store i64 %"tmp#3##0", ptr %"tmp#80##0"
-  %"tmp#81##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#78##0", i1 1)
+  %"tmp#81##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#78##0", i1 1)
   %"tmp#82##0" = insertvalue {i64, i1} undef, i64 %"tmp#81##0", 0
   %"tmp#83##0" = insertvalue {i64, i1} %"tmp#82##0", i1 1, 1
   ret {i64, i1} %"tmp#83##0"
@@ -1243,7 +1243,7 @@ if.then.2:
   %"tmp#87##0" = ptrtoint ptr %"tmp#86##0" to i64
   %"tmp#88##0" = inttoptr i64 %"tmp#87##0" to ptr
   store i64 %"tmp#5##0", ptr %"tmp#88##0"
-  %"tmp#89##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#87##0", i1 1)
+  %"tmp#89##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#87##0", i1 1)
   %"tmp#90##0" = insertvalue {i64, i1} undef, i64 %"tmp#89##0", 0
   %"tmp#91##0" = insertvalue {i64, i1} %"tmp#90##0", i1 1, 1
   ret {i64, i1} %"tmp#91##0"
@@ -1260,7 +1260,7 @@ if.then.3:
   %"tmp#95##0" = ptrtoint ptr %"tmp#94##0" to i64
   %"tmp#96##0" = inttoptr i64 %"tmp#95##0" to ptr
   store i64 %"tmp#7##0", ptr %"tmp#96##0"
-  %"tmp#97##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#95##0", i1 1)
+  %"tmp#97##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#95##0", i1 1)
   %"tmp#98##0" = insertvalue {i64, i1} undef, i64 %"tmp#97##0", 0
   %"tmp#99##0" = insertvalue {i64, i1} %"tmp#98##0", i1 1, 1
   ret {i64, i1} %"tmp#99##0"
@@ -1279,7 +1279,7 @@ if.then.4:
   %"tmp#105##0" = add i64 %"tmp#104##0", 16
   %"tmp#106##0" = inttoptr i64 %"tmp#105##0" to ptr
   store i64 %"tmp#9##0", ptr %"tmp#106##0"
-  %"tmp#107##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#104##0", i1 1)
+  %"tmp#107##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#104##0", i1 1)
   %"tmp#108##0" = insertvalue {i64, i1} undef, i64 %"tmp#107##0", 0
   %"tmp#109##0" = insertvalue {i64, i1} %"tmp#108##0", i1 1, 1
   ret {i64, i1} %"tmp#109##0"
@@ -1298,18 +1298,18 @@ if.then.5:
   %"tmp#115##0" = add i64 %"tmp#114##0", 16
   %"tmp#116##0" = inttoptr i64 %"tmp#115##0" to ptr
   store i64 %"tmp#11##0", ptr %"tmp#116##0"
-  %"tmp#117##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#114##0", i1 1)
+  %"tmp#117##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"tmp#114##0", i1 1)
   %"tmp#118##0" = insertvalue {i64, i1} undef, i64 %"tmp#117##0", 0
   %"tmp#119##0" = insertvalue {i64, i1} %"tmp#118##0", i1 1, 1
   ret {i64, i1} %"tmp#119##0"
 if.else.5:
-  %"tmp#120##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>"(i64 %"d##0", i1 0)
+  %"tmp#120##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>"(i64 %"d##0", i1 0)
   %"tmp#121##0" = insertvalue {i64, i1} undef, i64 %"tmp#120##0", 0
   %"tmp#122##0" = insertvalue {i64, i1} %"tmp#121##0", i1 0, 1
   ret {i64, i1} %"tmp#122##0"
 }
 
-define external fastcc {i64, i1} @"drone.do_action<0>[410bae77d3]"(i64 %"d##0", i8 %"action##0") {
+define external fastcc {i64, i1} @"drone#.do_action<0>[410bae77d3]"(i64 %"d##0", i8 %"action##0") {
   %"tmp#21##0" = icmp eq i8 %"action##0", 110
   br i1 %"tmp#21##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1320,7 +1320,7 @@ if.then.0:
   %"tmp#66##0" = add i64 %"d##0", 8
   %"tmp#67##0" = inttoptr i64 %"tmp#66##0" to ptr
   store i64 %"tmp#1##0", ptr %"tmp#67##0"
-  %"tmp#68##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
+  %"tmp#68##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
   %"tmp#69##0" = insertvalue {i64, i1} undef, i64 %"tmp#68##0", 0
   %"tmp#70##0" = insertvalue {i64, i1} %"tmp#69##0", i1 1, 1
   ret {i64, i1} %"tmp#70##0"
@@ -1335,7 +1335,7 @@ if.then.1:
   %"tmp#73##0" = add i64 %"d##0", 8
   %"tmp#74##0" = inttoptr i64 %"tmp#73##0" to ptr
   store i64 %"tmp#3##0", ptr %"tmp#74##0"
-  %"tmp#75##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
+  %"tmp#75##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
   %"tmp#76##0" = insertvalue {i64, i1} undef, i64 %"tmp#75##0", 0
   %"tmp#77##0" = insertvalue {i64, i1} %"tmp#76##0", i1 1, 1
   ret {i64, i1} %"tmp#77##0"
@@ -1348,7 +1348,7 @@ if.then.2:
   %"tmp#5##0" = sub i64 %"tmp#6##0", 1
   %"tmp#79##0" = inttoptr i64 %"d##0" to ptr
   store i64 %"tmp#5##0", ptr %"tmp#79##0"
-  %"tmp#80##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
+  %"tmp#80##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
   %"tmp#81##0" = insertvalue {i64, i1} undef, i64 %"tmp#80##0", 0
   %"tmp#82##0" = insertvalue {i64, i1} %"tmp#81##0", i1 1, 1
   ret {i64, i1} %"tmp#82##0"
@@ -1361,7 +1361,7 @@ if.then.3:
   %"tmp#7##0" = add i64 %"tmp#8##0", 1
   %"tmp#84##0" = inttoptr i64 %"d##0" to ptr
   store i64 %"tmp#7##0", ptr %"tmp#84##0"
-  %"tmp#85##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
+  %"tmp#85##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
   %"tmp#86##0" = insertvalue {i64, i1} undef, i64 %"tmp#85##0", 0
   %"tmp#87##0" = insertvalue {i64, i1} %"tmp#86##0", i1 1, 1
   ret {i64, i1} %"tmp#87##0"
@@ -1376,7 +1376,7 @@ if.then.4:
   %"tmp#90##0" = add i64 %"d##0", 16
   %"tmp#91##0" = inttoptr i64 %"tmp#90##0" to ptr
   store i64 %"tmp#9##0", ptr %"tmp#91##0"
-  %"tmp#92##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
+  %"tmp#92##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
   %"tmp#93##0" = insertvalue {i64, i1} undef, i64 %"tmp#92##0", 0
   %"tmp#94##0" = insertvalue {i64, i1} %"tmp#93##0", i1 1, 1
   ret {i64, i1} %"tmp#94##0"
@@ -1391,18 +1391,18 @@ if.then.5:
   %"tmp#97##0" = add i64 %"d##0", 16
   %"tmp#98##0" = inttoptr i64 %"tmp#97##0" to ptr
   store i64 %"tmp#11##0", ptr %"tmp#98##0"
-  %"tmp#99##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
+  %"tmp#99##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 1)
   %"tmp#100##0" = insertvalue {i64, i1} undef, i64 %"tmp#99##0", 0
   %"tmp#101##0" = insertvalue {i64, i1} %"tmp#100##0", i1 1, 1
   ret {i64, i1} %"tmp#101##0"
 if.else.5:
-  %"tmp#102##0" = tail call fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 0)
+  %"tmp#102##0" = tail call fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 0)
   %"tmp#103##0" = insertvalue {i64, i1} undef, i64 %"tmp#102##0", 0
   %"tmp#104##0" = insertvalue {i64, i1} %"tmp#103##0", i1 0, 1
   ret {i64, i1} %"tmp#104##0"
 }
 
-define external fastcc i64 @"drone.do_action#cont#1<0>"(i64 %"d##0", i1 %"success##0") {
+define external fastcc i64 @"drone#.do_action#cont#1<0>"(i64 %"d##0", i1 %"success##0") {
   br i1 %"success##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#21##0" = add i64 %"d##0", 24
@@ -1421,7 +1421,7 @@ if.else.0:
   ret i64 %"d##0"
 }
 
-define external fastcc i64 @"drone.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 %"success##0") {
+define external fastcc i64 @"drone#.do_action#cont#1<0>[410bae77d3]"(i64 %"d##0", i1 %"success##0") {
   br i1 %"success##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#21##0" = add i64 %"d##0", 24
@@ -1436,7 +1436,7 @@ if.else.0:
   ret i64 %"d##0"
 }
 
-define external fastcc i64 @"drone.drone_init<0>"() {
+define external fastcc i64 @"drone#.drone_init<0>"() {
   %"tmp#10##0" = call ccc ptr @wybe_malloc(i32 32)
   %"tmp#5##0" = ptrtoint ptr %"tmp#10##0" to i64
   %"tmp#11##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -1453,7 +1453,7 @@ define external fastcc i64 @"drone.drone_init<0>"() {
   ret i64 %"tmp#5##0"
 }
 
-define external fastcc void @"drone.loop<0>"(i64 %"d##0", i8 %"ch##0") {
+define external fastcc void @"drone#.loop<0>"(i64 %"d##0", i8 %"ch##0") {
   %"tmp#0##0" = icmp ne i8 %"ch##0", 32
   %"tmp#1##0" = icmp ne i8 %"ch##0", 10
   %"tmp#7##0" = and i1 %"tmp#0##0", %"tmp#1##0"
@@ -1462,48 +1462,48 @@ if.then.0:
   %"tmp#6##0" = icmp eq i8 %"ch##0", 112
   br i1 %"tmp#6##0", label %if.then.1, label %if.else.1
 if.then.1:
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1187)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1187)
   %"tmp#35##0" = inttoptr i64 %"d##0" to ptr
   %"tmp#22##0" = load i64, ptr %"tmp#35##0"
   call ccc void @print_int(i64 %"tmp#22##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   %"tmp#36##0" = add i64 %"d##0", 8
   %"tmp#37##0" = inttoptr i64 %"tmp#36##0" to ptr
   %"tmp#25##0" = load i64, ptr %"tmp#37##0"
   call ccc void @print_int(i64 %"tmp#25##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   %"tmp#38##0" = add i64 %"d##0", 16
   %"tmp#39##0" = inttoptr i64 %"tmp#38##0" to ptr
   %"tmp#28##0" = load i64, ptr %"tmp#39##0"
   call ccc void @print_int(i64 %"tmp#28##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   %"tmp#40##0" = add i64 %"d##0", 24
   %"tmp#41##0" = inttoptr i64 %"tmp#40##0" to ptr
   %"tmp#31##0" = load i64, ptr %"tmp#41##0"
   call ccc void @print_int(i64 %"tmp#31##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"drone.loop#cont#1<0>"(i64 %"d##0")
+  tail call fastcc void @"drone#.loop#cont#1<0>"(i64 %"d##0")
   ret void
 if.else.1:
-  %"tmp#42##0" = tail call fastcc {i64, i1} @"drone.do_action<0>"(i64 %"d##0", i8 %"ch##0")
+  %"tmp#42##0" = tail call fastcc {i64, i1} @"drone#.do_action<0>"(i64 %"d##0", i8 %"ch##0")
   %"d##1" = extractvalue {i64, i1}%"tmp#42##0", 0
   %"success##0" = extractvalue {i64, i1}%"tmp#42##0", 1
   %"tmp#5##0" = icmp eq i1 %"success##0", 0
   br i1 %"tmp#5##0", label %if.then.2, label %if.else.2
 if.then.2:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"drone.loop#cont#1<0>"(i64 %"d##1")
+  tail call fastcc void @"drone#.loop#cont#1<0>"(i64 %"d##1")
   ret void
 if.else.2:
-  tail call fastcc void @"drone.loop#cont#1<0>"(i64 %"d##1")
+  tail call fastcc void @"drone#.loop#cont#1<0>"(i64 %"d##1")
   ret void
 if.else.0:
-  tail call fastcc void @"drone.loop#cont#1<0>"(i64 %"d##0")
+  tail call fastcc void @"drone#.loop#cont#1<0>"(i64 %"d##0")
   ret void
 }
 
-define external fastcc void @"drone.loop<0>[410bae77d3]"(i64 %"d##0", i8 %"ch##0") {
+define external fastcc void @"drone#.loop<0>[410bae77d3]"(i64 %"d##0", i8 %"ch##0") {
   %"tmp#0##0" = icmp ne i8 %"ch##0", 32
   %"tmp#1##0" = icmp ne i8 %"ch##0", 10
   %"tmp#7##0" = and i1 %"tmp#0##0", %"tmp#1##0"
@@ -1512,85 +1512,85 @@ if.then.0:
   %"tmp#6##0" = icmp eq i8 %"ch##0", 112
   br i1 %"tmp#6##0", label %if.then.1, label %if.else.1
 if.then.1:
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1187)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1187)
   %"tmp#35##0" = inttoptr i64 %"d##0" to ptr
   %"tmp#22##0" = load i64, ptr %"tmp#35##0"
   call ccc void @print_int(i64 %"tmp#22##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   %"tmp#36##0" = add i64 %"d##0", 8
   %"tmp#37##0" = inttoptr i64 %"tmp#36##0" to ptr
   %"tmp#25##0" = load i64, ptr %"tmp#37##0"
   call ccc void @print_int(i64 %"tmp#25##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   %"tmp#38##0" = add i64 %"d##0", 16
   %"tmp#39##0" = inttoptr i64 %"tmp#38##0" to ptr
   %"tmp#28##0" = load i64, ptr %"tmp#39##0"
   call ccc void @print_int(i64 %"tmp#28##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   %"tmp#40##0" = add i64 %"d##0", 24
   %"tmp#41##0" = inttoptr i64 %"tmp#40##0" to ptr
   %"tmp#31##0" = load i64, ptr %"tmp#41##0"
   call ccc void @print_int(i64 %"tmp#31##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"drone.loop#cont#1<0>[6dacb8fd25]"(i64 %"d##0")
+  tail call fastcc void @"drone#.loop#cont#1<0>[6dacb8fd25]"(i64 %"d##0")
   ret void
 if.else.1:
-  %"tmp#42##0" = tail call fastcc {i64, i1} @"drone.do_action<0>[410bae77d3]"(i64 %"d##0", i8 %"ch##0")
+  %"tmp#42##0" = tail call fastcc {i64, i1} @"drone#.do_action<0>[410bae77d3]"(i64 %"d##0", i8 %"ch##0")
   %"d##1" = extractvalue {i64, i1}%"tmp#42##0", 0
   %"success##0" = extractvalue {i64, i1}%"tmp#42##0", 1
   %"tmp#5##0" = icmp eq i1 %"success##0", 0
   br i1 %"tmp#5##0", label %if.then.2, label %if.else.2
 if.then.2:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"drone.loop#cont#1<0>[6dacb8fd25]"(i64 %"d##1")
+  tail call fastcc void @"drone#.loop#cont#1<0>[6dacb8fd25]"(i64 %"d##1")
   ret void
 if.else.2:
-  tail call fastcc void @"drone.loop#cont#1<0>[6dacb8fd25]"(i64 %"d##1")
+  tail call fastcc void @"drone#.loop#cont#1<0>[6dacb8fd25]"(i64 %"d##1")
   ret void
 if.else.0:
-  tail call fastcc void @"drone.loop#cont#1<0>[6dacb8fd25]"(i64 %"d##0")
+  tail call fastcc void @"drone#.loop#cont#1<0>[6dacb8fd25]"(i64 %"d##0")
   ret void
 }
 
-define external fastcc void @"drone.loop#cont#1<0>"(i64 %"d##0") {
+define external fastcc void @"drone#.loop#cont#1<0>"(i64 %"d##0") {
   %"ch##1" = call ccc i8 @read_char()
   %"tmp#4##0" = icmp ne i8 %"ch##1", -1
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"drone.loop<0>"(i64 %"d##0", i8 %"ch##1")
+  tail call fastcc void @"drone#.loop<0>"(i64 %"d##0", i8 %"ch##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"drone.loop#cont#1<0>[6dacb8fd25]"(i64 %"d##0") {
+define external fastcc void @"drone#.loop#cont#1<0>[6dacb8fd25]"(i64 %"d##0") {
   %"ch##1" = call ccc i8 @read_char()
   %"tmp#4##0" = icmp ne i8 %"ch##1", -1
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"drone.loop<0>[410bae77d3]"(i64 %"d##0", i8 %"ch##1")
+  tail call fastcc void @"drone#.loop<0>[410bae77d3]"(i64 %"d##0", i8 %"ch##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"drone.print_info<0>"(i64 %"d##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 1187)
+define external fastcc void @"drone#.print_info<0>"(i64 %"d##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 1187)
   %"tmp#27##0" = inttoptr i64 %"d##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#27##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   %"tmp#28##0" = add i64 %"d##0", 8
   %"tmp#29##0" = inttoptr i64 %"tmp#28##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#29##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   %"tmp#30##0" = add i64 %"d##0", 16
   %"tmp#31##0" = inttoptr i64 %"tmp#30##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#31##0"
   call ccc void @print_int(i64 %"tmp#2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   %"tmp#32##0" = add i64 %"d##0", 24
   %"tmp#33##0" = inttoptr i64 %"tmp#32##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#33##0"
@@ -1787,7 +1787,7 @@ target triple   = ???
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"drone.drone_info.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"drone#.drone_info#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#15##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#15##0"
   %"tmp#16##0" = add i64 %"#left##0", 8
@@ -1829,14 +1829,14 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"drone.drone_info.count<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"drone#.drone_info#.count<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 24
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"drone.drone_info.count<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"drone#.drone_info#.count<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 32)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 32, i1 0)
@@ -1847,7 +1847,7 @@ define external fastcc i64 @"drone.drone_info.count<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"drone.drone_info.drone_info<0>"(i64 %"x##0", i64 %"y##0", i64 %"z##0", i64 %"count##0") {
+define external fastcc i64 @"drone#.drone_info#.drone_info<0>"(i64 %"x##0", i64 %"y##0", i64 %"z##0", i64 %"count##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 32)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1864,7 +1864,7 @@ define external fastcc i64 @"drone.drone_info.drone_info<0>"(i64 %"x##0", i64 %"
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64, i64} @"drone.drone_info.drone_info<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i64} @"drone#.drone_info#.drone_info<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -1883,13 +1883,13 @@ define external fastcc {i64, i64, i64, i64} @"drone.drone_info.drone_info<1>"(i6
   ret {i64, i64, i64, i64} %"tmp#14##0"
 }
 
-define external fastcc i64 @"drone.drone_info.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"drone#.drone_info#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"drone.drone_info.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"drone#.drone_info#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 32)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 32, i1 0)
@@ -1899,14 +1899,14 @@ define external fastcc i64 @"drone.drone_info.x<1>"(i64 %"#rec##0", i64 %"#field
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"drone.drone_info.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"drone#.drone_info#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"drone.drone_info.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"drone#.drone_info#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 32)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 32, i1 0)
@@ -1917,14 +1917,14 @@ define external fastcc i64 @"drone.drone_info.y<1>"(i64 %"#rec##0", i64 %"#field
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"drone.drone_info.z<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"drone#.drone_info#.z<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 16
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"drone.drone_info.z<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"drone#.drone_info#.z<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 32)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 32, i1 0)
@@ -1935,7 +1935,7 @@ define external fastcc i64 @"drone.drone_info.z<1>"(i64 %"#rec##0", i64 %"#field
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"drone.drone_info.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"drone#.drone_info#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#14##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#14##0"
   %"tmp#15##0" = add i64 %"#left##0", 8
diff --git a/test-cases/complex/exp/testcase_multi_specz-int_list.exp b/test-cases/complex/exp/testcase_multi_specz-int_list.exp
index 314c2566..5671919f 100644
--- a/test-cases/complex/exp/testcase_multi_specz-int_list.exp
+++ b/test-cases/complex/exp/testcase_multi_specz-int_list.exp
@@ -996,8 +996,8 @@ target triple   = ???
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"\00", align 8
 
-declare external fastcc void @"command_line.<0>"()
-declare external fastcc void @"int_list_test.<0>"()
+declare external fastcc void @"command_line#.<0>"()
+declare external fastcc void @"int_list_test#.<0>"()
 @"resource#command_line.argc" = external global i64
 @"resource#command_line.arguments" = external global i64
 @"resource#command_line.argv" = external global i64
@@ -1012,7 +1012,7 @@ define external ccc i64 @main(i64 %"argc##0", i64 %"argv##0") {
   store i64 %"argc##0", ptr @"resource#command_line.argc"
   store i64 %"argv##0", ptr @"resource#command_line.argv"
   call ccc void @gc_init()
-  tail call fastcc void @"int_list_test.<0>"()
+  tail call fastcc void @"int_list_test#.<0>"()
   %"tmp#11##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#9##0" = ptrtoint ptr %"tmp#11##0" to i64
   %"tmp#12##0" = inttoptr i64 %"tmp#9##0" to ptr
@@ -1023,7 +1023,7 @@ define external ccc i64 @main(i64 %"argc##0", i64 %"argv##0") {
   store i64 %"tmp#9##0", ptr @"resource#command_line.arguments"
   store i64 ptrtoint( ptr @"cstring#0" to i64 ), ptr @"resource#command_line.command"
   store i64 0, ptr @"resource#command_line.exit_code"
-  tail call fastcc void @"command_line.<0>"()
+  tail call fastcc void @"command_line#.<0>"()
   call ccc void @exit(i64 0)
   ret i64 0
 }
@@ -1082,7 +1082,7 @@ target triple   = ???
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Erroneous program argument vector\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"command_line:18:15\00", align 8
 
-declare external fastcc {i64, i64, i1} @"wybe.c_array.[|]<0>"(i64)
+declare external fastcc {i64, i64, i1} @"wybe#.c_array#.[|]<0>"(i64)
 declare external ccc void @error_exit(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#command_line.argc" = global i64 undef
@@ -1091,9 +1091,9 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#command_line.command" = global i64 undef
 @"resource#command_line.exit_code" = global i64 undef
 
-define external fastcc void @"command_line.<0>"() {
+define external fastcc void @"command_line#.<0>"() {
   %"arguments##0" = load i64, ptr @"resource#command_line.arguments"
-  %"tmp#11##0" = tail call fastcc {i64, i64, i1} @"wybe.c_array.[|]<0>"(i64 %"arguments##0")
+  %"tmp#11##0" = tail call fastcc {i64, i64, i1} @"wybe#.c_array#.[|]<0>"(i64 %"arguments##0")
   %"command##1" = extractvalue {i64, i64, i1}%"tmp#11##0", 0
   %"arguments##2" = extractvalue {i64, i64, i1}%"tmp#11##0", 1
   %"tmp#8##0" = extractvalue {i64, i64, i1}%"tmp#11##0", 2
@@ -1107,7 +1107,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"command_line.set_exit_code<0>"(i64 %"code##0") {
+define external fastcc void @"command_line#.set_exit_code<0>"(i64 %"code##0") {
   store i64 %"code##0", ptr @"resource#command_line.exit_code"
   ret void
 }
@@ -1661,7 +1661,7 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"int_list.append<0>"(i64 %"lst##0", i64 %"v##0") {
+define external fastcc i64 @"int_list#.append<0>"(i64 %"lst##0", i64 %"v##0") {
   %"tmp#8##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#5##0" = ptrtoint ptr %"tmp#8##0" to i64
   %"tmp#9##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -1670,12 +1670,12 @@ define external fastcc i64 @"int_list.append<0>"(i64 %"lst##0", i64 %"v##0") {
   %"tmp#11##0" = inttoptr i64 %"tmp#10##0" to ptr
   store i64 0, ptr %"tmp#11##0"
   %"tmp#12##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.extend<0>"(i64 %"lst##0", i64 %"tmp#5##0", ptr %"tmp#12##0")
+  call fastcc void @"int_list#.extend<0>"(i64 %"lst##0", i64 %"tmp#5##0", ptr %"tmp#12##0")
   %"tmp#13##0" = load i64, ptr %"tmp#12##0"
   ret i64 %"tmp#13##0"
 }
 
-define external fastcc i64 @"int_list.append<0>[410bae77d3]"(i64 %"lst##0", i64 %"v##0") {
+define external fastcc i64 @"int_list#.append<0>[410bae77d3]"(i64 %"lst##0", i64 %"v##0") {
   %"tmp#8##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#5##0" = ptrtoint ptr %"tmp#8##0" to i64
   %"tmp#9##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -1684,12 +1684,12 @@ define external fastcc i64 @"int_list.append<0>[410bae77d3]"(i64 %"lst##0", i64
   %"tmp#11##0" = inttoptr i64 %"tmp#10##0" to ptr
   store i64 0, ptr %"tmp#11##0"
   %"tmp#12##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.extend<0>[410bae77d3]"(i64 %"lst##0", i64 %"tmp#5##0", ptr %"tmp#12##0")
+  call fastcc void @"int_list#.extend<0>[410bae77d3]"(i64 %"lst##0", i64 %"tmp#5##0", ptr %"tmp#12##0")
   %"tmp#13##0" = load i64, ptr %"tmp#12##0"
   ret i64 %"tmp#13##0"
 }
 
-define external fastcc i64 @"int_list.count<0>"(i64 %"lst##0", i64 %"x##0") {
+define external fastcc i64 @"int_list#.count<0>"(i64 %"lst##0", i64 %"x##0") {
   %"tmp#7##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#7##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1698,7 +1698,7 @@ if.then.0:
   %"tmp#15##0" = add i64 %"lst##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   %"t##0" = load i64, ptr %"tmp#16##0"
-  %"tmp#2##0" = tail call fastcc i64 @"int_list.count<0>"(i64 %"t##0", i64 %"x##0")
+  %"tmp#2##0" = tail call fastcc i64 @"int_list#.count<0>"(i64 %"t##0", i64 %"x##0")
   %"tmp#4##0" = icmp eq i64 %"h##0", %"x##0"
   br i1 %"tmp#4##0", label %if.then.1, label %if.else.1
 if.then.1:
@@ -1710,12 +1710,12 @@ if.else.0:
   ret i64 0
 }
 
-define external fastcc i64 @"int_list.count#cont#1<0>"(i64 %"tmp#2##0", i64 %"tmp#3##0") {
+define external fastcc i64 @"int_list#.count#cont#1<0>"(i64 %"tmp#2##0", i64 %"tmp#3##0") {
   %"tmp#6##0" = add i64 %"tmp#2##0", %"tmp#3##0"
   ret i64 %"tmp#6##0"
 }
 
-define external fastcc void @"int_list.extend<0>"(i64 %"lst1##0", i64 %"lst2##0", ptr %"tmp#11##0") {
+define external fastcc void @"int_list#.extend<0>"(i64 %"lst1##0", i64 %"lst2##0", ptr %"tmp#11##0") {
   %"tmp#5##0" = icmp ne i64 %"lst1##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1731,14 +1731,14 @@ if.then.0:
   store i64 %"tmp#8##0", ptr %"tmp#11##0"
   %"tmp#17##0" = add i64 %"tmp#8##0", 8
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
-  musttail call fastcc void @"int_list.extend<0>"(i64 %"t##0", i64 %"lst2##0", ptr %"tmp#18##0")
+  musttail call fastcc void @"int_list#.extend<0>"(i64 %"t##0", i64 %"lst2##0", ptr %"tmp#18##0")
   ret void
 if.else.0:
   store i64 %"lst2##0", ptr %"tmp#11##0"
   ret void
 }
 
-define external fastcc void @"int_list.extend<0>[410bae77d3]"(i64 %"lst1##0", i64 %"lst2##0", ptr %"tmp#11##0") {
+define external fastcc void @"int_list#.extend<0>[410bae77d3]"(i64 %"lst1##0", i64 %"lst2##0", ptr %"tmp#11##0") {
   %"tmp#5##0" = icmp ne i64 %"lst1##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1748,14 +1748,14 @@ if.then.0:
   store i64 %"lst1##0", ptr %"tmp#11##0"
   %"tmp#14##0" = add i64 %"lst1##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
-  musttail call fastcc void @"int_list.extend<0>[410bae77d3]"(i64 %"t##0", i64 %"lst2##0", ptr %"tmp#15##0")
+  musttail call fastcc void @"int_list#.extend<0>[410bae77d3]"(i64 %"t##0", i64 %"lst2##0", ptr %"tmp#15##0")
   ret void
 if.else.0:
   store i64 %"lst2##0", ptr %"tmp#11##0"
   ret void
 }
 
-define external fastcc void @"int_list.greater<0>"(i64 %"lst##0", i64 %"v##0", ptr %"tmp#17##0") {
+define external fastcc void @"int_list#.greater<0>"(i64 %"lst##0", i64 %"v##0", ptr %"tmp#17##0") {
   %"tmp#9##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1774,17 +1774,17 @@ if.then.1:
   store i64 %"tmp#14##0", ptr %"tmp#17##0"
   %"tmp#23##0" = add i64 %"tmp#14##0", 8
   %"tmp#24##0" = inttoptr i64 %"tmp#23##0" to ptr
-  musttail call fastcc void @"int_list.greater<0>"(i64 %"t##0", i64 %"v##0", ptr %"tmp#24##0")
+  musttail call fastcc void @"int_list#.greater<0>"(i64 %"t##0", i64 %"v##0", ptr %"tmp#24##0")
   ret void
 if.else.1:
-  musttail call fastcc void @"int_list.greater<0>"(i64 %"t##0", i64 %"v##0", ptr %"tmp#17##0")
+  musttail call fastcc void @"int_list#.greater<0>"(i64 %"t##0", i64 %"v##0", ptr %"tmp#17##0")
   ret void
 if.else.0:
   store i64 0, ptr %"tmp#17##0"
   ret void
 }
 
-define external fastcc void @"int_list.greater<0>[410bae77d3]"(i64 %"lst##0", i64 %"v##0", ptr %"tmp#17##0") {
+define external fastcc void @"int_list#.greater<0>[410bae77d3]"(i64 %"lst##0", i64 %"v##0", ptr %"tmp#17##0") {
   %"tmp#9##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1799,22 +1799,22 @@ if.then.1:
   store i64 %"lst##0", ptr %"tmp#17##0"
   %"tmp#21##0" = add i64 %"lst##0", 8
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
-  musttail call fastcc void @"int_list.greater<0>[410bae77d3]"(i64 %"t##0", i64 %"v##0", ptr %"tmp#22##0")
+  musttail call fastcc void @"int_list#.greater<0>[410bae77d3]"(i64 %"t##0", i64 %"v##0", ptr %"tmp#22##0")
   ret void
 if.else.1:
-  musttail call fastcc void @"int_list.greater<0>[410bae77d3]"(i64 %"t##0", i64 %"v##0", ptr %"tmp#17##0")
+  musttail call fastcc void @"int_list#.greater<0>[410bae77d3]"(i64 %"t##0", i64 %"v##0", ptr %"tmp#17##0")
   ret void
 if.else.0:
   store i64 0, ptr %"tmp#17##0"
   ret void
 }
 
-define external fastcc i64 @"int_list.index<0>"(i64 %"lst##0", i64 %"x##0") {
-  %"tmp#1##0" = tail call fastcc i64 @"int_list.index_helper<0>"(i64 %"lst##0", i64 0, i64 %"x##0")
+define external fastcc i64 @"int_list#.index<0>"(i64 %"lst##0", i64 %"x##0") {
+  %"tmp#1##0" = tail call fastcc i64 @"int_list#.index_helper<0>"(i64 %"lst##0", i64 0, i64 %"x##0")
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"int_list.index_helper<0>"(i64 %"lst##0", i64 %"idx##0", i64 %"x##0") {
+define external fastcc i64 @"int_list#.index_helper<0>"(i64 %"lst##0", i64 %"idx##0", i64 %"x##0") {
   %"tmp#7##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#7##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1829,13 +1829,13 @@ if.then.1:
   ret i64 %"idx##0"
 if.else.1:
   %"tmp#3##0" = add i64 %"idx##0", 1
-  %"tmp#15##0" = tail call fastcc i64 @"int_list.index_helper<0>"(i64 %"t##0", i64 %"tmp#3##0", i64 %"x##0")
+  %"tmp#15##0" = tail call fastcc i64 @"int_list#.index_helper<0>"(i64 %"t##0", i64 %"tmp#3##0", i64 %"x##0")
   ret i64 %"tmp#15##0"
 if.else.0:
   ret i64 -1
 }
 
-define external fastcc void @"int_list.insert<0>"(i64 %"lst##0", i64 %"idx##0", i64 %"v##0", ptr %"tmp#28##0") {
+define external fastcc void @"int_list#.insert<0>"(i64 %"lst##0", i64 %"idx##0", i64 %"v##0", ptr %"tmp#28##0") {
   %"tmp#9##0" = icmp eq i64 %"idx##0", 0
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1865,15 +1865,15 @@ if.then.1:
   store i64 %"tmp#20##0", ptr %"tmp#28##0"
   %"tmp#38##0" = add i64 %"tmp#20##0", 8
   %"tmp#39##0" = inttoptr i64 %"tmp#38##0" to ptr
-  musttail call fastcc void @"int_list.insert<0>"(i64 %"t##0", i64 %"tmp#5##0", i64 %"v##0", ptr %"tmp#39##0")
+  musttail call fastcc void @"int_list#.insert<0>"(i64 %"t##0", i64 %"tmp#5##0", i64 %"v##0", ptr %"tmp#39##0")
   ret void
 if.else.1:
   %"tmp#7##0" = sub i64 %"idx##0", 1
-  musttail call fastcc void @"int_list.insert<0>"(i64 0, i64 %"tmp#7##0", i64 %"v##0", ptr %"tmp#28##0")
+  musttail call fastcc void @"int_list#.insert<0>"(i64 0, i64 %"tmp#7##0", i64 %"v##0", ptr %"tmp#28##0")
   ret void
 }
 
-define external fastcc void @"int_list.insert<0>[410bae77d3]"(i64 %"lst##0", i64 %"idx##0", i64 %"v##0", ptr %"tmp#28##0") {
+define external fastcc void @"int_list#.insert<0>[410bae77d3]"(i64 %"lst##0", i64 %"idx##0", i64 %"v##0", ptr %"tmp#28##0") {
   %"tmp#9##0" = icmp eq i64 %"idx##0", 0
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1897,15 +1897,15 @@ if.then.1:
   store i64 %"lst##0", ptr %"tmp#28##0"
   %"tmp#35##0" = add i64 %"lst##0", 8
   %"tmp#36##0" = inttoptr i64 %"tmp#35##0" to ptr
-  musttail call fastcc void @"int_list.insert<0>[410bae77d3]"(i64 %"t##0", i64 %"tmp#5##0", i64 %"v##0", ptr %"tmp#36##0")
+  musttail call fastcc void @"int_list#.insert<0>[410bae77d3]"(i64 %"t##0", i64 %"tmp#5##0", i64 %"v##0", ptr %"tmp#36##0")
   ret void
 if.else.1:
   %"tmp#7##0" = sub i64 %"idx##0", 1
-  musttail call fastcc void @"int_list.insert<0>[410bae77d3]"(i64 0, i64 %"tmp#7##0", i64 %"v##0", ptr %"tmp#28##0")
+  musttail call fastcc void @"int_list#.insert<0>[410bae77d3]"(i64 0, i64 %"tmp#7##0", i64 %"v##0", ptr %"tmp#28##0")
   ret void
 }
 
-define external fastcc void @"int_list.lesser<0>"(i64 %"lst##0", i64 %"v##0", ptr %"tmp#17##0") {
+define external fastcc void @"int_list#.lesser<0>"(i64 %"lst##0", i64 %"v##0", ptr %"tmp#17##0") {
   %"tmp#9##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1924,17 +1924,17 @@ if.then.1:
   store i64 %"tmp#14##0", ptr %"tmp#17##0"
   %"tmp#23##0" = add i64 %"tmp#14##0", 8
   %"tmp#24##0" = inttoptr i64 %"tmp#23##0" to ptr
-  musttail call fastcc void @"int_list.lesser<0>"(i64 %"t##0", i64 %"v##0", ptr %"tmp#24##0")
+  musttail call fastcc void @"int_list#.lesser<0>"(i64 %"t##0", i64 %"v##0", ptr %"tmp#24##0")
   ret void
 if.else.1:
-  musttail call fastcc void @"int_list.lesser<0>"(i64 %"t##0", i64 %"v##0", ptr %"tmp#17##0")
+  musttail call fastcc void @"int_list#.lesser<0>"(i64 %"t##0", i64 %"v##0", ptr %"tmp#17##0")
   ret void
 if.else.0:
   store i64 0, ptr %"tmp#17##0"
   ret void
 }
 
-define external fastcc void @"int_list.pop<0>"(i64 %"lst##0", i64 %"idx##0", ptr %"tmp#19##0") {
+define external fastcc void @"int_list#.pop<0>"(i64 %"lst##0", i64 %"idx##0", ptr %"tmp#19##0") {
   %"tmp#9##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1957,14 +1957,14 @@ if.else.1:
   store i64 %"tmp#16##0", ptr %"tmp#19##0"
   %"tmp#25##0" = add i64 %"tmp#16##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
-  musttail call fastcc void @"int_list.pop<0>"(i64 %"t##0", i64 %"tmp#4##0", ptr %"tmp#26##0")
+  musttail call fastcc void @"int_list#.pop<0>"(i64 %"t##0", i64 %"tmp#4##0", ptr %"tmp#26##0")
   ret void
 if.else.0:
   store i64 0, ptr %"tmp#19##0"
   ret void
 }
 
-define external fastcc void @"int_list.pop<0>[410bae77d3]"(i64 %"lst##0", i64 %"idx##0", ptr %"tmp#19##0") {
+define external fastcc void @"int_list#.pop<0>[410bae77d3]"(i64 %"lst##0", i64 %"idx##0", ptr %"tmp#19##0") {
   %"tmp#9##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1981,14 +1981,14 @@ if.else.1:
   store i64 %"lst##0", ptr %"tmp#19##0"
   %"tmp#22##0" = add i64 %"lst##0", 8
   %"tmp#23##0" = inttoptr i64 %"tmp#22##0" to ptr
-  musttail call fastcc void @"int_list.pop<0>[410bae77d3]"(i64 %"t##0", i64 %"tmp#4##0", ptr %"tmp#23##0")
+  musttail call fastcc void @"int_list#.pop<0>[410bae77d3]"(i64 %"t##0", i64 %"tmp#4##0", ptr %"tmp#23##0")
   ret void
 if.else.0:
   store i64 0, ptr %"tmp#19##0"
   ret void
 }
 
-define external fastcc void @"int_list.print<0>"(i64 %"x##0") {
+define external fastcc void @"int_list#.print<0>"(i64 %"x##0") {
   %"tmp#2##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1999,24 +1999,24 @@ if.then.0:
   %"t##0" = load i64, ptr %"tmp#11##0"
   call ccc void @print_int(i64 %"h##0")
   call ccc void @putchar(i8 32)
-  tail call fastcc void @"int_list.print<0>"(i64 %"t##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"t##0")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"int_list.println<0>"(i64 %"x##0") {
-  tail call fastcc void @"int_list.print<0>"(i64 %"x##0")
+define external fastcc void @"int_list#.println<0>"(i64 %"x##0") {
+  tail call fastcc void @"int_list#.print<0>"(i64 %"x##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"int_list.range<0>"(i64 %"start##0", i64 %"stop##0", i64 %"step##0") {
-  %"tmp#4##0" = tail call fastcc i64 @"int_list.range#cont#1<0>"(i64 0, i64 %"start##0", i64 %"step##0", i64 %"stop##0")
+define external fastcc i64 @"int_list#.range<0>"(i64 %"start##0", i64 %"stop##0", i64 %"step##0") {
+  %"tmp#4##0" = tail call fastcc i64 @"int_list#.range#cont#1<0>"(i64 0, i64 %"start##0", i64 %"step##0", i64 %"stop##0")
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc i64 @"int_list.range#cont#1<0>"(i64 %"result##0", i64 %"start##0", i64 %"step##0", i64 %"stop##0") {
+define external fastcc i64 @"int_list#.range#cont#1<0>"(i64 %"result##0", i64 %"start##0", i64 %"step##0", i64 %"stop##0") {
   %"tmp#3##0" = icmp slt i64 %"start##0", %"stop##0"
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2028,14 +2028,14 @@ if.then.0:
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
   store i64 %"result##0", ptr %"tmp#18##0"
   %"tmp#14##0" = add i64 %"start##0", %"step##0"
-  %"tmp#19##0" = tail call fastcc i64 @"int_list.range#cont#1<0>"(i64 %"tmp#11##0", i64 %"tmp#14##0", i64 %"step##0", i64 %"stop##0")
+  %"tmp#19##0" = tail call fastcc i64 @"int_list#.range#cont#1<0>"(i64 %"tmp#11##0", i64 %"tmp#14##0", i64 %"step##0", i64 %"stop##0")
   ret i64 %"tmp#19##0"
 if.else.0:
-  %"tmp#20##0" = tail call fastcc i64 @"int_list.reverse_helper<0>"(i64 %"result##0", i64 0)
+  %"tmp#20##0" = tail call fastcc i64 @"int_list#.reverse_helper<0>"(i64 %"result##0", i64 0)
   ret i64 %"tmp#20##0"
 }
 
-define external fastcc i64 @"int_list.range#cont#1<0>[410bae77d3]"(i64 %"result##0", i64 %"start##0", i64 %"step##0", i64 %"stop##0") {
+define external fastcc i64 @"int_list#.range#cont#1<0>[410bae77d3]"(i64 %"result##0", i64 %"start##0", i64 %"step##0", i64 %"stop##0") {
   %"tmp#3##0" = icmp slt i64 %"start##0", %"stop##0"
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2047,14 +2047,14 @@ if.then.0:
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
   store i64 %"result##0", ptr %"tmp#18##0"
   %"tmp#14##0" = add i64 %"start##0", %"step##0"
-  %"tmp#19##0" = tail call fastcc i64 @"int_list.range#cont#1<0>[410bae77d3]"(i64 %"tmp#11##0", i64 %"tmp#14##0", i64 %"step##0", i64 %"stop##0")
+  %"tmp#19##0" = tail call fastcc i64 @"int_list#.range#cont#1<0>[410bae77d3]"(i64 %"tmp#11##0", i64 %"tmp#14##0", i64 %"step##0", i64 %"stop##0")
   ret i64 %"tmp#19##0"
 if.else.0:
-  %"tmp#20##0" = tail call fastcc i64 @"int_list.reverse_helper<0>[410bae77d3]"(i64 %"result##0", i64 0)
+  %"tmp#20##0" = tail call fastcc i64 @"int_list#.reverse_helper<0>[410bae77d3]"(i64 %"result##0", i64 0)
   ret i64 %"tmp#20##0"
 }
 
-define external fastcc i64 @"int_list.range#cont#2<0>"(i64 %"result##0", i64 %"start##0", i64 %"step##0", i64 %"stop##0") {
+define external fastcc i64 @"int_list#.range#cont#2<0>"(i64 %"result##0", i64 %"start##0", i64 %"step##0", i64 %"stop##0") {
   %"tmp#10##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#5##0" = ptrtoint ptr %"tmp#10##0" to i64
   %"tmp#11##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -2063,11 +2063,11 @@ define external fastcc i64 @"int_list.range#cont#2<0>"(i64 %"result##0", i64 %"s
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   store i64 %"result##0", ptr %"tmp#13##0"
   %"tmp#2##0" = add i64 %"start##0", %"step##0"
-  %"tmp#14##0" = tail call fastcc i64 @"int_list.range#cont#1<0>"(i64 %"tmp#5##0", i64 %"tmp#2##0", i64 %"step##0", i64 %"stop##0")
+  %"tmp#14##0" = tail call fastcc i64 @"int_list#.range#cont#1<0>"(i64 %"tmp#5##0", i64 %"tmp#2##0", i64 %"step##0", i64 %"stop##0")
   ret i64 %"tmp#14##0"
 }
 
-define external fastcc void @"int_list.remove<0>"(i64 %"lst##0", i64 %"v##0", ptr %"tmp#16##0") {
+define external fastcc void @"int_list#.remove<0>"(i64 %"lst##0", i64 %"v##0", ptr %"tmp#16##0") {
   %"tmp#8##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2089,14 +2089,14 @@ if.else.1:
   store i64 %"tmp#13##0", ptr %"tmp#16##0"
   %"tmp#22##0" = add i64 %"tmp#13##0", 8
   %"tmp#23##0" = inttoptr i64 %"tmp#22##0" to ptr
-  musttail call fastcc void @"int_list.remove<0>"(i64 %"t##0", i64 %"v##0", ptr %"tmp#23##0")
+  musttail call fastcc void @"int_list#.remove<0>"(i64 %"t##0", i64 %"v##0", ptr %"tmp#23##0")
   ret void
 if.else.0:
   store i64 0, ptr %"tmp#16##0"
   ret void
 }
 
-define external fastcc void @"int_list.remove<0>[410bae77d3]"(i64 %"lst##0", i64 %"v##0", ptr %"tmp#16##0") {
+define external fastcc void @"int_list#.remove<0>[410bae77d3]"(i64 %"lst##0", i64 %"v##0", ptr %"tmp#16##0") {
   %"tmp#8##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2114,19 +2114,19 @@ if.else.1:
   store i64 %"lst##0", ptr %"tmp#16##0"
   %"tmp#20##0" = add i64 %"lst##0", 8
   %"tmp#21##0" = inttoptr i64 %"tmp#20##0" to ptr
-  musttail call fastcc void @"int_list.remove<0>[410bae77d3]"(i64 %"t##0", i64 %"v##0", ptr %"tmp#21##0")
+  musttail call fastcc void @"int_list#.remove<0>[410bae77d3]"(i64 %"t##0", i64 %"v##0", ptr %"tmp#21##0")
   ret void
 if.else.0:
   store i64 0, ptr %"tmp#16##0"
   ret void
 }
 
-define external fastcc i64 @"int_list.reverse<0>"(i64 %"lst##0") {
-  %"tmp#2##0" = tail call fastcc i64 @"int_list.reverse_helper<0>"(i64 %"lst##0", i64 0)
+define external fastcc i64 @"int_list#.reverse<0>"(i64 %"lst##0") {
+  %"tmp#2##0" = tail call fastcc i64 @"int_list#.reverse_helper<0>"(i64 %"lst##0", i64 0)
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"int_list.reverse_helper<0>"(i64 %"lst##0", i64 %"acc##0") {
+define external fastcc i64 @"int_list#.reverse_helper<0>"(i64 %"lst##0", i64 %"acc##0") {
   %"tmp#5##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2142,13 +2142,13 @@ if.then.0:
   %"tmp#16##0" = add i64 %"tmp#8##0", 8
   %"tmp#17##0" = inttoptr i64 %"tmp#16##0" to ptr
   store i64 %"acc##0", ptr %"tmp#17##0"
-  %"tmp#18##0" = tail call fastcc i64 @"int_list.reverse_helper<0>"(i64 %"t##0", i64 %"tmp#8##0")
+  %"tmp#18##0" = tail call fastcc i64 @"int_list#.reverse_helper<0>"(i64 %"t##0", i64 %"tmp#8##0")
   ret i64 %"tmp#18##0"
 if.else.0:
   ret i64 %"acc##0"
 }
 
-define external fastcc i64 @"int_list.reverse_helper<0>[410bae77d3]"(i64 %"lst##0", i64 %"acc##0") {
+define external fastcc i64 @"int_list#.reverse_helper<0>[410bae77d3]"(i64 %"lst##0", i64 %"acc##0") {
   %"tmp#5##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2158,13 +2158,13 @@ if.then.0:
   %"tmp#13##0" = add i64 %"lst##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   store i64 %"acc##0", ptr %"tmp#14##0"
-  %"tmp#15##0" = tail call fastcc i64 @"int_list.reverse_helper<0>[410bae77d3]"(i64 %"t##0", i64 %"lst##0")
+  %"tmp#15##0" = tail call fastcc i64 @"int_list#.reverse_helper<0>[410bae77d3]"(i64 %"t##0", i64 %"lst##0")
   ret i64 %"tmp#15##0"
 if.else.0:
   ret i64 %"acc##0"
 }
 
-define external fastcc i64 @"int_list.sort<0>"(i64 %"lst##0") {
+define external fastcc i64 @"int_list#.sort<0>"(i64 %"lst##0") {
   %"tmp#10##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#10##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2174,13 +2174,13 @@ if.then.0:
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
   %"t##0" = load i64, ptr %"tmp#18##0"
   %"tmp#19##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.lesser<0>"(i64 %"t##0", i64 %"h##0", ptr %"tmp#19##0")
+  call fastcc void @"int_list#.lesser<0>"(i64 %"t##0", i64 %"h##0", ptr %"tmp#19##0")
   %"tmp#3##0" = load i64, ptr %"tmp#19##0"
-  %"tmp#2##0" = call fastcc i64 @"int_list.sort<0>[410bae77d3]"(i64 %"tmp#3##0")
+  %"tmp#2##0" = call fastcc i64 @"int_list#.sort<0>[410bae77d3]"(i64 %"tmp#3##0")
   %"tmp#20##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.greater<0>"(i64 %"t##0", i64 %"h##0", ptr %"tmp#20##0")
+  call fastcc void @"int_list#.greater<0>"(i64 %"t##0", i64 %"h##0", ptr %"tmp#20##0")
   %"tmp#6##0" = load i64, ptr %"tmp#20##0"
-  %"tmp#5##0" = call fastcc i64 @"int_list.sort<0>[410bae77d3]"(i64 %"tmp#6##0")
+  %"tmp#5##0" = call fastcc i64 @"int_list#.sort<0>[410bae77d3]"(i64 %"tmp#6##0")
   %"tmp#21##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#13##0" = ptrtoint ptr %"tmp#21##0" to i64
   %"tmp#22##0" = inttoptr i64 %"tmp#13##0" to ptr
@@ -2189,14 +2189,14 @@ if.then.0:
   %"tmp#24##0" = inttoptr i64 %"tmp#23##0" to ptr
   store i64 %"tmp#5##0", ptr %"tmp#24##0"
   %"tmp#25##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.extend<0>[410bae77d3]"(i64 %"tmp#2##0", i64 %"tmp#13##0", ptr %"tmp#25##0")
+  call fastcc void @"int_list#.extend<0>[410bae77d3]"(i64 %"tmp#2##0", i64 %"tmp#13##0", ptr %"tmp#25##0")
   %"tmp#26##0" = load i64, ptr %"tmp#25##0"
   ret i64 %"tmp#26##0"
 if.else.0:
   ret i64 0
 }
 
-define external fastcc i64 @"int_list.sort<0>[410bae77d3]"(i64 %"lst##0") {
+define external fastcc i64 @"int_list#.sort<0>[410bae77d3]"(i64 %"lst##0") {
   %"tmp#10##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#10##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2206,18 +2206,18 @@ if.then.0:
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
   %"t##0" = load i64, ptr %"tmp#18##0"
   %"tmp#19##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.lesser<0>"(i64 %"t##0", i64 %"h##0", ptr %"tmp#19##0")
+  call fastcc void @"int_list#.lesser<0>"(i64 %"t##0", i64 %"h##0", ptr %"tmp#19##0")
   %"tmp#3##0" = load i64, ptr %"tmp#19##0"
-  %"tmp#2##0" = call fastcc i64 @"int_list.sort<0>[410bae77d3]"(i64 %"tmp#3##0")
+  %"tmp#2##0" = call fastcc i64 @"int_list#.sort<0>[410bae77d3]"(i64 %"tmp#3##0")
   %"tmp#20##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.greater<0>[410bae77d3]"(i64 %"t##0", i64 %"h##0", ptr %"tmp#20##0")
+  call fastcc void @"int_list#.greater<0>[410bae77d3]"(i64 %"t##0", i64 %"h##0", ptr %"tmp#20##0")
   %"tmp#6##0" = load i64, ptr %"tmp#20##0"
-  %"tmp#5##0" = call fastcc i64 @"int_list.sort<0>[410bae77d3]"(i64 %"tmp#6##0")
+  %"tmp#5##0" = call fastcc i64 @"int_list#.sort<0>[410bae77d3]"(i64 %"tmp#6##0")
   %"tmp#21##0" = add i64 %"lst##0", 8
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   store i64 %"tmp#5##0", ptr %"tmp#22##0"
   %"tmp#23##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.extend<0>[410bae77d3]"(i64 %"tmp#2##0", i64 %"lst##0", ptr %"tmp#23##0")
+  call fastcc void @"int_list#.extend<0>[410bae77d3]"(i64 %"tmp#2##0", i64 %"lst##0", ptr %"tmp#23##0")
   %"tmp#24##0" = load i64, ptr %"tmp#23##0"
   ret i64 %"tmp#24##0"
 if.else.0:
@@ -2395,7 +2395,7 @@ target triple   = ???
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"int_list.int_list.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"int_list#.int_list#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2415,7 +2415,7 @@ if.then.1:
   %"tmp#4##0" = icmp eq i64 %"#left#head##0", %"#right#head##0"
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#18##0" = tail call fastcc i1 @"int_list.int_list.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
+  %"tmp#18##0" = tail call fastcc i1 @"int_list#.int_list#.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
   ret i1 %"tmp#18##0"
 if.else.2:
   ret i1 0
@@ -2426,7 +2426,7 @@ if.else.0:
   ret i1 %"tmp#19##0"
 }
 
-define external fastcc i64 @"int_list.int_list.cons<0>"(i64 %"head##0", i64 %"tail##0") {
+define external fastcc i64 @"int_list#.int_list#.cons<0>"(i64 %"head##0", i64 %"tail##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -2437,7 +2437,7 @@ define external fastcc i64 @"int_list.int_list.cons<0>"(i64 %"head##0", i64 %"ta
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"int_list.int_list.cons<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"int_list#.int_list#.cons<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2457,7 +2457,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"int_list.int_list.head<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"int_list#.int_list#.head<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2472,7 +2472,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"int_list.int_list.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"int_list#.int_list#.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2491,11 +2491,11 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"int_list.int_list.nil<0>"() {
+define external fastcc i64 @"int_list#.int_list#.nil<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"int_list.int_list.tail<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"int_list#.int_list#.tail<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2511,7 +2511,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"int_list.int_list.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"int_list#.int_list#.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -2531,8 +2531,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"int_list.int_list.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"int_list.int_list.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"int_list#.int_list#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"int_list#.int_list#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
@@ -2773,161 +2773,161 @@ target triple   = ???
 @"string#14" = private unnamed_addr constant {i64, i64} { i64 19, i64 ptrtoint( ptr @"cstring#6" to i64 ) }, align 8
 @"string#15" = private unnamed_addr constant {i64, i64} { i64 6, i64 ptrtoint( ptr @"cstring#7" to i64 ) }, align 8
 
-declare external fastcc i64 @"int_list.append<0>"(i64, i64)
-declare external fastcc i64 @"int_list.append<0>[410bae77d3]"(i64, i64)
-declare external fastcc void @"int_list.extend<0>[410bae77d3]"(i64, i64, ptr)
-declare external fastcc void @"int_list.insert<0>[410bae77d3]"(i64, i64, i64, ptr)
-declare external fastcc void @"int_list.pop<0>[410bae77d3]"(i64, i64, ptr)
-declare external fastcc void @"int_list.print<0>"(i64)
-declare external fastcc i64 @"int_list.range#cont#1<0>[410bae77d3]"(i64, i64, i64, i64)
-declare external fastcc void @"int_list.remove<0>[410bae77d3]"(i64, i64, ptr)
-declare external fastcc i64 @"int_list.reverse_helper<0>"(i64, i64)
-declare external fastcc i64 @"int_list.reverse_helper<0>[410bae77d3]"(i64, i64)
-declare external fastcc i64 @"int_list.sort<0>[410bae77d3]"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"int_list#.append<0>"(i64, i64)
+declare external fastcc i64 @"int_list#.append<0>[410bae77d3]"(i64, i64)
+declare external fastcc void @"int_list#.extend<0>[410bae77d3]"(i64, i64, ptr)
+declare external fastcc void @"int_list#.insert<0>[410bae77d3]"(i64, i64, i64, ptr)
+declare external fastcc void @"int_list#.pop<0>[410bae77d3]"(i64, i64, ptr)
+declare external fastcc void @"int_list#.print<0>"(i64)
+declare external fastcc i64 @"int_list#.range#cont#1<0>[410bae77d3]"(i64, i64, i64, i64)
+declare external fastcc void @"int_list#.remove<0>[410bae77d3]"(i64, i64, ptr)
+declare external fastcc i64 @"int_list#.reverse_helper<0>"(i64, i64)
+declare external fastcc i64 @"int_list#.reverse_helper<0>[410bae77d3]"(i64, i64)
+declare external fastcc i64 @"int_list#.sort<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc i64 @malloc_count()
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"int_list_test.<0>"() {
+define external fastcc void @"int_list_test#.<0>"() {
   %"mc1##0" = call ccc i64 @malloc_count()
-  %"tmp#0##0" = tail call fastcc i64 @"int_list.range#cont#1<0>[410bae77d3]"(i64 0, i64 1, i64 1, i64 10)
-  %"tmp#1##0" = tail call fastcc i64 @"int_list.range#cont#1<0>[410bae77d3]"(i64 0, i64 2, i64 2, i64 20)
-  %"tmp#2##0" = tail call fastcc i64 @"int_list.range#cont#1<0>[410bae77d3]"(i64 0, i64 3, i64 3, i64 30)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
+  %"tmp#0##0" = tail call fastcc i64 @"int_list#.range#cont#1<0>[410bae77d3]"(i64 0, i64 1, i64 1, i64 10)
+  %"tmp#1##0" = tail call fastcc i64 @"int_list#.range#cont#1<0>[410bae77d3]"(i64 0, i64 2, i64 2, i64 20)
+  %"tmp#2##0" = tail call fastcc i64 @"int_list#.range#cont#1<0>[410bae77d3]"(i64 0, i64 3, i64 3, i64 30)
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"tmp#1##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"tmp#1##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"tmp#2##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
   %"mc2##0" = call ccc i64 @malloc_count()
   %"tmp#3##0" = sub i64 %"mc2##0", %"mc1##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
   call ccc void @putchar(i8 10)
   %"mc1##1" = call ccc i64 @malloc_count()
-  tail call fastcc void @"int_list_test.test_int_list<0>"(i64 %"tmp#0##0", i64 %"tmp#1##0", i64 %"tmp#2##0")
+  tail call fastcc void @"int_list_test#.test_int_list<0>"(i64 %"tmp#0##0", i64 %"tmp#1##0", i64 %"tmp#2##0")
   %"mc2##1" = call ccc i64 @malloc_count()
   %"tmp#4##0" = sub i64 %"mc2##1", %"mc1##1"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"tmp#1##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"tmp#1##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"tmp#2##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
   call ccc void @putchar(i8 10)
   %"mc1##2" = call ccc i64 @malloc_count()
-  tail call fastcc void @"int_list_test.test_int_list<0>[9e35cb823b]"(i64 %"tmp#0##0", i64 %"tmp#1##0", i64 %"tmp#2##0")
+  tail call fastcc void @"int_list_test#.test_int_list<0>[9e35cb823b]"(i64 %"tmp#0##0", i64 %"tmp#1##0", i64 %"tmp#2##0")
   %"mc2##2" = call ccc i64 @malloc_count()
   %"tmp#5##0" = sub i64 %"mc2##2", %"mc1##2"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
   call ccc void @print_int(i64 %"tmp#3##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @print_int(i64 %"tmp#4##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
   call ccc void @print_int(i64 %"tmp#5##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"int_list_test.test_int_list<0>"(i64 %"x##0", i64 %"y##0", i64 %"z##0") {
-  %"x##1" = tail call fastcc i64 @"int_list.reverse_helper<0>"(i64 %"x##0", i64 0)
-  %"z##1" = tail call fastcc i64 @"int_list.reverse_helper<0>"(i64 %"z##0", i64 0)
-  %"tmp#0##0" = tail call fastcc i64 @"int_list.append<0>"(i64 %"y##0", i64 99)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1207)
+define external fastcc void @"int_list_test#.test_int_list<0>"(i64 %"x##0", i64 %"y##0", i64 %"z##0") {
+  %"x##1" = tail call fastcc i64 @"int_list#.reverse_helper<0>"(i64 %"x##0", i64 0)
+  %"z##1" = tail call fastcc i64 @"int_list#.reverse_helper<0>"(i64 %"z##0", i64 0)
+  %"tmp#0##0" = tail call fastcc i64 @"int_list#.append<0>"(i64 %"y##0", i64 99)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1207)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"x##1")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"x##1")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"z##1")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"z##1")
   call ccc void @putchar(i8 10)
   %"tmp#58##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.extend<0>[410bae77d3]"(i64 %"x##1", i64 %"tmp#0##0", ptr %"tmp#58##0")
+  call fastcc void @"int_list#.extend<0>[410bae77d3]"(i64 %"x##1", i64 %"tmp#0##0", ptr %"tmp#58##0")
   %"tmp#1##0" = load i64, ptr %"tmp#58##0"
   %"tmp#59##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.extend<0>[410bae77d3]"(i64 %"tmp#1##0", i64 %"z##1", ptr %"tmp#59##0")
+  call fastcc void @"int_list#.extend<0>[410bae77d3]"(i64 %"tmp#1##0", i64 %"z##1", ptr %"tmp#59##0")
   %"tmp#2##0" = load i64, ptr %"tmp#59##0"
-  call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1207)
+  call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1207)
   call ccc void @putchar(i8 10)
-  call fastcc void @"int_list.print<0>"(i64 %"tmp#2##0")
+  call fastcc void @"int_list#.print<0>"(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
   %"tmp#60##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.insert<0>[410bae77d3]"(i64 %"tmp#2##0", i64 4, i64 78, ptr %"tmp#60##0")
+  call fastcc void @"int_list#.insert<0>[410bae77d3]"(i64 %"tmp#2##0", i64 4, i64 78, ptr %"tmp#60##0")
   %"tmp#3##0" = load i64, ptr %"tmp#60##0"
   %"tmp#61##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.pop<0>[410bae77d3]"(i64 %"tmp#3##0", i64 20, ptr %"tmp#61##0")
+  call fastcc void @"int_list#.pop<0>[410bae77d3]"(i64 %"tmp#3##0", i64 20, ptr %"tmp#61##0")
   %"tmp#4##0" = load i64, ptr %"tmp#61##0"
   %"tmp#62##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.remove<0>[410bae77d3]"(i64 %"tmp#4##0", i64 2, ptr %"tmp#62##0")
+  call fastcc void @"int_list#.remove<0>[410bae77d3]"(i64 %"tmp#4##0", i64 2, ptr %"tmp#62##0")
   %"tmp#5##0" = load i64, ptr %"tmp#62##0"
-  call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1207)
+  call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1207)
   call ccc void @putchar(i8 10)
-  call fastcc void @"int_list.print<0>"(i64 %"tmp#5##0")
+  call fastcc void @"int_list#.print<0>"(i64 %"tmp#5##0")
   call ccc void @putchar(i8 10)
-  %"l##5" = call fastcc i64 @"int_list.sort<0>[410bae77d3]"(i64 %"tmp#5##0")
-  call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1207)
+  %"l##5" = call fastcc i64 @"int_list#.sort<0>[410bae77d3]"(i64 %"tmp#5##0")
+  call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1207)
   call ccc void @putchar(i8 10)
-  call fastcc void @"int_list.print<0>"(i64 %"l##5")
+  call fastcc void @"int_list#.print<0>"(i64 %"l##5")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"int_list_test.test_int_list<0>[9e35cb823b]"(i64 %"x##0", i64 %"y##0", i64 %"z##0") {
-  %"x##1" = tail call fastcc i64 @"int_list.reverse_helper<0>[410bae77d3]"(i64 %"x##0", i64 0)
-  %"z##1" = tail call fastcc i64 @"int_list.reverse_helper<0>[410bae77d3]"(i64 %"z##0", i64 0)
-  %"tmp#0##0" = tail call fastcc i64 @"int_list.append<0>[410bae77d3]"(i64 %"y##0", i64 99)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1207)
+define external fastcc void @"int_list_test#.test_int_list<0>[9e35cb823b]"(i64 %"x##0", i64 %"y##0", i64 %"z##0") {
+  %"x##1" = tail call fastcc i64 @"int_list#.reverse_helper<0>[410bae77d3]"(i64 %"x##0", i64 0)
+  %"z##1" = tail call fastcc i64 @"int_list#.reverse_helper<0>[410bae77d3]"(i64 %"z##0", i64 0)
+  %"tmp#0##0" = tail call fastcc i64 @"int_list#.append<0>[410bae77d3]"(i64 %"y##0", i64 99)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1207)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"x##1")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"x##1")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_list.print<0>"(i64 %"z##1")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"z##1")
   call ccc void @putchar(i8 10)
   %"tmp#58##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.extend<0>[410bae77d3]"(i64 %"x##1", i64 %"tmp#0##0", ptr %"tmp#58##0")
+  call fastcc void @"int_list#.extend<0>[410bae77d3]"(i64 %"x##1", i64 %"tmp#0##0", ptr %"tmp#58##0")
   %"tmp#1##0" = load i64, ptr %"tmp#58##0"
   %"tmp#59##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.extend<0>[410bae77d3]"(i64 %"tmp#1##0", i64 %"z##1", ptr %"tmp#59##0")
+  call fastcc void @"int_list#.extend<0>[410bae77d3]"(i64 %"tmp#1##0", i64 %"z##1", ptr %"tmp#59##0")
   %"tmp#2##0" = load i64, ptr %"tmp#59##0"
-  call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1207)
+  call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1207)
   call ccc void @putchar(i8 10)
-  call fastcc void @"int_list.print<0>"(i64 %"tmp#2##0")
+  call fastcc void @"int_list#.print<0>"(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
   %"tmp#60##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.insert<0>[410bae77d3]"(i64 %"tmp#2##0", i64 4, i64 78, ptr %"tmp#60##0")
+  call fastcc void @"int_list#.insert<0>[410bae77d3]"(i64 %"tmp#2##0", i64 4, i64 78, ptr %"tmp#60##0")
   %"tmp#3##0" = load i64, ptr %"tmp#60##0"
   %"tmp#61##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.pop<0>[410bae77d3]"(i64 %"tmp#3##0", i64 20, ptr %"tmp#61##0")
+  call fastcc void @"int_list#.pop<0>[410bae77d3]"(i64 %"tmp#3##0", i64 20, ptr %"tmp#61##0")
   %"tmp#4##0" = load i64, ptr %"tmp#61##0"
   %"tmp#62##0" = alloca i8, i64 8, align 8
-  call fastcc void @"int_list.remove<0>[410bae77d3]"(i64 %"tmp#4##0", i64 2, ptr %"tmp#62##0")
+  call fastcc void @"int_list#.remove<0>[410bae77d3]"(i64 %"tmp#4##0", i64 2, ptr %"tmp#62##0")
   %"tmp#5##0" = load i64, ptr %"tmp#62##0"
-  call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1207)
+  call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1207)
   call ccc void @putchar(i8 10)
-  call fastcc void @"int_list.print<0>"(i64 %"tmp#5##0")
+  call fastcc void @"int_list#.print<0>"(i64 %"tmp#5##0")
   call ccc void @putchar(i8 10)
-  %"l##5" = call fastcc i64 @"int_list.sort<0>[410bae77d3]"(i64 %"tmp#5##0")
-  call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1207)
+  %"l##5" = call fastcc i64 @"int_list#.sort<0>[410bae77d3]"(i64 %"tmp#5##0")
+  call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1207)
   call ccc void @putchar(i8 10)
-  call fastcc void @"int_list.print<0>"(i64 %"l##5")
+  call fastcc void @"int_list#.print<0>"(i64 %"l##5")
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump-test.sh b/test-cases/final-dump-test.sh
index dcbc17d7..c4580869 100755
--- a/test-cases/final-dump-test.sh
+++ b/test-cases/final-dump-test.sh
@@ -23,7 +23,7 @@ do
 	    | sed -e 's/@\([A-Za-z0-9_]*\):[0-9:]*/@\1:nn:nn/g' \
             -e "s|`pwd`|!ROOT!|g" \
             -e 's/\[ [0-9][0-9]* x i8 \]/[ ?? x i8 ]/g' \
-			-e 's/^\(target triple *\)=.*/\1 ????/' \
+			-e 's/^\(target triple *= *\).*/\1????/' \
         > $out
 	# Add a newline to the end of a file if there isn't to resolve platform differences.
 	ed -s $out <<< w > /dev/null 2>&1
diff --git a/test-cases/final-dump/aaa.exp b/test-cases/final-dump/aaa.exp
index 79057806..b0f2f102 100644
--- a/test-cases/final-dump/aaa.exp
+++ b/test-cases/final-dump/aaa.exp
@@ -30,17 +30,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'aaa'
 
 source_filename = "!ROOT!/final-dump/aaa.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"AAA: Init\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 9, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"aaa.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"aaa#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -72,17 +72,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'bbb'
 
 source_filename = "!ROOT!/final-dump/bbb.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"BBB: Init\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 9, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"bbb.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"bbb#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -114,17 +114,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'ccc'
 
 source_filename = "!ROOT!/final-dump/ccc.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"CCC: Init\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 9, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ccc.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"ccc#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -155,17 +155,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'ddd'
 
 source_filename = "!ROOT!/final-dump/ddd.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"DDD: Init\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 9, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ddd.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"ddd#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/afterbreak.exp b/test-cases/final-dump/afterbreak.exp
index 9cb92b8c..6dd66caa 100644
--- a/test-cases/final-dump/afterbreak.exp
+++ b/test-cases/final-dump/afterbreak.exp
@@ -56,19 +56,19 @@ proc #cont#2 > {inline,semipure} (1 calls)
 ; ModuleID = 'afterbreak'
 
 source_filename = "!ROOT!/final-dump/afterbreak.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"afterbreak.<0>"() {
-  tail call fastcc void @"afterbreak.#cont#1<0>"(i64 1)
+define external fastcc void @"afterbreak#.<0>"() {
+  tail call fastcc void @"afterbreak#.#cont#1<0>"(i64 1)
   ret void
 }
 
-define external fastcc void @"afterbreak.#cont#1<0>"(i64 %"x##0") {
+define external fastcc void @"afterbreak#.#cont#1<0>"(i64 %"x##0") {
   %"tmp#1##0" = icmp sgt i64 %"x##0", 10
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -77,13 +77,13 @@ if.else.0:
   %"tmp#0##0" = add i64 %"x##0", 1
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"afterbreak.#cont#1<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"afterbreak#.#cont#1<0>"(i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"afterbreak.#cont#2<0>"(i64 %"y##0") {
+define external fastcc void @"afterbreak#.#cont#2<0>"(i64 %"y##0") {
   call ccc void @print_int(i64 %"y##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"afterbreak.#cont#1<0>"(i64 %"y##0")
+  tail call fastcc void @"afterbreak#.#cont#1<0>"(i64 %"y##0")
   ret void
 }
diff --git a/test-cases/final-dump/alias1.exp b/test-cases/final-dump/alias1.exp
index 38f01674..83e75564 100644
--- a/test-cases/final-dump/alias1.exp
+++ b/test-cases/final-dump/alias1.exp
@@ -153,7 +153,7 @@ replicate(p1##0:position.position, ?p2##0:position.position)<{<<wybe.io.io>>}; {
 ; ModuleID = 'alias1'
 
 source_filename = "!ROOT!/final-dump/alias1.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- Inside bar, after calling x(!p2, 555): \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- Inside bar: \00", align 8
@@ -186,27 +186,27 @@ target triple    ????
 @"string#28" = private unnamed_addr constant {i64, i64} { i64 24, i64 ptrtoint( ptr @"cstring#13" to i64 ) }, align 8
 @"string#29" = private unnamed_addr constant {i64, i64} { i64 12, i64 ptrtoint( ptr @"cstring#14" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias1.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#23" to i64 ))
+define external fastcc void @"alias1#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#23" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"alias1.foo<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
+  tail call fastcc void @"alias1#.foo<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"alias1.bar<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
+  tail call fastcc void @"alias1#.bar<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"alias1.baz<0>"()
+  tail call fastcc void @"alias1#.baz<0>"()
   ret void
 }
 
-define external fastcc void @"alias1.bar<0>"() {
+define external fastcc void @"alias1#.bar<0>"() {
   %"tmp#13##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#13##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -214,29 +214,29 @@ define external fastcc void @"alias1.bar<0>"() {
   %"tmp#15##0" = add i64 %"tmp#3##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 102, ptr %"tmp#16##0"
-  %"p2##0" = tail call fastcc i64 @"alias1.replicate<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
+  %"p2##0" = tail call fastcc i64 @"alias1#.replicate<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   %"tmp#17##0" = inttoptr i64 %"p2##0" to ptr
   %"tmp#18##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#18##0", ptr %"tmp#17##0", i64 16, i1 0)
   %"tmp#19##0" = ptrtoint ptr %"tmp#18##0" to i64
   %"tmp#20##0" = inttoptr i64 %"tmp#19##0" to ptr
   store i64 555, ptr %"tmp#20##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#27" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#19##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#27" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#19##0")
   ret void
 }
 
-define external fastcc void @"alias1.baz<0>"() {
+define external fastcc void @"alias1#.baz<0>"() {
   %"tmp#20##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#5##0" = ptrtoint ptr %"tmp#20##0" to i64
   %"tmp#21##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -244,13 +244,13 @@ define external fastcc void @"alias1.baz<0>"() {
   %"tmp#22##0" = add i64 %"tmp#5##0", 8
   %"tmp#23##0" = inttoptr i64 %"tmp#22##0" to ptr
   store i64 102, ptr %"tmp#23##0"
-  %"p2##0" = tail call fastcc i64 @"alias1.replicate<0>"(i64 %"tmp#5##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#18" to i64 ))
+  %"p2##0" = tail call fastcc i64 @"alias1#.replicate<0>"(i64 %"tmp#5##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#18" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#5##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#5##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   %"tmp#24##0" = add i64 %"p2##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#25##0"
@@ -261,26 +261,26 @@ define external fastcc void @"alias1.baz<0>"() {
   %"tmp#28##0" = add i64 %"tmp#13##0", 8
   %"tmp#29##0" = inttoptr i64 %"tmp#28##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#29##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#28" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#13##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#28" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#13##0")
   %"tmp#30##0" = inttoptr i64 %"tmp#5##0" to ptr
   %"tmp#31##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#31##0", ptr %"tmp#30##0", i64 16, i1 0)
   %"tmp#32##0" = ptrtoint ptr %"tmp#31##0" to i64
   %"tmp#33##0" = inttoptr i64 %"tmp#32##0" to ptr
   store i64 555, ptr %"tmp#33##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#17" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#17" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#25" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#32##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#28" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#13##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#25" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#32##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#28" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#13##0")
   ret void
 }
 
-define external fastcc void @"alias1.foo<0>"() {
+define external fastcc void @"alias1#.foo<0>"() {
   %"tmp#13##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#13##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -288,29 +288,29 @@ define external fastcc void @"alias1.foo<0>"() {
   %"tmp#15##0" = add i64 %"tmp#3##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 102, ptr %"tmp#16##0"
-  %"p2##0" = tail call fastcc i64 @"alias1.replicate<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#20" to i64 ))
+  %"p2##0" = tail call fastcc i64 @"alias1#.replicate<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#20" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   %"tmp#17##0" = inttoptr i64 %"tmp#3##0" to ptr
   %"tmp#18##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#18##0", ptr %"tmp#17##0", i64 16, i1 0)
   %"tmp#19##0" = ptrtoint ptr %"tmp#18##0" to i64
   %"tmp#20##0" = inttoptr i64 %"tmp#19##0" to ptr
   store i64 555, ptr %"tmp#20##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#19" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#19" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#25" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#19##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#25" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#19##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   ret void
 }
 
-define external fastcc i64 @"alias1.replicate<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias1#.replicate<0>"(i64 %"p1##0") {
   %"tmp#11##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#11##0" to i64
   %"tmp#12##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -318,7 +318,7 @@ define external fastcc i64 @"alias1.replicate<0>"(i64 %"p1##0") {
   %"tmp#13##0" = add i64 %"tmp#4##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   store i64 0, ptr %"tmp#14##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#29" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#29" to i64 ))
   %"tmp#15##0" = inttoptr i64 %"tmp#4##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#15##0"
   call ccc void @print_int(i64 %"tmp#1##0")
@@ -373,28 +373,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -507,13 +507,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -533,7 +533,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -544,7 +544,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -555,13 +555,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -571,14 +571,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -589,7 +589,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias2.exp b/test-cases/final-dump/alias2.exp
index 9270e7d8..24764291 100644
--- a/test-cases/final-dump/alias2.exp
+++ b/test-cases/final-dump/alias2.exp
@@ -75,7 +75,7 @@ pcopy(p1##0:position.position, ?p2##2:position.position)<{<<wybe.io.io>>}; {<<wy
 ; ModuleID = 'alias2'
 
 source_filename = "!ROOT!/final-dump/alias2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling pcopy: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- Inside pcopy: \00", align 8
@@ -88,14 +88,14 @@ target triple    ????
 @"string#8" = private unnamed_addr constant {i64, i64} { i64 16, i64 ptrtoint( ptr @"cstring#3" to i64 ) }, align 8
 @"string#9" = private unnamed_addr constant {i64, i64} { i64 15, i64 ptrtoint( ptr @"cstring#4" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias2.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+define external fastcc void @"alias2#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @putchar(i8 10)
   %"tmp#11##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#6##0" = ptrtoint ptr %"tmp#11##0" to i64
@@ -104,15 +104,15 @@ define external fastcc void @"alias2.<0>"() {
   %"tmp#13##0" = add i64 %"tmp#6##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   store i64 20, ptr %"tmp#14##0"
-  %"r##0" = tail call fastcc i64 @"alias2.pcopy<0>"(i64 %"tmp#6##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  %"r##0" = tail call fastcc i64 @"alias2#.pcopy<0>"(i64 %"tmp#6##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"r##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"r##0")
   ret void
 }
 
-define external fastcc i64 @"alias2.fcopy<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias2#.fcopy<0>"(i64 %"p1##0") {
   %"tmp#13##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#5##0" = ptrtoint ptr %"tmp#13##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -133,7 +133,7 @@ define external fastcc i64 @"alias2.fcopy<0>"(i64 %"p1##0") {
   ret i64 %"tmp#5##0"
 }
 
-define external fastcc i64 @"alias2.pcopy<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias2#.pcopy<0>"(i64 %"p1##0") {
   %"tmp#16##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#5##0" = ptrtoint ptr %"tmp#16##0" to i64
   %"tmp#17##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -151,10 +151,10 @@ define external fastcc i64 @"alias2.pcopy<0>"(i64 %"p1##0") {
   %"tmp#24##0" = add i64 %"tmp#5##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#25##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#5##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#5##0")
   ret i64 %"tmp#5##0"
 }
 
@@ -205,28 +205,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -339,13 +339,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -365,7 +365,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -376,7 +376,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -387,13 +387,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -403,14 +403,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -421,7 +421,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias3.exp b/test-cases/final-dump/alias3.exp
index 4d512457..c707a2aa 100644
--- a/test-cases/final-dump/alias3.exp
+++ b/test-cases/final-dump/alias3.exp
@@ -75,7 +75,7 @@ replicate1(p1##0:position.position, ?p2##2:position.position)<{<<wybe.io.io>>};
 ; ModuleID = 'alias3'
 
 source_filename = "!ROOT!/final-dump/alias3.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling replicate1: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling x(!p1, 555): \00", align 8
@@ -90,18 +90,18 @@ target triple    ????
 @"string#10" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#4" to i64 ) }, align 8
 @"string#11" = private unnamed_addr constant {i64, i64} { i64 15, i64 ptrtoint( ptr @"cstring#5" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias3.<0>"() {
-  tail call fastcc void @"alias3.bar<0>"()
+define external fastcc void @"alias3#.<0>"() {
+  tail call fastcc void @"alias3#.bar<0>"()
   ret void
 }
 
-define external fastcc void @"alias3.bar<0>"() {
+define external fastcc void @"alias3#.bar<0>"() {
   %"tmp#13##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#13##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -109,29 +109,29 @@ define external fastcc void @"alias3.bar<0>"() {
   %"tmp#15##0" = add i64 %"tmp#3##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 1, ptr %"tmp#16##0"
-  %"p2##0" = tail call fastcc i64 @"alias3.replicate1<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  %"p2##0" = tail call fastcc i64 @"alias3#.replicate1<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   %"tmp#17##0" = inttoptr i64 %"tmp#3##0" to ptr
   store i64 555, ptr %"tmp#17##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   ret void
 }
 
-define external fastcc i64 @"alias3.replicate1<0>"(i64 %"p1##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+define external fastcc i64 @"alias3#.replicate1<0>"(i64 %"p1##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p1##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p1##0")
   %"tmp#7##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#8##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#8##0", ptr %"tmp#7##0", i64 16, i1 0)
@@ -141,10 +141,10 @@ define external fastcc i64 @"alias3.replicate1<0>"(i64 %"p1##0") {
   %"tmp#11##0" = add i64 %"tmp#9##0", 8
   %"tmp#12##0" = inttoptr i64 %"tmp#11##0" to ptr
   store i64 2, ptr %"tmp#12##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p1##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#9##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p1##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#9##0")
   ret i64 %"tmp#9##0"
 }
 
@@ -195,28 +195,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -329,13 +329,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -355,7 +355,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -366,7 +366,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -377,13 +377,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -393,14 +393,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -411,7 +411,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias4.exp b/test-cases/final-dump/alias4.exp
index 45fcae6a..9210a6f3 100644
--- a/test-cases/final-dump/alias4.exp
+++ b/test-cases/final-dump/alias4.exp
@@ -76,7 +76,7 @@ replicate1(p1##0:position.position, ?p2##0:position.position)<{<<wybe.io.io>>};
 ; ModuleID = 'alias4'
 
 source_filename = "!ROOT!/final-dump/alias4.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling replicate1: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling x(!p1, 555): \00", align 8
@@ -91,19 +91,19 @@ target triple    ????
 @"string#10" = private unnamed_addr constant {i64, i64} { i64 19, i64 ptrtoint( ptr @"cstring#4" to i64 ) }, align 8
 @"string#11" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#5" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias4.<0>"() {
-  tail call fastcc void @"alias4.bar<0>"()
+define external fastcc void @"alias4#.<0>"() {
+  tail call fastcc void @"alias4#.bar<0>"()
   ret void
 }
 
-define external fastcc void @"alias4.bar<0>"() {
+define external fastcc void @"alias4#.bar<0>"() {
   %"tmp#13##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#13##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -111,25 +111,25 @@ define external fastcc void @"alias4.bar<0>"() {
   %"tmp#15##0" = add i64 %"tmp#3##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 100, ptr %"tmp#16##0"
-  %"p2##0" = tail call fastcc i64 @"alias4.replicate1<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  %"p2##0" = tail call fastcc i64 @"alias4#.replicate1<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   %"tmp#17##0" = inttoptr i64 %"tmp#3##0" to ptr
   store i64 555, ptr %"tmp#17##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   ret void
 }
 
-define external fastcc i64 @"alias4.replicate1<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias4#.replicate1<0>"(i64 %"p1##0") {
   %"tmp#21##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#6##0" = ptrtoint ptr %"tmp#21##0" to i64
   %"tmp#22##0" = inttoptr i64 %"tmp#6##0" to ptr
@@ -137,7 +137,7 @@ define external fastcc i64 @"alias4.replicate1<0>"(i64 %"p1##0") {
   %"tmp#23##0" = add i64 %"tmp#6##0", 8
   %"tmp#24##0" = inttoptr i64 %"tmp#23##0" to ptr
   store i64 0, ptr %"tmp#24##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
   call ccc void @putchar(i8 10)
   %"tmp#25##0" = inttoptr i64 %"tmp#6##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
@@ -200,28 +200,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -334,13 +334,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -360,7 +360,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -371,7 +371,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -382,13 +382,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -398,14 +398,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -416,7 +416,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias5.exp b/test-cases/final-dump/alias5.exp
index 921bfa9c..8f805263 100644
--- a/test-cases/final-dump/alias5.exp
+++ b/test-cases/final-dump/alias5.exp
@@ -72,7 +72,7 @@ replicate1(v1##0:wybe.int, ?v2##0:wybe.int, v3##0:wybe.int, ?v4##1:wybe.int)<{<<
 ; ModuleID = 'alias5'
 
 source_filename = "!ROOT!/final-dump/alias5.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"expect p1=111: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"expect p2=100: \00", align 8
@@ -85,40 +85,40 @@ target triple    ????
 @"string#8" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#3" to i64 ) }, align 8
 @"string#9" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#4" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias5.<0>"() {
-  tail call fastcc void @"alias5.bar<0>"()
+define external fastcc void @"alias5#.<0>"() {
+  tail call fastcc void @"alias5#.bar<0>"()
   ret void
 }
 
-define external fastcc void @"alias5.bar<0>"() {
-  %"tmp#16##0" = tail call fastcc {i64, i64} @"alias5.replicate1<0>"(i64 100, i64 800)
+define external fastcc void @"alias5#.bar<0>"() {
+  %"tmp#16##0" = tail call fastcc {i64, i64} @"alias5#.replicate1<0>"(i64 100, i64 800)
   %"p2##0" = extractvalue {i64, i64}%"tmp#16##0", 0
   %"p4##0" = extractvalue {i64, i64}%"tmp#16##0", 1
-  %"tmp#17##0" = tail call fastcc {i64, i64} @"alias5.replicate1<0>"(i64 100, i64 800)
+  %"tmp#17##0" = tail call fastcc {i64, i64} @"alias5#.replicate1<0>"(i64 100, i64 800)
   %"p3##0" = extractvalue {i64, i64}%"tmp#17##0", 0
   %"p4##1" = extractvalue {i64, i64}%"tmp#17##0", 1
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @print_int(i64 111)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   call ccc void @print_int(i64 %"p2##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @print_int(i64 %"p3##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
   call ccc void @print_int(i64 %"p4##1")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc {i64, i64} @"alias5.replicate1<0>"(i64 %"v1##0", i64 %"v3##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+define external fastcc {i64, i64} @"alias5#.replicate1<0>"(i64 %"v1##0", i64 %"v3##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @print_int(i64 2)
   call ccc void @putchar(i8 10)
   %"tmp#0##0" = add i64 %"v3##0", 100
diff --git a/test-cases/final-dump/alias_cyclic.exp b/test-cases/final-dump/alias_cyclic.exp
index 1b61838d..c6628615 100644
--- a/test-cases/final-dump/alias_cyclic.exp
+++ b/test-cases/final-dump/alias_cyclic.exp
@@ -106,24 +106,24 @@ updateY(p1##0:position.position, ?p2##0:position.position)<{<<wybe.io.io>>}; {<<
 ; ModuleID = 'alias_cyclic'
 
 source_filename = "!ROOT!/final-dump/alias_cyclic.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"p1(100,900):\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"p2(102,900):\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 12, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 12, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_cyclic.<0>"() {
-  tail call fastcc void @"alias_cyclic.bar<0>"()
+define external fastcc void @"alias_cyclic#.<0>"() {
+  tail call fastcc void @"alias_cyclic#.bar<0>"()
   ret void
 }
 
-define external fastcc void @"alias_cyclic.bar<0>"() {
+define external fastcc void @"alias_cyclic#.bar<0>"() {
   %"tmp#5##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#5##0" to i64
   %"tmp#6##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -131,15 +131,15 @@ define external fastcc void @"alias_cyclic.bar<0>"() {
   %"tmp#7##0" = add i64 %"tmp#3##0", 8
   %"tmp#8##0" = inttoptr i64 %"tmp#7##0" to ptr
   store i64 900, ptr %"tmp#8##0"
-  %"p2##0" = tail call fastcc i64 @"alias_cyclic.updateX<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  %"p2##0" = tail call fastcc i64 @"alias_cyclic#.updateX<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   ret void
 }
 
-define external fastcc i64 @"alias_cyclic.updateX<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias_cyclic#.updateX<0>"(i64 %"p1##0") {
   %"tmp#12##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#12##0"
   %"tmp#3##0" = icmp sgt i64 %"tmp#0##0", 101
@@ -154,11 +154,11 @@ if.else.0:
   %"tmp#15##0" = ptrtoint ptr %"tmp#14##0" to i64
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#16##0"
-  %"tmp#17##0" = tail call fastcc i64 @"alias_cyclic.updateY<0>[410bae77d3]"(i64 %"tmp#15##0")
+  %"tmp#17##0" = tail call fastcc i64 @"alias_cyclic#.updateY<0>[410bae77d3]"(i64 %"tmp#15##0")
   ret i64 %"tmp#17##0"
 }
 
-define external fastcc i64 @"alias_cyclic.updateX<0>[410bae77d3]"(i64 %"p1##0") {
+define external fastcc i64 @"alias_cyclic#.updateX<0>[410bae77d3]"(i64 %"p1##0") {
   %"tmp#12##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#12##0"
   %"tmp#3##0" = icmp sgt i64 %"tmp#0##0", 101
@@ -169,11 +169,11 @@ if.else.0:
   %"tmp#2##0" = add i64 %"tmp#0##0", 1
   %"tmp#13##0" = inttoptr i64 %"p1##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#13##0"
-  %"tmp#14##0" = tail call fastcc i64 @"alias_cyclic.updateY<0>[410bae77d3]"(i64 %"p1##0")
+  %"tmp#14##0" = tail call fastcc i64 @"alias_cyclic#.updateY<0>[410bae77d3]"(i64 %"p1##0")
   ret i64 %"tmp#14##0"
 }
 
-define external fastcc i64 @"alias_cyclic.updateY<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias_cyclic#.updateY<0>"(i64 %"p1##0") {
   %"tmp#12##0" = add i64 %"p1##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#13##0"
@@ -190,11 +190,11 @@ if.else.0:
   %"tmp#17##0" = add i64 %"tmp#16##0", 8
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#18##0"
-  %"tmp#19##0" = tail call fastcc i64 @"alias_cyclic.updateX<0>[410bae77d3]"(i64 %"tmp#16##0")
+  %"tmp#19##0" = tail call fastcc i64 @"alias_cyclic#.updateX<0>[410bae77d3]"(i64 %"tmp#16##0")
   ret i64 %"tmp#19##0"
 }
 
-define external fastcc i64 @"alias_cyclic.updateY<0>[410bae77d3]"(i64 %"p1##0") {
+define external fastcc i64 @"alias_cyclic#.updateY<0>[410bae77d3]"(i64 %"p1##0") {
   %"tmp#12##0" = add i64 %"p1##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#13##0"
@@ -207,7 +207,7 @@ if.else.0:
   %"tmp#14##0" = add i64 %"p1##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#15##0"
-  %"tmp#16##0" = tail call fastcc i64 @"alias_cyclic.updateX<0>[410bae77d3]"(i64 %"p1##0")
+  %"tmp#16##0" = tail call fastcc i64 @"alias_cyclic#.updateX<0>[410bae77d3]"(i64 %"p1##0")
   ret i64 %"tmp#16##0"
 }
 
@@ -258,28 +258,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -392,13 +392,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -418,7 +418,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -429,7 +429,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -440,13 +440,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -456,14 +456,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -474,7 +474,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_data.exp b/test-cases/final-dump/alias_data.exp
index 4b072a06..fda74251 100644
--- a/test-cases/final-dump/alias_data.exp
+++ b/test-cases/final-dump/alias_data.exp
@@ -59,7 +59,7 @@ bar()<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'alias_data'
 
 source_filename = "!ROOT!/final-dump/alias_data.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"intro to cs\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"student1\00", align 8
@@ -68,22 +68,22 @@ target triple    ????
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 8, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 8, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 
-declare external fastcc void @"student.printStudent<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"student#.printStudent<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_data.<0>"() {
-  tail call fastcc void @"alias_data.bar<0>"()
+define external fastcc void @"alias_data#.<0>"() {
+  tail call fastcc void @"alias_data#.bar<0>"()
   ret void
 }
 
-define external fastcc i64 @"alias_data.backup<0>"(i64 %"student1##0") {
+define external fastcc i64 @"alias_data#.backup<0>"(i64 %"student1##0") {
   ret i64 %"student1##0"
 }
 
-define external fastcc void @"alias_data.bar<0>"() {
+define external fastcc void @"alias_data#.bar<0>"() {
   %"tmp#17##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#17##0" to i64
   %"tmp#18##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -98,12 +98,12 @@ define external fastcc void @"alias_data.bar<0>"() {
   %"tmp#23##0" = add i64 %"tmp#8##0", 8
   %"tmp#24##0" = inttoptr i64 %"tmp#23##0" to ptr
   store i64 %"tmp#4##0", ptr %"tmp#24##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"student.printStudent<0>"(i64 %"tmp#8##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"student#.printStudent<0>"(i64 %"tmp#8##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"student.printStudent<0>"(i64 %"tmp#8##0")
+  tail call fastcc void @"student#.printStudent<0>"(i64 %"tmp#8##0")
   ret void
 }
 
@@ -184,7 +184,7 @@ printStudent(stu##0:student.student)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'student'
 
 source_filename = "!ROOT!/final-dump/student.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Declarative Programming\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"course code: \00", align 8
@@ -195,13 +195,13 @@ target triple    ????
 @"string#6" = private unnamed_addr constant {i64, i64} { i64 13, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 @"string#7" = private unnamed_addr constant {i64, i64} { i64 12, i64 ptrtoint( ptr @"cstring#3" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"student.<0>"() {
+define external fastcc void @"student#.<0>"() {
   %"tmp#12##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#12##0" to i64
   %"tmp#13##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -216,12 +216,12 @@ define external fastcc void @"student.<0>"() {
   %"tmp#18##0" = add i64 %"tmp#9##0", 8
   %"tmp#19##0" = inttoptr i64 %"tmp#18##0" to ptr
   store i64 %"tmp#4##0", ptr %"tmp#19##0"
-  tail call fastcc void @"student.printStudent<0>"(i64 %"tmp#9##0")
+  tail call fastcc void @"student#.printStudent<0>"(i64 %"tmp#9##0")
   ret void
 }
 
-define external fastcc void @"student.printStudent<0>"(i64 %"stu##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+define external fastcc void @"student#.printStudent<0>"(i64 %"stu##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   %"tmp#19##0" = inttoptr i64 %"stu##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#19##0"
   call ccc void @print_int(i64 %"tmp#0##0")
@@ -229,16 +229,16 @@ define external fastcc void @"student.printStudent<0>"(i64 %"stu##0") {
   %"tmp#20##0" = add i64 %"stu##0", 8
   %"tmp#21##0" = inttoptr i64 %"tmp#20##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#21##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   %"tmp#22##0" = inttoptr i64 %"tmp#1##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#22##0"
   call ccc void @print_int(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   %"tmp#23##0" = add i64 %"tmp#1##0", 8
   %"tmp#24##0" = inttoptr i64 %"tmp#23##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#24##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#3##0")
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -353,14 +353,14 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'student.course'
 
 source_filename = "!ROOT!/final-dump/student.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"student.course.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"student#.course#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#10##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#code##0" = load i64, ptr %"tmp#10##0"
   %"tmp#11##0" = add i64 %"#left##0", 8
@@ -374,20 +374,20 @@ define external fastcc i1 @"student.course.=<0>"(i64 %"#left##0", i64 %"#right##
   %"tmp#1##0" = icmp eq i64 %"#left#code##0", %"#right#code##0"
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#9##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#name##0", i64 %"#right#name##0", i64 %"#left#name##0", i64 %"#right#name##0")
+  %"tmp#9##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#name##0", i64 %"#right#name##0", i64 %"#left#name##0", i64 %"#right#name##0")
   %"tmp#16##0" = icmp eq i2 %"tmp#9##0", 1
   ret i1 %"tmp#16##0"
 if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"student.course.code<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"student#.course#.code<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"student.course.code<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"student#.course#.code<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -397,7 +397,7 @@ define external fastcc i64 @"student.course.code<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"student.course.course<0>"(i64 %"code##0", i64 %"name##0") {
+define external fastcc i64 @"student#.course#.course<0>"(i64 %"code##0", i64 %"name##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -408,7 +408,7 @@ define external fastcc i64 @"student.course.course<0>"(i64 %"code##0", i64 %"nam
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"student.course.course<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"student#.course#.course<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -419,14 +419,14 @@ define external fastcc {i64, i64} @"student.course.course<1>"(i64 %"#result##0")
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"student.course.name<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"student#.course#.name<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"student.course.name<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"student#.course#.name<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -437,7 +437,7 @@ define external fastcc i64 @"student.course.name<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"student.course.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"student#.course#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -451,7 +451,7 @@ define external fastcc i1 @"student.course.~=<0>"(i64 %"#left##0", i64 %"#right#
   %"tmp#7##0" = icmp eq i64 %"tmp#3##0", %"tmp#5##0"
   br i1 %"tmp#7##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#8##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
+  %"tmp#8##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
   %"tmp#0##0" = icmp eq i2 %"tmp#8##0", 1
   %"tmp#15##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#15##0"
@@ -593,14 +593,14 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'student.student'
 
 source_filename = "!ROOT!/final-dump/student.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"student.student.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"student#.student#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#15##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#id##0" = load i64, ptr %"tmp#15##0"
   %"tmp#16##0" = add i64 %"#left##0", 8
@@ -627,7 +627,7 @@ if.then.0:
   %"tmp#13##0" = icmp eq i64 %"tmp#11##0", %"tmp#9##0"
   br i1 %"tmp#13##0", label %if.then.1, label %if.else.1
 if.then.1:
-  %"tmp#14##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#10##0", i64 %"tmp#12##0", i64 %"tmp#10##0", i64 %"tmp#12##0")
+  %"tmp#14##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#10##0", i64 %"tmp#12##0", i64 %"tmp#10##0", i64 %"tmp#12##0")
   %"tmp#27##0" = icmp eq i2 %"tmp#14##0", 1
   ret i1 %"tmp#27##0"
 if.else.1:
@@ -636,13 +636,13 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"student.student.id<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"student#.student#.id<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"student.student.id<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"student#.student#.id<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -652,14 +652,14 @@ define external fastcc i64 @"student.student.id<1>"(i64 %"#rec##0", i64 %"#field
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"student.student.major<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"student#.student#.major<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"student.student.major<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"student#.student#.major<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -670,7 +670,7 @@ define external fastcc i64 @"student.student.major<1>"(i64 %"#rec##0", i64 %"#fi
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"student.student.student<0>"(i64 %"id##0", i64 %"major##0") {
+define external fastcc i64 @"student#.student#.student<0>"(i64 %"id##0", i64 %"major##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -681,7 +681,7 @@ define external fastcc i64 @"student.student.student<0>"(i64 %"id##0", i64 %"maj
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"student.student.student<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"student#.student#.student<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -692,7 +692,7 @@ define external fastcc {i64, i64} @"student.student.student<1>"(i64 %"#result##0
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"student.student.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"student#.student#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#14##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#14##0"
   %"tmp#15##0" = add i64 %"#left##0", 8
@@ -719,7 +719,7 @@ if.then.0:
   %"tmp#12##0" = icmp eq i64 %"tmp#10##0", %"tmp#8##0"
   br i1 %"tmp#12##0", label %if.then.1, label %if.else.1
 if.then.1:
-  %"tmp#13##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#9##0", i64 %"tmp#11##0", i64 %"tmp#9##0", i64 %"tmp#11##0")
+  %"tmp#13##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#9##0", i64 %"tmp#11##0", i64 %"tmp#9##0", i64 %"tmp#11##0")
   %"tmp#0##0" = icmp eq i2 %"tmp#13##0", 1
   %"tmp#26##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#26##0"
diff --git a/test-cases/final-dump/alias_des.exp b/test-cases/final-dump/alias_des.exp
index 2ca03700..04b46a8a 100644
--- a/test-cases/final-dump/alias_des.exp
+++ b/test-cases/final-dump/alias_des.exp
@@ -61,7 +61,7 @@ replicate(?p2##1:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'alias_des'
 
 source_filename = "!ROOT!/final-dump/alias_des.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- after x(!p2, 20000) - expect p2(20000,103):\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"expect p1(10000,102):\00", align 8
@@ -70,26 +70,26 @@ target triple    ????
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 21, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 19, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_des.<0>"() {
-  tail call fastcc void @"alias_des.foo<0>"()
+define external fastcc void @"alias_des#.<0>"() {
+  tail call fastcc void @"alias_des#.foo<0>"()
   ret void
 }
 
-define external fastcc void @"alias_des.foo<0>"() {
-  %"p2##0" = tail call fastcc i64 @"alias_des.replicate<0>"()
+define external fastcc void @"alias_des#.foo<0>"() {
+  %"p2##0" = tail call fastcc i64 @"alias_des#.replicate<0>"()
   %"tmp#2##0" = inttoptr i64 %"p2##0" to ptr
   store i64 20000, ptr %"tmp#2##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   ret void
 }
 
-define external fastcc i64 @"alias_des.replicate<0>"() {
+define external fastcc i64 @"alias_des#.replicate<0>"() {
   %"tmp#23##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#8##0" = ptrtoint ptr %"tmp#23##0" to i64
   %"tmp#24##0" = inttoptr i64 %"tmp#8##0" to ptr
@@ -115,10 +115,10 @@ define external fastcc i64 @"alias_des.replicate<0>"() {
   %"tmp#35##0" = add i64 %"tmp#14##0", 8
   %"tmp#36##0" = inttoptr i64 %"tmp#35##0" to ptr
   store i64 %"tmp#4##0", ptr %"tmp#36##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#8##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#14##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#8##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#14##0")
   ret i64 %"tmp#14##0"
 }
 
@@ -169,28 +169,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -303,13 +303,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -329,7 +329,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -340,7 +340,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -351,13 +351,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -367,14 +367,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -385,7 +385,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_des2.exp b/test-cases/final-dump/alias_des2.exp
index b8ba0f6d..0a566ab8 100644
--- a/test-cases/final-dump/alias_des2.exp
+++ b/test-cases/final-dump/alias_des2.exp
@@ -31,17 +31,17 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'alias_des2'
 
 source_filename = "!ROOT!/final-dump/alias_des2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"expect pos(200,100):\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 20, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_des2.<0>"() {
+define external fastcc void @"alias_des2#.<0>"() {
   %"tmp#7##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#7##0" to i64
   %"tmp#8##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -51,8 +51,8 @@ define external fastcc void @"alias_des2.<0>"() {
   store i64 100, ptr %"tmp#10##0"
   %"tmp#11##0" = inttoptr i64 %"tmp#3##0" to ptr
   store i64 200, ptr %"tmp#11##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
   ret void
 }
 
@@ -103,28 +103,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -237,13 +237,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -263,7 +263,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -274,7 +274,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -285,13 +285,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -301,14 +301,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -319,7 +319,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_fork1.exp b/test-cases/final-dump/alias_fork1.exp
index 0089a5d6..9a6542d9 100644
--- a/test-cases/final-dump/alias_fork1.exp
+++ b/test-cases/final-dump/alias_fork1.exp
@@ -94,16 +94,16 @@ simpleMerge#cont#1(tmp#2##0:mytree.tree, ?#result##0:mytree.tree)<{}; {}; {}>:
 ; ModuleID = 'alias_fork1'
 
 source_filename = "!ROOT!/final-dump/alias_fork1.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_fork1.<0>"() {
+define external fastcc void @"alias_fork1#.<0>"() {
   %"tmp#23##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#10##0" = ptrtoint ptr %"tmp#23##0" to i64
   %"tmp#24##0" = inttoptr i64 %"tmp#10##0" to ptr
@@ -124,14 +124,14 @@ define external fastcc void @"alias_fork1.<0>"() {
   %"tmp#33##0" = add i64 %"tmp#16##0", 16
   %"tmp#34##0" = inttoptr i64 %"tmp#33##0" to ptr
   store i64 0, ptr %"tmp#34##0"
-  %"tmp#6##0" = tail call fastcc i64 @"alias_fork1.simpleMerge<0>"(i64 %"tmp#10##0", i64 %"tmp#16##0")
-  %"tmp#20##0" = tail call fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"tmp#6##0", i64 1519)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1527)
+  %"tmp#6##0" = tail call fastcc i64 @"alias_fork1#.simpleMerge<0>"(i64 %"tmp#10##0", i64 %"tmp#16##0")
+  %"tmp#20##0" = tail call fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"tmp#6##0", i64 1519)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1527)
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"alias_fork1.simpleMerge<0>"(i64 %"tl##0", i64 %"tr##0") {
+define external fastcc i64 @"alias_fork1#.simpleMerge<0>"(i64 %"tl##0", i64 %"tr##0") {
   %"tmp#15##0" = icmp ne i64 %"tl##0", 0
   br i1 %"tmp#15##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -202,7 +202,7 @@ if.else.0:
   ret i64 %"tmp#19##0"
 }
 
-define external fastcc i64 @"alias_fork1.simpleMerge#cont#1<0>"(i64 %"tmp#2##0") {
+define external fastcc i64 @"alias_fork1#.simpleMerge#cont#1<0>"(i64 %"tmp#2##0") {
   ret i64 %"tmp#2##0"
 }
 
@@ -285,23 +285,23 @@ printTree1(t##0:mytree.tree, prefix##0:wybe.string, ?prefix##3:wybe.string)<{<<w
 ; ModuleID = 'mytree'
 
 source_filename = "!ROOT!/final-dump/mytree.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c", \00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"mytree.printTree<0>"(i64 %"t##0") {
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"t##0", i64 1519)
-  tail call fastcc void @"wybe.string.print<0>"(i64 1527)
+define external fastcc void @"mytree#.printTree<0>"(i64 %"t##0") {
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"t##0", i64 1519)
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 1527)
   ret void
 }
 
-define external fastcc i64 @"mytree.printTree1<0>"(i64 %"t##0", i64 %"prefix##0") {
+define external fastcc i64 @"mytree#.printTree1<0>"(i64 %"t##0", i64 %"prefix##0") {
   %"tmp#2##0" = icmp ne i64 %"t##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -313,16 +313,16 @@ if.then.0:
   %"tmp#9##0" = add i64 %"t##0", 16
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   %"r##0" = load i64, ptr %"tmp#10##0"
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"l##0", i64 %"prefix##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"prefix##1")
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"l##0", i64 %"prefix##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"prefix##1")
   call ccc void @print_int(i64 %"k##0")
-  %"tmp#11##0" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
+  %"tmp#11##0" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
   ret i64 %"tmp#11##0"
 if.else.0:
   ret i64 %"prefix##0"
 }
 
-define external fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"t##0", i64 %"prefix##0") {
+define external fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"t##0", i64 %"prefix##0") {
   %"tmp#2##0" = icmp ne i64 %"t##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -334,10 +334,10 @@ if.then.0:
   %"tmp#9##0" = add i64 %"t##0", 16
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   %"r##0" = load i64, ptr %"tmp#10##0"
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"l##0", i64 %"prefix##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"prefix##1")
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"l##0", i64 %"prefix##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"prefix##1")
   call ccc void @print_int(i64 %"k##0")
-  %"tmp#11##0" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
+  %"tmp#11##0" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
   ret i64 %"tmp#11##0"
 if.else.0:
   ret i64 %"prefix##0"
@@ -554,13 +554,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'mytree.tree'
 
 source_filename = "!ROOT!/final-dump/mytree.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"mytree.tree.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -583,13 +583,13 @@ if.then.1:
   %"tmp#21##0" = add i64 %"#right##0", 16
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   %"#right#right##0" = load i64, ptr %"tmp#22##0"
-  %"tmp#4##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
+  %"tmp#4##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
   %"tmp#5##0" = icmp eq i64 %"#left#key##0", %"#right#key##0"
   br i1 %"tmp#5##0", label %if.then.3, label %if.else.3
 if.then.3:
-  %"tmp#23##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
+  %"tmp#23##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
   ret i1 %"tmp#23##0"
 if.else.3:
   ret i1 0
@@ -602,11 +602,11 @@ if.else.0:
   ret i1 %"tmp#24##0"
 }
 
-define external fastcc i64 @"mytree.tree.empty<0>"() {
+define external fastcc i64 @"mytree#.tree#.empty<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"mytree.tree.key<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.key<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -622,7 +622,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -642,7 +642,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.left<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.left<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -657,7 +657,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -676,7 +676,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"mytree.tree.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
+define external fastcc i64 @"mytree#.tree#.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -690,7 +690,7 @@ define external fastcc i64 @"mytree.tree.node<0>"(i64 %"left##0", i64 %"key##0",
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64, i1} @"mytree.tree.node<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i1} @"mytree#.tree#.node<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -715,7 +715,7 @@ if.else.0:
   ret {i64, i64, i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.right<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.right<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -731,7 +731,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -751,8 +751,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"mytree.tree.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"mytree#.tree#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/alias_fork2.exp b/test-cases/final-dump/alias_fork2.exp
index cebeb056..c2a8be1b 100644
--- a/test-cases/final-dump/alias_fork2.exp
+++ b/test-cases/final-dump/alias_fork2.exp
@@ -94,7 +94,7 @@ simpleMerge(tl##0:mytree.tree, ?#result##0:mytree.tree)<{}; {}; {}>:
 ; ModuleID = 'alias_fork2'
 
 source_filename = "!ROOT!/final-dump/alias_fork2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"expect t -  1 200:\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"expect t1 - 1 200:\00", align 8
@@ -103,14 +103,14 @@ target triple    ????
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 18, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 
-declare external fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_fork2.<0>"() {
+define external fastcc void @"alias_fork2#.<0>"() {
   %"tmp#29##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#9##0" = ptrtoint ptr %"tmp#29##0" to i64
   %"tmp#30##0" = inttoptr i64 %"tmp#9##0" to ptr
@@ -121,12 +121,12 @@ define external fastcc void @"alias_fork2.<0>"() {
   %"tmp#33##0" = add i64 %"tmp#9##0", 16
   %"tmp#34##0" = inttoptr i64 %"tmp#33##0" to ptr
   store i64 0, ptr %"tmp#34##0"
-  %"tmp#3##0" = tail call fastcc i64 @"alias_fork2.simpleMerge<0>"(i64 %"tmp#9##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  %"tmp#3##0" = tail call fastcc i64 @"alias_fork2#.simpleMerge<0>"(i64 %"tmp#9##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#16##0" = tail call fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"tmp#3##0", i64 1519)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1527)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 0)
+  %"tmp#16##0" = tail call fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"tmp#3##0", i64 1519)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1527)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 0)
   call ccc void @putchar(i8 10)
   %"tmp#22##0" = icmp ne i64 %"tmp#9##0", 0
   br i1 %"tmp#22##0", label %if.then.0, label %if.else.0
@@ -143,30 +143,30 @@ if.then.0:
   %"tmp#40##0" = add i64 %"tmp#26##0", 16
   %"tmp#41##0" = inttoptr i64 %"tmp#40##0" to ptr
   store i64 0, ptr %"tmp#41##0"
-  tail call fastcc void @"alias_fork2.#cont#1<0>"(i64 %"tmp#3##0", i64 %"tmp#26##0")
+  tail call fastcc void @"alias_fork2#.#cont#1<0>"(i64 %"tmp#3##0", i64 %"tmp#26##0")
   ret void
 if.else.0:
-  tail call fastcc void @"alias_fork2.#cont#1<0>"(i64 %"tmp#3##0", i64 0)
+  tail call fastcc void @"alias_fork2#.#cont#1<0>"(i64 %"tmp#3##0", i64 0)
   ret void
 }
 
-define external fastcc void @"alias_fork2.#cont#1<0>"(i64 %"t##0", i64 %"t1##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+define external fastcc void @"alias_fork2#.#cont#1<0>"(i64 %"t##0", i64 %"t1##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#9##0" = tail call fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"t1##0", i64 1519)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1527)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 0)
+  %"tmp#9##0" = tail call fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"t1##0", i64 1519)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1527)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 0)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#18##0" = tail call fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"t##0", i64 1519)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1527)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 0)
+  %"tmp#18##0" = tail call fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"t##0", i64 1519)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1527)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 0)
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"alias_fork2.simpleMerge<0>"(i64 %"tl##0") {
+define external fastcc i64 @"alias_fork2#.simpleMerge<0>"(i64 %"tl##0") {
   %"tmp#8##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#5##0" = ptrtoint ptr %"tmp#8##0" to i64
   %"tmp#9##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -259,23 +259,23 @@ printTree1(t##0:mytree.tree, prefix##0:wybe.string, ?prefix##3:wybe.string)<{<<w
 ; ModuleID = 'mytree'
 
 source_filename = "!ROOT!/final-dump/mytree.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c", \00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"mytree.printTree<0>"(i64 %"t##0") {
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"t##0", i64 1519)
-  tail call fastcc void @"wybe.string.print<0>"(i64 1527)
+define external fastcc void @"mytree#.printTree<0>"(i64 %"t##0") {
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"t##0", i64 1519)
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 1527)
   ret void
 }
 
-define external fastcc i64 @"mytree.printTree1<0>"(i64 %"t##0", i64 %"prefix##0") {
+define external fastcc i64 @"mytree#.printTree1<0>"(i64 %"t##0", i64 %"prefix##0") {
   %"tmp#2##0" = icmp ne i64 %"t##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -287,16 +287,16 @@ if.then.0:
   %"tmp#9##0" = add i64 %"t##0", 16
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   %"r##0" = load i64, ptr %"tmp#10##0"
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"l##0", i64 %"prefix##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"prefix##1")
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"l##0", i64 %"prefix##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"prefix##1")
   call ccc void @print_int(i64 %"k##0")
-  %"tmp#11##0" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
+  %"tmp#11##0" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
   ret i64 %"tmp#11##0"
 if.else.0:
   ret i64 %"prefix##0"
 }
 
-define external fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"t##0", i64 %"prefix##0") {
+define external fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"t##0", i64 %"prefix##0") {
   %"tmp#2##0" = icmp ne i64 %"t##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -308,10 +308,10 @@ if.then.0:
   %"tmp#9##0" = add i64 %"t##0", 16
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   %"r##0" = load i64, ptr %"tmp#10##0"
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"l##0", i64 %"prefix##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"prefix##1")
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"l##0", i64 %"prefix##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"prefix##1")
   call ccc void @print_int(i64 %"k##0")
-  %"tmp#11##0" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
+  %"tmp#11##0" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
   ret i64 %"tmp#11##0"
 if.else.0:
   ret i64 %"prefix##0"
@@ -528,13 +528,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'mytree.tree'
 
 source_filename = "!ROOT!/final-dump/mytree.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"mytree.tree.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -557,13 +557,13 @@ if.then.1:
   %"tmp#21##0" = add i64 %"#right##0", 16
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   %"#right#right##0" = load i64, ptr %"tmp#22##0"
-  %"tmp#4##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
+  %"tmp#4##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
   %"tmp#5##0" = icmp eq i64 %"#left#key##0", %"#right#key##0"
   br i1 %"tmp#5##0", label %if.then.3, label %if.else.3
 if.then.3:
-  %"tmp#23##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
+  %"tmp#23##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
   ret i1 %"tmp#23##0"
 if.else.3:
   ret i1 0
@@ -576,11 +576,11 @@ if.else.0:
   ret i1 %"tmp#24##0"
 }
 
-define external fastcc i64 @"mytree.tree.empty<0>"() {
+define external fastcc i64 @"mytree#.tree#.empty<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"mytree.tree.key<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.key<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -596,7 +596,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -616,7 +616,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.left<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.left<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -631,7 +631,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -650,7 +650,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"mytree.tree.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
+define external fastcc i64 @"mytree#.tree#.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -664,7 +664,7 @@ define external fastcc i64 @"mytree.tree.node<0>"(i64 %"left##0", i64 %"key##0",
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64, i1} @"mytree.tree.node<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i1} @"mytree#.tree#.node<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -689,7 +689,7 @@ if.else.0:
   ret {i64, i64, i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.right<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.right<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -705,7 +705,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -725,8 +725,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"mytree.tree.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"mytree#.tree#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/alias_fork3.exp b/test-cases/final-dump/alias_fork3.exp
index ce8b4bac..697734db 100644
--- a/test-cases/final-dump/alias_fork3.exp
+++ b/test-cases/final-dump/alias_fork3.exp
@@ -64,19 +64,19 @@ simpleSlice(tr##0:mytree.tree, ?#result##0:mytree.tree)<{}; {}; {}>:
 ; ModuleID = 'alias_fork3'
 
 source_filename = "!ROOT!/final-dump/alias_fork3.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"expect t - 100:\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 15, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_fork3.<0>"() {
+define external fastcc void @"alias_fork3#.<0>"() {
   %"tmp#27##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#9##0" = ptrtoint ptr %"tmp#27##0" to i64
   %"tmp#28##0" = inttoptr i64 %"tmp#9##0" to ptr
@@ -97,17 +97,17 @@ define external fastcc void @"alias_fork3.<0>"() {
   %"tmp#37##0" = add i64 %"tmp#15##0", 16
   %"tmp#38##0" = inttoptr i64 %"tmp#37##0" to ptr
   store i64 0, ptr %"tmp#38##0"
-  %"tmp#5##0" = tail call fastcc i64 @"alias_fork3.simpleSlice<0>"(i64 %"tmp#15##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  %"tmp#5##0" = tail call fastcc i64 @"alias_fork3#.simpleSlice<0>"(i64 %"tmp#15##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#22##0" = tail call fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"tmp#5##0", i64 1519)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1527)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 0)
+  %"tmp#22##0" = tail call fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"tmp#5##0", i64 1519)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1527)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 0)
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"alias_fork3.simpleSlice<0>"(i64 %"tr##0") {
+define external fastcc i64 @"alias_fork3#.simpleSlice<0>"(i64 %"tr##0") {
   %"tmp#6##0" = icmp ne i64 %"tr##0", 0
   br i1 %"tmp#6##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -207,23 +207,23 @@ printTree1(t##0:mytree.tree, prefix##0:wybe.string, ?prefix##3:wybe.string)<{<<w
 ; ModuleID = 'mytree'
 
 source_filename = "!ROOT!/final-dump/mytree.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c", \00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"mytree.printTree<0>"(i64 %"t##0") {
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"t##0", i64 1519)
-  tail call fastcc void @"wybe.string.print<0>"(i64 1527)
+define external fastcc void @"mytree#.printTree<0>"(i64 %"t##0") {
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"t##0", i64 1519)
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 1527)
   ret void
 }
 
-define external fastcc i64 @"mytree.printTree1<0>"(i64 %"t##0", i64 %"prefix##0") {
+define external fastcc i64 @"mytree#.printTree1<0>"(i64 %"t##0", i64 %"prefix##0") {
   %"tmp#2##0" = icmp ne i64 %"t##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -235,16 +235,16 @@ if.then.0:
   %"tmp#9##0" = add i64 %"t##0", 16
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   %"r##0" = load i64, ptr %"tmp#10##0"
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"l##0", i64 %"prefix##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"prefix##1")
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"l##0", i64 %"prefix##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"prefix##1")
   call ccc void @print_int(i64 %"k##0")
-  %"tmp#11##0" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
+  %"tmp#11##0" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
   ret i64 %"tmp#11##0"
 if.else.0:
   ret i64 %"prefix##0"
 }
 
-define external fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"t##0", i64 %"prefix##0") {
+define external fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"t##0", i64 %"prefix##0") {
   %"tmp#2##0" = icmp ne i64 %"t##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -256,10 +256,10 @@ if.then.0:
   %"tmp#9##0" = add i64 %"t##0", 16
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   %"r##0" = load i64, ptr %"tmp#10##0"
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>[6dacb8fd25]"(i64 %"l##0", i64 %"prefix##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"prefix##1")
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>[6dacb8fd25]"(i64 %"l##0", i64 %"prefix##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"prefix##1")
   call ccc void @print_int(i64 %"k##0")
-  %"tmp#11##0" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
+  %"tmp#11##0" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
   ret i64 %"tmp#11##0"
 if.else.0:
   ret i64 %"prefix##0"
@@ -476,13 +476,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'mytree.tree'
 
 source_filename = "!ROOT!/final-dump/mytree.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"mytree.tree.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -505,13 +505,13 @@ if.then.1:
   %"tmp#21##0" = add i64 %"#right##0", 16
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   %"#right#right##0" = load i64, ptr %"tmp#22##0"
-  %"tmp#4##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
+  %"tmp#4##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
   %"tmp#5##0" = icmp eq i64 %"#left#key##0", %"#right#key##0"
   br i1 %"tmp#5##0", label %if.then.3, label %if.else.3
 if.then.3:
-  %"tmp#23##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
+  %"tmp#23##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
   ret i1 %"tmp#23##0"
 if.else.3:
   ret i1 0
@@ -524,11 +524,11 @@ if.else.0:
   ret i1 %"tmp#24##0"
 }
 
-define external fastcc i64 @"mytree.tree.empty<0>"() {
+define external fastcc i64 @"mytree#.tree#.empty<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"mytree.tree.key<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.key<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -544,7 +544,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -564,7 +564,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.left<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.left<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -579,7 +579,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -598,7 +598,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"mytree.tree.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
+define external fastcc i64 @"mytree#.tree#.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -612,7 +612,7 @@ define external fastcc i64 @"mytree.tree.node<0>"(i64 %"left##0", i64 %"key##0",
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64, i1} @"mytree.tree.node<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i1} @"mytree#.tree#.node<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -637,7 +637,7 @@ if.else.0:
   ret {i64, i64, i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.right<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.right<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -653,7 +653,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -673,8 +673,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"mytree.tree.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"mytree#.tree#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/alias_m.exp b/test-cases/final-dump/alias_m.exp
index 1ab69665..e3612197 100644
--- a/test-cases/final-dump/alias_m.exp
+++ b/test-cases/final-dump/alias_m.exp
@@ -36,7 +36,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'alias_m'
 
 source_filename = "!ROOT!/final-dump/alias_m.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"expect p1(2,2)\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"expect p2(2,2)\00", align 8
@@ -45,13 +45,13 @@ target triple    ????
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 14, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 14, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 
-declare external fastcc {i64, i64} @"alias_mfoo.foo<0>"(i64)
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc {i64, i64} @"alias_mfoo#.foo<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_m.<0>"() {
+define external fastcc void @"alias_m#.<0>"() {
   %"tmp#5##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#5##0" to i64
   %"tmp#6##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -59,15 +59,15 @@ define external fastcc void @"alias_m.<0>"() {
   %"tmp#7##0" = add i64 %"tmp#3##0", 8
   %"tmp#8##0" = inttoptr i64 %"tmp#7##0" to ptr
   store i64 1, ptr %"tmp#8##0"
-  %"tmp#9##0" = tail call fastcc {i64, i64} @"alias_mfoo.foo<0>"(i64 %"tmp#3##0")
+  %"tmp#9##0" = tail call fastcc {i64, i64} @"alias_mfoo#.foo<0>"(i64 %"tmp#3##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#9##0", 0
   %"p3##0" = extractvalue {i64, i64}%"tmp#9##0", 1
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p3##0")
   ret void
 }
 
@@ -119,14 +119,14 @@ bar(p1##0:position.position, ?p3##1:position.position)<{<<wybe.io.io>>}; {<<wybe
 ; ModuleID = 'alias_mbar'
 
 source_filename = "!ROOT!/final-dump/alias_mbar.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64)
+declare external fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"alias_mbar.bar<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias_mbar#.bar<0>"(i64 %"p1##0") {
   %"tmp#12##0" = add i64 %"p1##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#13##0"
@@ -143,13 +143,13 @@ if.else.0:
   %"tmp#17##0" = add i64 %"tmp#16##0", 8
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#18##0"
-  %"tmp#19##0" = tail call fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64 %"tmp#16##0")
+  %"tmp#19##0" = tail call fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64 %"tmp#16##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#19##0", 0
   %"tmp#20##0" = extractvalue {i64, i64}%"tmp#19##0", 1
   ret i64 %"tmp#20##0"
 }
 
-define external fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64 %"p1##0") {
+define external fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64 %"p1##0") {
   %"tmp#12##0" = add i64 %"p1##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#13##0"
@@ -162,7 +162,7 @@ if.else.0:
   %"tmp#14##0" = add i64 %"p1##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#15##0"
-  %"tmp#16##0" = tail call fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64 %"p1##0")
+  %"tmp#16##0" = tail call fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64 %"p1##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#16##0", 0
   %"tmp#17##0" = extractvalue {i64, i64}%"tmp#16##0", 1
   ret i64 %"tmp#17##0"
@@ -234,18 +234,18 @@ foo(p1##0:position.position, ?p2##0:position.position, ?p3##0:position.position)
 ; ModuleID = 'alias_mfoo'
 
 source_filename = "!ROOT!/final-dump/alias_mfoo.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"p3:\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64)
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc {i64, i64} @"alias_mfoo.foo<0>"(i64 %"p1##0") {
+define external fastcc {i64, i64} @"alias_mfoo#.foo<0>"(i64 %"p1##0") {
   %"tmp#22##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#22##0"
   %"tmp#5##0" = icmp sgt i64 %"tmp#0##0", 1
@@ -258,8 +258,8 @@ if.then.0:
   %"tmp#25##0" = add i64 %"tmp#20##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
   store i64 3, ptr %"tmp#26##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#20##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#20##0")
   %"tmp#27##0" = insertvalue {i64, i64} undef, i64 %"p1##0", 0
   %"tmp#28##0" = insertvalue {i64, i64} %"tmp#27##0", i64 %"tmp#20##0", 1
   ret {i64, i64} %"tmp#28##0"
@@ -271,7 +271,7 @@ if.else.0:
   %"tmp#31##0" = ptrtoint ptr %"tmp#30##0" to i64
   %"tmp#32##0" = inttoptr i64 %"tmp#31##0" to ptr
   store i64 %"tmp#3##0", ptr %"tmp#32##0"
-  %"tmp#33##0" = tail call fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64 %"tmp#31##0")
+  %"tmp#33##0" = tail call fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64 %"tmp#31##0")
   %"tmp#34##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#16##0" = ptrtoint ptr %"tmp#34##0" to i64
   %"tmp#35##0" = inttoptr i64 %"tmp#16##0" to ptr
@@ -284,7 +284,7 @@ if.else.0:
   ret {i64, i64} %"tmp#39##0"
 }
 
-define external fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64 %"p1##0") {
+define external fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64 %"p1##0") {
   %"tmp#22##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#22##0"
   %"tmp#5##0" = icmp sgt i64 %"tmp#0##0", 1
@@ -297,8 +297,8 @@ if.then.0:
   %"tmp#25##0" = add i64 %"tmp#20##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
   store i64 3, ptr %"tmp#26##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#20##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#20##0")
   %"tmp#27##0" = insertvalue {i64, i64} undef, i64 %"p1##0", 0
   %"tmp#28##0" = insertvalue {i64, i64} %"tmp#27##0", i64 %"tmp#20##0", 1
   ret {i64, i64} %"tmp#28##0"
@@ -306,7 +306,7 @@ if.else.0:
   %"tmp#3##0" = add i64 %"tmp#0##0", 1
   %"tmp#29##0" = inttoptr i64 %"p1##0" to ptr
   store i64 %"tmp#3##0", ptr %"tmp#29##0"
-  %"tmp#30##0" = tail call fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64 %"p1##0")
+  %"tmp#30##0" = tail call fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64 %"p1##0")
   %"tmp#31##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#16##0" = ptrtoint ptr %"tmp#31##0" to i64
   %"tmp#32##0" = inttoptr i64 %"tmp#16##0" to ptr
@@ -366,28 +366,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -500,13 +500,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -526,7 +526,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -537,7 +537,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -548,13 +548,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -564,14 +564,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -582,7 +582,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_mbar.exp b/test-cases/final-dump/alias_mbar.exp
index f479c0c2..5d053ba4 100644
--- a/test-cases/final-dump/alias_mbar.exp
+++ b/test-cases/final-dump/alias_mbar.exp
@@ -50,14 +50,14 @@ bar(p1##0:position.position, ?p3##1:position.position)<{<<wybe.io.io>>}; {<<wybe
 ; ModuleID = 'alias_mbar'
 
 source_filename = "!ROOT!/final-dump/alias_mbar.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64)
+declare external fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"alias_mbar.bar<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias_mbar#.bar<0>"(i64 %"p1##0") {
   %"tmp#12##0" = add i64 %"p1##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#13##0"
@@ -74,13 +74,13 @@ if.else.0:
   %"tmp#17##0" = add i64 %"tmp#16##0", 8
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#18##0"
-  %"tmp#19##0" = tail call fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64 %"tmp#16##0")
+  %"tmp#19##0" = tail call fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64 %"tmp#16##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#19##0", 0
   %"tmp#20##0" = extractvalue {i64, i64}%"tmp#19##0", 1
   ret i64 %"tmp#20##0"
 }
 
-define external fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64 %"p1##0") {
+define external fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64 %"p1##0") {
   %"tmp#12##0" = add i64 %"p1##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#13##0"
@@ -93,7 +93,7 @@ if.else.0:
   %"tmp#14##0" = add i64 %"p1##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#15##0"
-  %"tmp#16##0" = tail call fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64 %"p1##0")
+  %"tmp#16##0" = tail call fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64 %"p1##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#16##0", 0
   %"tmp#17##0" = extractvalue {i64, i64}%"tmp#16##0", 1
   ret i64 %"tmp#17##0"
@@ -165,18 +165,18 @@ foo(p1##0:position.position, ?p2##0:position.position, ?p3##0:position.position)
 ; ModuleID = 'alias_mfoo'
 
 source_filename = "!ROOT!/final-dump/alias_mfoo.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"p3:\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64)
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc {i64, i64} @"alias_mfoo.foo<0>"(i64 %"p1##0") {
+define external fastcc {i64, i64} @"alias_mfoo#.foo<0>"(i64 %"p1##0") {
   %"tmp#22##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#22##0"
   %"tmp#5##0" = icmp sgt i64 %"tmp#0##0", 1
@@ -189,8 +189,8 @@ if.then.0:
   %"tmp#25##0" = add i64 %"tmp#20##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
   store i64 3, ptr %"tmp#26##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#20##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#20##0")
   %"tmp#27##0" = insertvalue {i64, i64} undef, i64 %"p1##0", 0
   %"tmp#28##0" = insertvalue {i64, i64} %"tmp#27##0", i64 %"tmp#20##0", 1
   ret {i64, i64} %"tmp#28##0"
@@ -202,7 +202,7 @@ if.else.0:
   %"tmp#31##0" = ptrtoint ptr %"tmp#30##0" to i64
   %"tmp#32##0" = inttoptr i64 %"tmp#31##0" to ptr
   store i64 %"tmp#3##0", ptr %"tmp#32##0"
-  %"tmp#33##0" = tail call fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64 %"tmp#31##0")
+  %"tmp#33##0" = tail call fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64 %"tmp#31##0")
   %"tmp#34##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#16##0" = ptrtoint ptr %"tmp#34##0" to i64
   %"tmp#35##0" = inttoptr i64 %"tmp#16##0" to ptr
@@ -215,7 +215,7 @@ if.else.0:
   ret {i64, i64} %"tmp#39##0"
 }
 
-define external fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64 %"p1##0") {
+define external fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64 %"p1##0") {
   %"tmp#22##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#22##0"
   %"tmp#5##0" = icmp sgt i64 %"tmp#0##0", 1
@@ -228,8 +228,8 @@ if.then.0:
   %"tmp#25##0" = add i64 %"tmp#20##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
   store i64 3, ptr %"tmp#26##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#20##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#20##0")
   %"tmp#27##0" = insertvalue {i64, i64} undef, i64 %"p1##0", 0
   %"tmp#28##0" = insertvalue {i64, i64} %"tmp#27##0", i64 %"tmp#20##0", 1
   ret {i64, i64} %"tmp#28##0"
@@ -237,7 +237,7 @@ if.else.0:
   %"tmp#3##0" = add i64 %"tmp#0##0", 1
   %"tmp#29##0" = inttoptr i64 %"p1##0" to ptr
   store i64 %"tmp#3##0", ptr %"tmp#29##0"
-  %"tmp#30##0" = tail call fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64 %"p1##0")
+  %"tmp#30##0" = tail call fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64 %"p1##0")
   %"tmp#31##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#16##0" = ptrtoint ptr %"tmp#31##0" to i64
   %"tmp#32##0" = inttoptr i64 %"tmp#16##0" to ptr
@@ -297,28 +297,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -431,13 +431,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -457,7 +457,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -468,7 +468,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -479,13 +479,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -495,14 +495,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -513,7 +513,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_mfoo.exp b/test-cases/final-dump/alias_mfoo.exp
index f479c0c2..5d053ba4 100644
--- a/test-cases/final-dump/alias_mfoo.exp
+++ b/test-cases/final-dump/alias_mfoo.exp
@@ -50,14 +50,14 @@ bar(p1##0:position.position, ?p3##1:position.position)<{<<wybe.io.io>>}; {<<wybe
 ; ModuleID = 'alias_mbar'
 
 source_filename = "!ROOT!/final-dump/alias_mbar.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64)
+declare external fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"alias_mbar.bar<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias_mbar#.bar<0>"(i64 %"p1##0") {
   %"tmp#12##0" = add i64 %"p1##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#13##0"
@@ -74,13 +74,13 @@ if.else.0:
   %"tmp#17##0" = add i64 %"tmp#16##0", 8
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#18##0"
-  %"tmp#19##0" = tail call fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64 %"tmp#16##0")
+  %"tmp#19##0" = tail call fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64 %"tmp#16##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#19##0", 0
   %"tmp#20##0" = extractvalue {i64, i64}%"tmp#19##0", 1
   ret i64 %"tmp#20##0"
 }
 
-define external fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64 %"p1##0") {
+define external fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64 %"p1##0") {
   %"tmp#12##0" = add i64 %"p1##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#13##0"
@@ -93,7 +93,7 @@ if.else.0:
   %"tmp#14##0" = add i64 %"p1##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#15##0"
-  %"tmp#16##0" = tail call fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64 %"p1##0")
+  %"tmp#16##0" = tail call fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64 %"p1##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#16##0", 0
   %"tmp#17##0" = extractvalue {i64, i64}%"tmp#16##0", 1
   ret i64 %"tmp#17##0"
@@ -165,18 +165,18 @@ foo(p1##0:position.position, ?p2##0:position.position, ?p3##0:position.position)
 ; ModuleID = 'alias_mfoo'
 
 source_filename = "!ROOT!/final-dump/alias_mfoo.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"p3:\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64)
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc {i64, i64} @"alias_mfoo.foo<0>"(i64 %"p1##0") {
+define external fastcc {i64, i64} @"alias_mfoo#.foo<0>"(i64 %"p1##0") {
   %"tmp#22##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#22##0"
   %"tmp#5##0" = icmp sgt i64 %"tmp#0##0", 1
@@ -189,8 +189,8 @@ if.then.0:
   %"tmp#25##0" = add i64 %"tmp#20##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
   store i64 3, ptr %"tmp#26##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#20##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#20##0")
   %"tmp#27##0" = insertvalue {i64, i64} undef, i64 %"p1##0", 0
   %"tmp#28##0" = insertvalue {i64, i64} %"tmp#27##0", i64 %"tmp#20##0", 1
   ret {i64, i64} %"tmp#28##0"
@@ -202,7 +202,7 @@ if.else.0:
   %"tmp#31##0" = ptrtoint ptr %"tmp#30##0" to i64
   %"tmp#32##0" = inttoptr i64 %"tmp#31##0" to ptr
   store i64 %"tmp#3##0", ptr %"tmp#32##0"
-  %"tmp#33##0" = tail call fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64 %"tmp#31##0")
+  %"tmp#33##0" = tail call fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64 %"tmp#31##0")
   %"tmp#34##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#16##0" = ptrtoint ptr %"tmp#34##0" to i64
   %"tmp#35##0" = inttoptr i64 %"tmp#16##0" to ptr
@@ -215,7 +215,7 @@ if.else.0:
   ret {i64, i64} %"tmp#39##0"
 }
 
-define external fastcc {i64, i64} @"alias_mfoo.foo<0>[410bae77d3]"(i64 %"p1##0") {
+define external fastcc {i64, i64} @"alias_mfoo#.foo<0>[410bae77d3]"(i64 %"p1##0") {
   %"tmp#22##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#22##0"
   %"tmp#5##0" = icmp sgt i64 %"tmp#0##0", 1
@@ -228,8 +228,8 @@ if.then.0:
   %"tmp#25##0" = add i64 %"tmp#20##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
   store i64 3, ptr %"tmp#26##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#20##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#20##0")
   %"tmp#27##0" = insertvalue {i64, i64} undef, i64 %"p1##0", 0
   %"tmp#28##0" = insertvalue {i64, i64} %"tmp#27##0", i64 %"tmp#20##0", 1
   ret {i64, i64} %"tmp#28##0"
@@ -237,7 +237,7 @@ if.else.0:
   %"tmp#3##0" = add i64 %"tmp#0##0", 1
   %"tmp#29##0" = inttoptr i64 %"p1##0" to ptr
   store i64 %"tmp#3##0", ptr %"tmp#29##0"
-  %"tmp#30##0" = tail call fastcc i64 @"alias_mbar.bar<0>[410bae77d3]"(i64 %"p1##0")
+  %"tmp#30##0" = tail call fastcc i64 @"alias_mbar#.bar<0>[410bae77d3]"(i64 %"p1##0")
   %"tmp#31##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#16##0" = ptrtoint ptr %"tmp#31##0" to i64
   %"tmp#32##0" = inttoptr i64 %"tmp#16##0" to ptr
@@ -297,28 +297,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -431,13 +431,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -457,7 +457,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -468,7 +468,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -479,13 +479,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -495,14 +495,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -513,7 +513,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_mod_param.exp b/test-cases/final-dump/alias_mod_param.exp
index 883259e8..e437d725 100644
--- a/test-cases/final-dump/alias_mod_param.exp
+++ b/test-cases/final-dump/alias_mod_param.exp
@@ -42,19 +42,19 @@ foo(pa##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'alias_mod_param'
 
 source_filename = "!ROOT!/final-dump/alias_mod_param.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"expect p1(10,10):\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"expect pa(1111,10):\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 19, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_mod_param.<0>"() {
+define external fastcc void @"alias_mod_param#.<0>"() {
   %"tmp#5##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#5##0" to i64
   %"tmp#6##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -62,21 +62,21 @@ define external fastcc void @"alias_mod_param.<0>"() {
   %"tmp#7##0" = add i64 %"tmp#3##0", 8
   %"tmp#8##0" = inttoptr i64 %"tmp#7##0" to ptr
   store i64 10, ptr %"tmp#8##0"
-  tail call fastcc void @"alias_mod_param.foo<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"alias_mod_param#.foo<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
   ret void
 }
 
-define external fastcc void @"alias_mod_param.foo<0>"(i64 %"pa##0") {
+define external fastcc void @"alias_mod_param#.foo<0>"(i64 %"pa##0") {
   %"tmp#2##0" = inttoptr i64 %"pa##0" to ptr
   %"tmp#3##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#3##0", ptr %"tmp#2##0", i64 16, i1 0)
   %"tmp#4##0" = ptrtoint ptr %"tmp#3##0" to i64
   %"tmp#5##0" = inttoptr i64 %"tmp#4##0" to ptr
   store i64 1111, ptr %"tmp#5##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#4##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#4##0")
   ret void
 }
 
@@ -127,28 +127,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -261,13 +261,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -287,7 +287,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -298,7 +298,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -309,13 +309,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -325,14 +325,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -343,7 +343,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_multifunc.exp b/test-cases/final-dump/alias_multifunc.exp
index fcbca9aa..3d6f72dc 100644
--- a/test-cases/final-dump/alias_multifunc.exp
+++ b/test-cases/final-dump/alias_multifunc.exp
@@ -96,7 +96,7 @@ replicate2(p1##0:position.position, ?p2##0:position.position)<{<<wybe.io.io>>};
 ; ModuleID = 'alias_multifunc'
 
 source_filename = "!ROOT!/final-dump/alias_multifunc.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling replicate1: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling x(!p1, 555): \00", align 8
@@ -115,19 +115,19 @@ target triple    ????
 @"string#14" = private unnamed_addr constant {i64, i64} { i64 18, i64 ptrtoint( ptr @"cstring#6" to i64 ) }, align 8
 @"string#15" = private unnamed_addr constant {i64, i64} { i64 18, i64 ptrtoint( ptr @"cstring#7" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_multifunc.<0>"() {
-  tail call fastcc void @"alias_multifunc.bar<0>"()
+define external fastcc void @"alias_multifunc#.<0>"() {
+  tail call fastcc void @"alias_multifunc#.bar<0>"()
   ret void
 }
 
-define external fastcc void @"alias_multifunc.bar<0>"() {
+define external fastcc void @"alias_multifunc#.bar<0>"() {
   %"tmp#13##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#13##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -135,35 +135,35 @@ define external fastcc void @"alias_multifunc.bar<0>"() {
   %"tmp#15##0" = add i64 %"tmp#3##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 102, ptr %"tmp#16##0"
-  %"tmp#17##0" = tail call fastcc {i64, i64} @"alias_multifunc.replicate1<0>"(i64 %"tmp#3##0")
+  %"tmp#17##0" = tail call fastcc {i64, i64} @"alias_multifunc#.replicate1<0>"(i64 %"tmp#3##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#17##0", 0
   %"p3##0" = extractvalue {i64, i64}%"tmp#17##0", 1
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p3##0")
   %"tmp#18##0" = inttoptr i64 %"tmp#3##0" to ptr
   %"tmp#19##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#19##0", ptr %"tmp#18##0", i64 16, i1 0)
   %"tmp#20##0" = ptrtoint ptr %"tmp#19##0" to i64
   %"tmp#21##0" = inttoptr i64 %"tmp#20##0" to ptr
   store i64 555, ptr %"tmp#21##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#20##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#20##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p3##0")
   ret void
 }
 
-define external fastcc {i64, i64} @"alias_multifunc.replicate1<0>"(i64 %"p1##0") {
+define external fastcc {i64, i64} @"alias_multifunc#.replicate1<0>"(i64 %"p1##0") {
   %"tmp#11##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#11##0" to i64
   %"tmp#12##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -171,18 +171,18 @@ define external fastcc {i64, i64} @"alias_multifunc.replicate1<0>"(i64 %"p1##0")
   %"tmp#13##0" = add i64 %"tmp#4##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   store i64 0, ptr %"tmp#14##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
   %"tmp#15##0" = inttoptr i64 %"tmp#4##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#15##0"
   call ccc void @print_int(i64 %"tmp#1##0")
   call ccc void @putchar(i8 10)
-  %"tmp#16##0" = tail call fastcc i64 @"alias_multifunc.replicate2<0>"(i64 %"p1##0")
+  %"tmp#16##0" = tail call fastcc i64 @"alias_multifunc#.replicate2<0>"(i64 %"p1##0")
   %"tmp#17##0" = insertvalue {i64, i64} undef, i64 %"p1##0", 0
   %"tmp#18##0" = insertvalue {i64, i64} %"tmp#17##0", i64 %"tmp#16##0", 1
   ret {i64, i64} %"tmp#18##0"
 }
 
-define external fastcc i64 @"alias_multifunc.replicate2<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias_multifunc#.replicate2<0>"(i64 %"p1##0") {
   %"tmp#11##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#11##0" to i64
   %"tmp#12##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -190,7 +190,7 @@ define external fastcc i64 @"alias_multifunc.replicate2<0>"(i64 %"p1##0") {
   %"tmp#13##0" = add i64 %"tmp#4##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   store i64 0, ptr %"tmp#14##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
   %"tmp#15##0" = inttoptr i64 %"tmp#4##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#15##0"
   call ccc void @print_int(i64 %"tmp#1##0")
@@ -245,28 +245,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -379,13 +379,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -405,7 +405,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -416,7 +416,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -427,13 +427,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -443,14 +443,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -461,7 +461,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_multifunc1.exp b/test-cases/final-dump/alias_multifunc1.exp
index 12c410f6..ae72eecb 100644
--- a/test-cases/final-dump/alias_multifunc1.exp
+++ b/test-cases/final-dump/alias_multifunc1.exp
@@ -84,7 +84,7 @@ replicate2(p1##0:position.position, ?p2##0:position.position)<{<<wybe.io.io>>};
 ; ModuleID = 'alias_multifunc1'
 
 source_filename = "!ROOT!/final-dump/alias_multifunc1.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling replicate1: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling x(!p1, 11): \00", align 8
@@ -105,14 +105,14 @@ target triple    ????
 @"string#16" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#7" to i64 ) }, align 8
 @"string#17" = private unnamed_addr constant {i64, i64} { i64 13, i64 ptrtoint( ptr @"cstring#8" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_multifunc1.<0>"() {
+define external fastcc void @"alias_multifunc1#.<0>"() {
   %"tmp#18##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#18##0" to i64
   %"tmp#19##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -120,41 +120,41 @@ define external fastcc void @"alias_multifunc1.<0>"() {
   %"tmp#20##0" = add i64 %"tmp#3##0", 8
   %"tmp#21##0" = inttoptr i64 %"tmp#20##0" to ptr
   store i64 10, ptr %"tmp#21##0"
-  %"tmp#22##0" = tail call fastcc {i64, i64} @"alias_multifunc1.replicate1<0>"(i64 %"tmp#3##0")
+  %"tmp#22##0" = tail call fastcc {i64, i64} @"alias_multifunc1#.replicate1<0>"(i64 %"tmp#3##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#22##0", 0
   %"p3##0" = extractvalue {i64, i64}%"tmp#22##0", 1
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p3##0")
   %"tmp#23##0" = inttoptr i64 %"p2##0" to ptr
   store i64 2222222, ptr %"tmp#23##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   %"tmp#24##0" = inttoptr i64 %"tmp#3##0" to ptr
   %"tmp#25##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#25##0", ptr %"tmp#24##0", i64 16, i1 0)
   %"tmp#26##0" = ptrtoint ptr %"tmp#25##0" to i64
   %"tmp#27##0" = inttoptr i64 %"tmp#26##0" to ptr
   store i64 11, ptr %"tmp#27##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#26##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#26##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p3##0")
   ret void
 }
 
-define external fastcc {i64, i64} @"alias_multifunc1.replicate1<0>"(i64 %"p1##0") {
-  %"p2##0" = tail call fastcc i64 @"alias_multifunc1.replicate2<0>"(i64 %"p1##0")
-  %"tmp#2##0" = tail call fastcc i64 @"alias_multifunc1.replicate2<0>"(i64 %"p2##0")
+define external fastcc {i64, i64} @"alias_multifunc1#.replicate1<0>"(i64 %"p1##0") {
+  %"p2##0" = tail call fastcc i64 @"alias_multifunc1#.replicate2<0>"(i64 %"p1##0")
+  %"tmp#2##0" = tail call fastcc i64 @"alias_multifunc1#.replicate2<0>"(i64 %"p2##0")
   %"tmp#3##0" = inttoptr i64 %"p2##0" to ptr
   %"tmp#4##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#4##0", ptr %"tmp#3##0", i64 16, i1 0)
@@ -166,7 +166,7 @@ define external fastcc {i64, i64} @"alias_multifunc1.replicate1<0>"(i64 %"p1##0"
   ret {i64, i64} %"tmp#8##0"
 }
 
-define external fastcc i64 @"alias_multifunc1.replicate2<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias_multifunc1#.replicate2<0>"(i64 %"p1##0") {
   %"tmp#11##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#11##0" to i64
   %"tmp#12##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -174,7 +174,7 @@ define external fastcc i64 @"alias_multifunc1.replicate2<0>"(i64 %"p1##0") {
   %"tmp#13##0" = add i64 %"tmp#4##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   store i64 0, ptr %"tmp#14##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#17" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#17" to i64 ))
   %"tmp#15##0" = inttoptr i64 %"tmp#4##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#15##0"
   call ccc void @print_int(i64 %"tmp#1##0")
@@ -229,28 +229,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -363,13 +363,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -389,7 +389,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -400,7 +400,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -411,13 +411,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -427,14 +427,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -445,7 +445,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_multifunc2.exp b/test-cases/final-dump/alias_multifunc2.exp
index 82f3c8d1..f747fb2b 100644
--- a/test-cases/final-dump/alias_multifunc2.exp
+++ b/test-cases/final-dump/alias_multifunc2.exp
@@ -79,7 +79,7 @@ replicate2(p1##0:position.position, ?p2##0:position.position)<{<<wybe.io.io>>};
 ; ModuleID = 'alias_multifunc2'
 
 source_filename = "!ROOT!/final-dump/alias_multifunc2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling replicate1: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling x(!p1, 11): \00", align 8
@@ -96,14 +96,14 @@ target triple    ????
 @"string#12" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#5" to i64 ) }, align 8
 @"string#13" = private unnamed_addr constant {i64, i64} { i64 18, i64 ptrtoint( ptr @"cstring#6" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_multifunc2.<0>"() {
+define external fastcc void @"alias_multifunc2#.<0>"() {
   %"tmp#13##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#13##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -111,37 +111,37 @@ define external fastcc void @"alias_multifunc2.<0>"() {
   %"tmp#15##0" = add i64 %"tmp#3##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 10, ptr %"tmp#16##0"
-  %"tmp#17##0" = tail call fastcc {i64, i64} @"alias_multifunc2.replicate1<0>"(i64 %"tmp#3##0")
+  %"tmp#17##0" = tail call fastcc {i64, i64} @"alias_multifunc2#.replicate1<0>"(i64 %"tmp#3##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#17##0", 0
   %"p3##0" = extractvalue {i64, i64}%"tmp#17##0", 1
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p3##0")
   %"tmp#18##0" = inttoptr i64 %"tmp#3##0" to ptr
   %"tmp#19##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#19##0", ptr %"tmp#18##0", i64 16, i1 0)
   %"tmp#20##0" = ptrtoint ptr %"tmp#19##0" to i64
   %"tmp#21##0" = inttoptr i64 %"tmp#20##0" to ptr
   store i64 11, ptr %"tmp#21##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#20##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#20##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p3##0")
   ret void
 }
 
-define external fastcc {i64, i64} @"alias_multifunc2.replicate1<0>"(i64 %"p1##0") {
-  %"p2##0" = tail call fastcc i64 @"alias_multifunc2.replicate2<0>"(i64 %"p1##0")
-  %"tmp#2##0" = tail call fastcc i64 @"alias_multifunc2.replicate2<0>"(i64 %"p2##0")
+define external fastcc {i64, i64} @"alias_multifunc2#.replicate1<0>"(i64 %"p1##0") {
+  %"p2##0" = tail call fastcc i64 @"alias_multifunc2#.replicate2<0>"(i64 %"p1##0")
+  %"tmp#2##0" = tail call fastcc i64 @"alias_multifunc2#.replicate2<0>"(i64 %"p2##0")
   %"tmp#3##0" = inttoptr i64 %"p2##0" to ptr
   %"tmp#4##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#4##0", ptr %"tmp#3##0", i64 16, i1 0)
@@ -153,7 +153,7 @@ define external fastcc {i64, i64} @"alias_multifunc2.replicate1<0>"(i64 %"p1##0"
   ret {i64, i64} %"tmp#8##0"
 }
 
-define external fastcc i64 @"alias_multifunc2.replicate2<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias_multifunc2#.replicate2<0>"(i64 %"p1##0") {
   %"tmp#11##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#11##0" to i64
   %"tmp#12##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -161,7 +161,7 @@ define external fastcc i64 @"alias_multifunc2.replicate2<0>"(i64 %"p1##0") {
   %"tmp#13##0" = add i64 %"tmp#4##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   store i64 0, ptr %"tmp#14##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
   %"tmp#15##0" = inttoptr i64 %"tmp#4##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#15##0"
   call ccc void @print_int(i64 %"tmp#1##0")
@@ -216,28 +216,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -350,13 +350,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -376,7 +376,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -387,7 +387,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -398,13 +398,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -414,14 +414,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -432,7 +432,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_multifunc3.exp b/test-cases/final-dump/alias_multifunc3.exp
index cc8e5aca..76fa6301 100644
--- a/test-cases/final-dump/alias_multifunc3.exp
+++ b/test-cases/final-dump/alias_multifunc3.exp
@@ -64,7 +64,7 @@ replicate1(pa##0:position.position, ?pb##0:position.position)<{<<wybe.io.io>>};
 ; ModuleID = 'alias_multifunc3'
 
 source_filename = "!ROOT!/final-dump/alias_multifunc3.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- After called x(!p1, 999):\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling replicate1:\00", align 8
@@ -83,13 +83,13 @@ target triple    ????
 @"string#14" = private unnamed_addr constant {i64, i64} { i64 19, i64 ptrtoint( ptr @"cstring#6" to i64 ) }, align 8
 @"string#15" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#7" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_multifunc3.<0>"() {
+define external fastcc void @"alias_multifunc3#.<0>"() {
   %"tmp#13##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#13##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -97,41 +97,41 @@ define external fastcc void @"alias_multifunc3.<0>"() {
   %"tmp#15##0" = add i64 %"tmp#3##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 10, ptr %"tmp#16##0"
-  %"p2##0" = tail call fastcc i64 @"alias_multifunc3.replicate1<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  %"p2##0" = tail call fastcc i64 @"alias_multifunc3#.replicate1<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   %"tmp#17##0" = inttoptr i64 %"tmp#3##0" to ptr
   %"tmp#18##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#18##0", ptr %"tmp#17##0", i64 16, i1 0)
   %"tmp#19##0" = ptrtoint ptr %"tmp#18##0" to i64
   %"tmp#20##0" = inttoptr i64 %"tmp#19##0" to ptr
   store i64 999, ptr %"tmp#20##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#19##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#19##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
   ret void
 }
 
-define external fastcc i64 @"alias_multifunc3.replicate1<0>"(i64 %"pa##0") {
+define external fastcc i64 @"alias_multifunc3#.replicate1<0>"(i64 %"pa##0") {
   %"tmp#5##0" = inttoptr i64 %"pa##0" to ptr
   %"tmp#6##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#6##0", ptr %"tmp#5##0", i64 16, i1 0)
   %"tmp#7##0" = ptrtoint ptr %"tmp#6##0" to i64
   %"tmp#8##0" = inttoptr i64 %"tmp#7##0" to ptr
   store i64 1111, ptr %"tmp#8##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#7##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"pa##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#7##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"pa##0")
   ret i64 %"pa##0"
 }
 
@@ -182,28 +182,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -316,13 +316,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -342,7 +342,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -353,7 +353,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -364,13 +364,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -380,14 +380,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -398,7 +398,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_multifunc4.exp b/test-cases/final-dump/alias_multifunc4.exp
index c9d9af4d..47f12b80 100644
--- a/test-cases/final-dump/alias_multifunc4.exp
+++ b/test-cases/final-dump/alias_multifunc4.exp
@@ -101,7 +101,7 @@ replicate22(?pb##0:position.position, ?pc##1:position.position)<{<<wybe.io.io>>}
 ; ModuleID = 'alias_multifunc4'
 
 source_filename = "!ROOT!/final-dump/alias_multifunc4.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling replicate1:\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling replicate21:\00", align 8
@@ -128,13 +128,13 @@ target triple    ????
 @"string#22" = private unnamed_addr constant {i64, i64} { i64 23, i64 ptrtoint( ptr @"cstring#10" to i64 ) }, align 8
 @"string#23" = private unnamed_addr constant {i64, i64} { i64 28, i64 ptrtoint( ptr @"cstring#11" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_multifunc4.<0>"() {
+define external fastcc void @"alias_multifunc4#.<0>"() {
   %"tmp#14##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#14##0" to i64
   %"tmp#15##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -142,35 +142,35 @@ define external fastcc void @"alias_multifunc4.<0>"() {
   %"tmp#16##0" = add i64 %"tmp#3##0", 8
   %"tmp#17##0" = inttoptr i64 %"tmp#16##0" to ptr
   store i64 10, ptr %"tmp#17##0"
-  %"tmp#18##0" = tail call fastcc {i64, i64} @"alias_multifunc4.replicate1<0>"(i64 %"tmp#3##0")
+  %"tmp#18##0" = tail call fastcc {i64, i64} @"alias_multifunc4#.replicate1<0>"(i64 %"tmp#3##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#18##0", 0
   %"p3##0" = extractvalue {i64, i64}%"tmp#18##0", 1
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#18" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#19" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#20" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p3##0")
-  %"p4##0" = tail call fastcc i64 @"alias_multifunc4.replicate21<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#18" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#19" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#20" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p3##0")
+  %"p4##0" = tail call fastcc i64 @"alias_multifunc4#.replicate21<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p4##0")
-  %"tmp#19##0" = tail call fastcc {i64, i64} @"alias_multifunc4.replicate22<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p4##0")
+  %"tmp#19##0" = tail call fastcc {i64, i64} @"alias_multifunc4#.replicate22<0>"()
   %"p6##0" = extractvalue {i64, i64}%"tmp#19##0", 0
   %"p7##0" = extractvalue {i64, i64}%"tmp#19##0", 1
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p6##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#23" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p7##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p6##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#23" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p7##0")
   ret void
 }
 
-define external fastcc {i64, i64} @"alias_multifunc4.replicate1<0>"(i64 %"pa##0") {
+define external fastcc {i64, i64} @"alias_multifunc4#.replicate1<0>"(i64 %"pa##0") {
   %"tmp#9##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#9##0" to i64
   %"tmp#10##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -191,7 +191,7 @@ define external fastcc {i64, i64} @"alias_multifunc4.replicate1<0>"(i64 %"pa##0"
   ret {i64, i64} %"tmp#19##0"
 }
 
-define external fastcc i64 @"alias_multifunc4.replicate21<0>"() {
+define external fastcc i64 @"alias_multifunc4#.replicate21<0>"() {
   %"tmp#7##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#7##0" to i64
   %"tmp#8##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -205,12 +205,12 @@ define external fastcc i64 @"alias_multifunc4.replicate21<0>"() {
   %"tmp#13##0" = ptrtoint ptr %"tmp#12##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   store i64 1111111111, ptr %"tmp#14##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#13##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#13##0")
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc {i64, i64} @"alias_multifunc4.replicate22<0>"() {
+define external fastcc {i64, i64} @"alias_multifunc4#.replicate22<0>"() {
   %"tmp#7##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#7##0" to i64
   %"tmp#8##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -218,16 +218,16 @@ define external fastcc {i64, i64} @"alias_multifunc4.replicate22<0>"() {
   %"tmp#9##0" = add i64 %"tmp#3##0", 8
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   store i64 99999, ptr %"tmp#10##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#17" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#17" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
   %"tmp#11##0" = inttoptr i64 %"tmp#3##0" to ptr
   %"tmp#12##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#12##0", ptr %"tmp#11##0", i64 16, i1 0)
   %"tmp#13##0" = ptrtoint ptr %"tmp#12##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   store i64 1111111111, ptr %"tmp#14##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#13##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#13##0")
   %"tmp#15##0" = insertvalue {i64, i64} undef, i64 %"tmp#3##0", 0
   %"tmp#16##0" = insertvalue {i64, i64} %"tmp#15##0", i64 %"tmp#13##0", 1
   ret {i64, i64} %"tmp#16##0"
@@ -280,28 +280,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -414,13 +414,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -440,7 +440,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -451,7 +451,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -462,13 +462,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -478,14 +478,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -496,7 +496,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_recursion1.exp b/test-cases/final-dump/alias_recursion1.exp
index f423f39e..13ad37e4 100644
--- a/test-cases/final-dump/alias_recursion1.exp
+++ b/test-cases/final-dump/alias_recursion1.exp
@@ -80,7 +80,7 @@ if_test(a##0:position.position, b##0:position.position, ?r##0:position.position)
 ; ModuleID = 'alias_recursion1'
 
 source_filename = "!ROOT!/final-dump/alias_recursion1.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- after calling if_test, pa and pb should be the same: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- before proc call: \00", align 8
@@ -101,13 +101,13 @@ target triple    ????
 @"string#16" = private unnamed_addr constant {i64, i64} { i64 27, i64 ptrtoint( ptr @"cstring#7" to i64 ) }, align 8
 @"string#17" = private unnamed_addr constant {i64, i64} { i64 20, i64 ptrtoint( ptr @"cstring#8" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_recursion1.<0>"() {
+define external fastcc void @"alias_recursion1#.<0>"() {
   %"tmp#24##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#24##0" to i64
   %"tmp#25##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -122,24 +122,24 @@ define external fastcc void @"alias_recursion1.<0>"() {
   %"tmp#30##0" = add i64 %"tmp#8##0", 8
   %"tmp#31##0" = inttoptr i64 %"tmp#30##0" to ptr
   store i64 -201, ptr %"tmp#31##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#4##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#8##0")
-  %"r##0" = tail call fastcc i64 @"alias_recursion1.if_test<0>"(i64 %"tmp#4##0", i64 %"tmp#8##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#4##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#8##0")
+  %"r##0" = tail call fastcc i64 @"alias_recursion1#.if_test<0>"(i64 %"tmp#4##0", i64 %"tmp#8##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#4##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#8##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#4##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#8##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#17" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"r##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#17" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"r##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
   call ccc void @putchar(i8 10)
   %"tmp#32##0" = inttoptr i64 %"tmp#4##0" to ptr
   %"tmp#33##0" = call ccc ptr @wybe_malloc(i32 16)
@@ -147,20 +147,20 @@ define external fastcc void @"alias_recursion1.<0>"() {
   %"tmp#34##0" = ptrtoint ptr %"tmp#33##0" to i64
   %"tmp#35##0" = inttoptr i64 %"tmp#34##0" to ptr
   store i64 -1000, ptr %"tmp#35##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#34##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"r##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#34##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"r##0")
   ret void
 }
 
-define external fastcc i64 @"alias_recursion1.if_test<0>"(i64 %"a##0", i64 %"b##0") {
+define external fastcc i64 @"alias_recursion1#.if_test<0>"(i64 %"a##0", i64 %"b##0") {
   %"tmp#5##0" = inttoptr i64 %"a##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#5##0"
   %"tmp#1##0" = icmp sgt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#6##0" = tail call fastcc i64 @"alias_recursion1.if_test<0>"(i64 %"b##0", i64 %"a##0")
+  %"tmp#6##0" = tail call fastcc i64 @"alias_recursion1#.if_test<0>"(i64 %"b##0", i64 %"a##0")
   ret i64 %"tmp#6##0"
 if.else.0:
   ret i64 %"a##0"
@@ -213,28 +213,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -347,13 +347,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -373,7 +373,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -384,7 +384,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -395,13 +395,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -411,14 +411,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -429,7 +429,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_scc_proc.exp b/test-cases/final-dump/alias_scc_proc.exp
index b6ac38ae..6dfd902b 100644
--- a/test-cases/final-dump/alias_scc_proc.exp
+++ b/test-cases/final-dump/alias_scc_proc.exp
@@ -121,7 +121,7 @@ foo(p1##0:position.position, ?p2##0:position.position, ?p3##0:position.position)
 ; ModuleID = 'alias_scc_proc'
 
 source_filename = "!ROOT!/final-dump/alias_scc_proc.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"--- After calling foo: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"--- Inside foo: expect p3(3,3):\00", align 8
@@ -134,13 +134,13 @@ target triple    ????
 @"string#8" = private unnamed_addr constant {i64, i64} { i64 15, i64 ptrtoint( ptr @"cstring#3" to i64 ) }, align 8
 @"string#9" = private unnamed_addr constant {i64, i64} { i64 15, i64 ptrtoint( ptr @"cstring#4" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_scc_proc.<0>"() {
+define external fastcc void @"alias_scc_proc#.<0>"() {
   %"tmp#8##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#8##0" to i64
   %"tmp#9##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -148,21 +148,21 @@ define external fastcc void @"alias_scc_proc.<0>"() {
   %"tmp#10##0" = add i64 %"tmp#3##0", 8
   %"tmp#11##0" = inttoptr i64 %"tmp#10##0" to ptr
   store i64 1, ptr %"tmp#11##0"
-  %"tmp#12##0" = tail call fastcc {i64, i64} @"alias_scc_proc.foo<0>"(i64 %"tmp#3##0")
+  %"tmp#12##0" = tail call fastcc {i64, i64} @"alias_scc_proc#.foo<0>"(i64 %"tmp#3##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#12##0", 0
   %"p3##0" = extractvalue {i64, i64}%"tmp#12##0", 1
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"p3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"p3##0")
   ret void
 }
 
-define external fastcc i64 @"alias_scc_proc.bar<0>"(i64 %"p1##0") {
+define external fastcc i64 @"alias_scc_proc#.bar<0>"(i64 %"p1##0") {
   %"tmp#12##0" = add i64 %"p1##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#13##0"
@@ -179,13 +179,13 @@ if.else.0:
   %"tmp#17##0" = add i64 %"tmp#16##0", 8
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#18##0"
-  %"tmp#19##0" = tail call fastcc {i64, i64} @"alias_scc_proc.foo<0>[410bae77d3]"(i64 %"tmp#16##0")
+  %"tmp#19##0" = tail call fastcc {i64, i64} @"alias_scc_proc#.foo<0>[410bae77d3]"(i64 %"tmp#16##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#19##0", 0
   %"tmp#20##0" = extractvalue {i64, i64}%"tmp#19##0", 1
   ret i64 %"tmp#20##0"
 }
 
-define external fastcc i64 @"alias_scc_proc.bar<0>[410bae77d3]"(i64 %"p1##0") {
+define external fastcc i64 @"alias_scc_proc#.bar<0>[410bae77d3]"(i64 %"p1##0") {
   %"tmp#12##0" = add i64 %"p1##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#13##0"
@@ -198,13 +198,13 @@ if.else.0:
   %"tmp#14##0" = add i64 %"p1##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   store i64 %"tmp#2##0", ptr %"tmp#15##0"
-  %"tmp#16##0" = tail call fastcc {i64, i64} @"alias_scc_proc.foo<0>[410bae77d3]"(i64 %"p1##0")
+  %"tmp#16##0" = tail call fastcc {i64, i64} @"alias_scc_proc#.foo<0>[410bae77d3]"(i64 %"p1##0")
   %"p2##0" = extractvalue {i64, i64}%"tmp#16##0", 0
   %"tmp#17##0" = extractvalue {i64, i64}%"tmp#16##0", 1
   ret i64 %"tmp#17##0"
 }
 
-define external fastcc {i64, i64} @"alias_scc_proc.foo<0>"(i64 %"p1##0") {
+define external fastcc {i64, i64} @"alias_scc_proc#.foo<0>"(i64 %"p1##0") {
   %"tmp#22##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#22##0"
   %"tmp#5##0" = icmp sgt i64 %"tmp#0##0", 1
@@ -217,8 +217,8 @@ if.then.0:
   %"tmp#25##0" = add i64 %"tmp#20##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
   store i64 3, ptr %"tmp#26##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#20##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#20##0")
   %"tmp#27##0" = insertvalue {i64, i64} undef, i64 %"p1##0", 0
   %"tmp#28##0" = insertvalue {i64, i64} %"tmp#27##0", i64 %"tmp#20##0", 1
   ret {i64, i64} %"tmp#28##0"
@@ -230,7 +230,7 @@ if.else.0:
   %"tmp#31##0" = ptrtoint ptr %"tmp#30##0" to i64
   %"tmp#32##0" = inttoptr i64 %"tmp#31##0" to ptr
   store i64 %"tmp#3##0", ptr %"tmp#32##0"
-  %"tmp#33##0" = tail call fastcc i64 @"alias_scc_proc.bar<0>[410bae77d3]"(i64 %"tmp#31##0")
+  %"tmp#33##0" = tail call fastcc i64 @"alias_scc_proc#.bar<0>[410bae77d3]"(i64 %"tmp#31##0")
   %"tmp#34##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#16##0" = ptrtoint ptr %"tmp#34##0" to i64
   %"tmp#35##0" = inttoptr i64 %"tmp#16##0" to ptr
@@ -243,7 +243,7 @@ if.else.0:
   ret {i64, i64} %"tmp#39##0"
 }
 
-define external fastcc {i64, i64} @"alias_scc_proc.foo<0>[410bae77d3]"(i64 %"p1##0") {
+define external fastcc {i64, i64} @"alias_scc_proc#.foo<0>[410bae77d3]"(i64 %"p1##0") {
   %"tmp#22##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#22##0"
   %"tmp#5##0" = icmp sgt i64 %"tmp#0##0", 1
@@ -256,8 +256,8 @@ if.then.0:
   %"tmp#25##0" = add i64 %"tmp#20##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
   store i64 3, ptr %"tmp#26##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#20##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#20##0")
   %"tmp#27##0" = insertvalue {i64, i64} undef, i64 %"p1##0", 0
   %"tmp#28##0" = insertvalue {i64, i64} %"tmp#27##0", i64 %"tmp#20##0", 1
   ret {i64, i64} %"tmp#28##0"
@@ -265,7 +265,7 @@ if.else.0:
   %"tmp#3##0" = add i64 %"tmp#0##0", 1
   %"tmp#29##0" = inttoptr i64 %"p1##0" to ptr
   store i64 %"tmp#3##0", ptr %"tmp#29##0"
-  %"tmp#30##0" = tail call fastcc i64 @"alias_scc_proc.bar<0>[410bae77d3]"(i64 %"p1##0")
+  %"tmp#30##0" = tail call fastcc i64 @"alias_scc_proc#.bar<0>[410bae77d3]"(i64 %"p1##0")
   %"tmp#31##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#16##0" = ptrtoint ptr %"tmp#31##0" to i64
   %"tmp#32##0" = inttoptr i64 %"tmp#16##0" to ptr
@@ -325,28 +325,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -459,13 +459,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -485,7 +485,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -496,7 +496,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -507,13 +507,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -523,14 +523,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -541,7 +541,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_type1.exp b/test-cases/final-dump/alias_type1.exp
index a4486e35..7a935caf 100644
--- a/test-cases/final-dump/alias_type1.exp
+++ b/test-cases/final-dump/alias_type1.exp
@@ -59,7 +59,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'alias_type1'
 
 source_filename = "!ROOT!/final-dump/alias_type1.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -67,7 +67,7 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_type1.<0>"() {
+define external fastcc void @"alias_type1#.<0>"() {
   %"tmp#26##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#6##0" = ptrtoint ptr %"tmp#26##0" to i64
   %"tmp#27##0" = inttoptr i64 %"tmp#6##0" to ptr
@@ -207,13 +207,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'alias_type1.position'
 
 source_filename = "!ROOT!/final-dump/alias_type1.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"alias_type1.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type1#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -233,7 +233,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"alias_type1.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"alias_type1#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -244,7 +244,7 @@ define external fastcc i64 @"alias_type1.position.position<0>"(i64 %"x##0", i64
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"alias_type1.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"alias_type1#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -255,13 +255,13 @@ define external fastcc {i64, i64} @"alias_type1.position.position<1>"(i64 %"#res
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"alias_type1.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type1#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"alias_type1.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type1#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -271,14 +271,14 @@ define external fastcc i64 @"alias_type1.position.x<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type1.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type1#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type1.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type1#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -289,7 +289,7 @@ define external fastcc i64 @"alias_type1.position.y<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"alias_type1.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type1#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
@@ -442,13 +442,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'alias_type1.posrec'
 
 source_filename = "!ROOT!/final-dump/alias_type1.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"alias_type1.posrec.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type1#.posrec#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#14##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#a##0" = load i64, ptr %"tmp#14##0"
   %"tmp#15##0" = add i64 %"#left##0", 8
@@ -483,13 +483,13 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"alias_type1.posrec.a<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type1#.posrec#.a<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"alias_type1.posrec.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type1#.posrec#.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -499,14 +499,14 @@ define external fastcc i64 @"alias_type1.posrec.a<1>"(i64 %"#rec##0", i64 %"#fie
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type1.posrec.p<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type1#.posrec#.p<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type1.posrec.p<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type1#.posrec#.p<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -517,7 +517,7 @@ define external fastcc i64 @"alias_type1.posrec.p<1>"(i64 %"#rec##0", i64 %"#fie
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type1.posrec.posrec<0>"(i64 %"a##0", i64 %"p##0") {
+define external fastcc i64 @"alias_type1#.posrec#.posrec<0>"(i64 %"a##0", i64 %"p##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -528,7 +528,7 @@ define external fastcc i64 @"alias_type1.posrec.posrec<0>"(i64 %"a##0", i64 %"p#
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"alias_type1.posrec.posrec<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"alias_type1#.posrec#.posrec<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -539,7 +539,7 @@ define external fastcc {i64, i64} @"alias_type1.posrec.posrec<1>"(i64 %"#result#
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"alias_type1.posrec.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type1#.posrec#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#13##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#13##0"
   %"tmp#14##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_type2.exp b/test-cases/final-dump/alias_type2.exp
index 79aea96d..1d6021d5 100644
--- a/test-cases/final-dump/alias_type2.exp
+++ b/test-cases/final-dump/alias_type2.exp
@@ -61,7 +61,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'alias_type2'
 
 source_filename = "!ROOT!/final-dump/alias_type2.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -69,7 +69,7 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_type2.<0>"() {
+define external fastcc void @"alias_type2#.<0>"() {
   %"tmp#30##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#7##0" = ptrtoint ptr %"tmp#30##0" to i64
   %"tmp#31##0" = inttoptr i64 %"tmp#7##0" to ptr
@@ -218,13 +218,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'alias_type2.position'
 
 source_filename = "!ROOT!/final-dump/alias_type2.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"alias_type2.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type2#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -244,7 +244,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"alias_type2.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"alias_type2#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -255,7 +255,7 @@ define external fastcc i64 @"alias_type2.position.position<0>"(i64 %"x##0", i64
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"alias_type2.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"alias_type2#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -266,13 +266,13 @@ define external fastcc {i64, i64} @"alias_type2.position.position<1>"(i64 %"#res
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"alias_type2.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type2#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"alias_type2.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type2#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -282,14 +282,14 @@ define external fastcc i64 @"alias_type2.position.x<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type2.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type2#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type2.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type2#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -300,7 +300,7 @@ define external fastcc i64 @"alias_type2.position.y<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"alias_type2.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type2#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
@@ -453,13 +453,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'alias_type2.posrec'
 
 source_filename = "!ROOT!/final-dump/alias_type2.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"alias_type2.posrec.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type2#.posrec#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#14##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#p##0" = load i64, ptr %"tmp#14##0"
   %"tmp#15##0" = add i64 %"#left##0", 8
@@ -494,14 +494,14 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"alias_type2.posrec.a<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type2#.posrec#.a<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type2.posrec.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type2#.posrec#.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -512,13 +512,13 @@ define external fastcc i64 @"alias_type2.posrec.a<1>"(i64 %"#rec##0", i64 %"#fie
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type2.posrec.p<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type2#.posrec#.p<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"alias_type2.posrec.p<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type2#.posrec#.p<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -528,7 +528,7 @@ define external fastcc i64 @"alias_type2.posrec.p<1>"(i64 %"#rec##0", i64 %"#fie
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type2.posrec.posrec<0>"(i64 %"p##0", i64 %"a##0") {
+define external fastcc i64 @"alias_type2#.posrec#.posrec<0>"(i64 %"p##0", i64 %"a##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -539,7 +539,7 @@ define external fastcc i64 @"alias_type2.posrec.posrec<0>"(i64 %"p##0", i64 %"a#
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"alias_type2.posrec.posrec<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"alias_type2#.posrec#.posrec<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -550,7 +550,7 @@ define external fastcc {i64, i64} @"alias_type2.posrec.posrec<1>"(i64 %"#result#
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"alias_type2.posrec.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type2#.posrec#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#13##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#13##0"
   %"tmp#14##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_type3.exp b/test-cases/final-dump/alias_type3.exp
index d068d787..fe10b40c 100644
--- a/test-cases/final-dump/alias_type3.exp
+++ b/test-cases/final-dump/alias_type3.exp
@@ -64,7 +64,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'alias_type3'
 
 source_filename = "!ROOT!/final-dump/alias_type3.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -72,7 +72,7 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_type3.<0>"() {
+define external fastcc void @"alias_type3#.<0>"() {
   %"tmp#36##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#8##0" = ptrtoint ptr %"tmp#36##0" to i64
   %"tmp#37##0" = inttoptr i64 %"tmp#8##0" to ptr
@@ -223,13 +223,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'alias_type3.position'
 
 source_filename = "!ROOT!/final-dump/alias_type3.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"alias_type3.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type3#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -249,7 +249,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"alias_type3.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"alias_type3#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -260,7 +260,7 @@ define external fastcc i64 @"alias_type3.position.position<0>"(i64 %"x##0", i64
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"alias_type3.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"alias_type3#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -271,13 +271,13 @@ define external fastcc {i64, i64} @"alias_type3.position.position<1>"(i64 %"#res
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"alias_type3.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type3#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"alias_type3.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type3#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -287,14 +287,14 @@ define external fastcc i64 @"alias_type3.position.x<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type3.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type3#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type3.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type3#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -305,7 +305,7 @@ define external fastcc i64 @"alias_type3.position.y<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"alias_type3.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type3#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
@@ -458,13 +458,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'alias_type3.posrec'
 
 source_filename = "!ROOT!/final-dump/alias_type3.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"alias_type3.posrec.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type3#.posrec#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#14##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#p##0" = load i64, ptr %"tmp#14##0"
   %"tmp#15##0" = add i64 %"#left##0", 8
@@ -499,14 +499,14 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"alias_type3.posrec.a<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type3#.posrec#.a<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type3.posrec.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type3#.posrec#.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -517,13 +517,13 @@ define external fastcc i64 @"alias_type3.posrec.a<1>"(i64 %"#rec##0", i64 %"#fie
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type3.posrec.p<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type3#.posrec#.p<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"alias_type3.posrec.p<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type3#.posrec#.p<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -533,7 +533,7 @@ define external fastcc i64 @"alias_type3.posrec.p<1>"(i64 %"#rec##0", i64 %"#fie
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type3.posrec.posrec<0>"(i64 %"p##0", i64 %"a##0") {
+define external fastcc i64 @"alias_type3#.posrec#.posrec<0>"(i64 %"p##0", i64 %"a##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -544,7 +544,7 @@ define external fastcc i64 @"alias_type3.posrec.posrec<0>"(i64 %"p##0", i64 %"a#
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"alias_type3.posrec.posrec<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"alias_type3#.posrec#.posrec<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -555,7 +555,7 @@ define external fastcc {i64, i64} @"alias_type3.posrec.posrec<1>"(i64 %"#result#
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"alias_type3.posrec.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type3#.posrec#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#13##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#13##0"
   %"tmp#14##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alias_type4.exp b/test-cases/final-dump/alias_type4.exp
index bd830a3b..b88d17c0 100644
--- a/test-cases/final-dump/alias_type4.exp
+++ b/test-cases/final-dump/alias_type4.exp
@@ -75,7 +75,7 @@ foo(r1##0:alias_type4.posrec)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'alias_type4'
 
 source_filename = "!ROOT!/final-dump/alias_type4.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -83,7 +83,7 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alias_type4.<0>"() {
+define external fastcc void @"alias_type4#.<0>"() {
   %"tmp#12##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#12##0" to i64
   %"tmp#13##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -98,11 +98,11 @@ define external fastcc void @"alias_type4.<0>"() {
   %"tmp#18##0" = add i64 %"tmp#9##0", 8
   %"tmp#19##0" = inttoptr i64 %"tmp#18##0" to ptr
   store i64 1, ptr %"tmp#19##0"
-  tail call fastcc void @"alias_type4.foo<0>[410bae77d3]"(i64 %"tmp#9##0")
+  tail call fastcc void @"alias_type4#.foo<0>[410bae77d3]"(i64 %"tmp#9##0")
   ret void
 }
 
-define external fastcc void @"alias_type4.foo<0>"(i64 %"r1##0") {
+define external fastcc void @"alias_type4#.foo<0>"(i64 %"r1##0") {
   %"tmp#10##0" = inttoptr i64 %"r1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#10##0"
   %"tmp#11##0" = inttoptr i64 %"tmp#0##0" to ptr
@@ -118,7 +118,7 @@ define external fastcc void @"alias_type4.foo<0>"(i64 %"r1##0") {
   ret void
 }
 
-define external fastcc void @"alias_type4.foo<0>[410bae77d3]"(i64 %"r1##0") {
+define external fastcc void @"alias_type4#.foo<0>[410bae77d3]"(i64 %"r1##0") {
   %"tmp#10##0" = inttoptr i64 %"r1##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#10##0"
   %"tmp#11##0" = inttoptr i64 %"tmp#0##0" to ptr
@@ -238,13 +238,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'alias_type4.position'
 
 source_filename = "!ROOT!/final-dump/alias_type4.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"alias_type4.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type4#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -264,7 +264,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"alias_type4.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"alias_type4#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -275,7 +275,7 @@ define external fastcc i64 @"alias_type4.position.position<0>"(i64 %"x##0", i64
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"alias_type4.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"alias_type4#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -286,13 +286,13 @@ define external fastcc {i64, i64} @"alias_type4.position.position<1>"(i64 %"#res
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"alias_type4.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type4#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"alias_type4.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type4#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -302,14 +302,14 @@ define external fastcc i64 @"alias_type4.position.x<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type4.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type4#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type4.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type4#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -320,7 +320,7 @@ define external fastcc i64 @"alias_type4.position.y<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"alias_type4.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type4#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
@@ -473,13 +473,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'alias_type4.posrec'
 
 source_filename = "!ROOT!/final-dump/alias_type4.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"alias_type4.posrec.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type4#.posrec#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#14##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#p##0" = load i64, ptr %"tmp#14##0"
   %"tmp#15##0" = add i64 %"#left##0", 8
@@ -514,14 +514,14 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"alias_type4.posrec.a<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type4#.posrec#.a<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type4.posrec.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type4#.posrec#.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -532,13 +532,13 @@ define external fastcc i64 @"alias_type4.posrec.a<1>"(i64 %"#rec##0", i64 %"#fie
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type4.posrec.p<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"alias_type4#.posrec#.p<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"alias_type4.posrec.p<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"alias_type4#.posrec#.p<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -548,7 +548,7 @@ define external fastcc i64 @"alias_type4.posrec.p<1>"(i64 %"#rec##0", i64 %"#fie
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"alias_type4.posrec.posrec<0>"(i64 %"p##0", i64 %"a##0") {
+define external fastcc i64 @"alias_type4#.posrec#.posrec<0>"(i64 %"p##0", i64 %"a##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -559,7 +559,7 @@ define external fastcc i64 @"alias_type4.posrec.posrec<0>"(i64 %"p##0", i64 %"a#
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"alias_type4.posrec.posrec<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"alias_type4#.posrec#.posrec<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -570,7 +570,7 @@ define external fastcc {i64, i64} @"alias_type4.posrec.posrec<1>"(i64 %"#result#
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"alias_type4.posrec.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"alias_type4#.posrec#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#13##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#13##0"
   %"tmp#14##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/alloc_args.exp b/test-cases/final-dump/alloc_args.exp
index 0589001c..5fca54b6 100644
--- a/test-cases/final-dump/alloc_args.exp
+++ b/test-cases/final-dump/alloc_args.exp
@@ -39,26 +39,26 @@ foo(size##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'alloc_args'
 
 source_filename = "!ROOT!/final-dump/alloc_args.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"alloc_args.<0>"() {
-  tail call fastcc void @"alloc_args.foo<0>"(i64 1)
+define external fastcc void @"alloc_args#.<0>"() {
+  tail call fastcc void @"alloc_args#.foo<0>"(i64 1)
   ret void
 }
 
-define external fastcc void @"alloc_args.foo<0>"(i64 %"size##0") {
+define external fastcc void @"alloc_args#.foo<0>"(i64 %"size##0") {
   %"tmp#4##0" = trunc i64 %"size##0" to i32
   %"tmp#5##0" = call ccc ptr @wybe_malloc(i32 %"tmp#4##0")
   %"str##0" = ptrtoint ptr %"tmp#5##0" to i64
   %"tmp#6##0" = inttoptr i64 %"str##0" to ptr
   store i64 0, ptr %"tmp#6##0"
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"str##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"str##0")
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/ancestor_alias.exp b/test-cases/final-dump/ancestor_alias.exp
index 9aad15ab..d90832f6 100644
--- a/test-cases/final-dump/ancestor_alias.exp
+++ b/test-cases/final-dump/ancestor_alias.exp
@@ -38,15 +38,15 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'ancestor_alias'
 
 source_filename = "!ROOT!/final-dump/ancestor_alias.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ancestor_alias.<0>"() {
-  tail call fastcc void @"ancestor_alias.b.a.foo<0>"()
-  tail call fastcc void @"ancestor_alias.b.a.foo<0>"()
-  tail call fastcc void @"ancestor_alias.a.foo<0>"()
+define external fastcc void @"ancestor_alias#.<0>"() {
+  tail call fastcc void @"ancestor_alias#.b#.a#.foo<0>"()
+  tail call fastcc void @"ancestor_alias#.b#.a#.foo<0>"()
+  tail call fastcc void @"ancestor_alias#.a#.foo<0>"()
   ret void
 }
 
@@ -83,18 +83,18 @@ foo()<{}; {}; {}>:
 ; ModuleID = 'ancestor_alias.a'
 
 source_filename = "!ROOT!/final-dump/ancestor_alias.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ancestor_alias.a.<0>"() {
-  tail call fastcc void @"ancestor_alias.b.c.foo<0>"()
-  tail call fastcc void @"ancestor_alias.a.foo<0>"()
+define external fastcc void @"ancestor_alias#.a#.<0>"() {
+  tail call fastcc void @"ancestor_alias#.b#.c#.foo<0>"()
+  tail call fastcc void @"ancestor_alias#.a#.foo<0>"()
   ret void
 }
 
-define external fastcc void @"ancestor_alias.a.foo<0>"() {
+define external fastcc void @"ancestor_alias#.a#.foo<0>"() {
   ret void
 }
 
@@ -130,14 +130,14 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'ancestor_alias.b'
 
 source_filename = "!ROOT!/final-dump/ancestor_alias.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ancestor_alias.b.<0>"() {
-  tail call fastcc void @"ancestor_alias.b.a.foo<0>"()
-  tail call fastcc void @"ancestor_alias.a.foo<0>"()
+define external fastcc void @"ancestor_alias#.b#.<0>"() {
+  tail call fastcc void @"ancestor_alias#.b#.a#.foo<0>"()
+  tail call fastcc void @"ancestor_alias#.a#.foo<0>"()
   ret void
 }
 
@@ -164,12 +164,12 @@ foo()<{}; {}; {}>:
 ; ModuleID = 'ancestor_alias.b.a'
 
 source_filename = "!ROOT!/final-dump/ancestor_alias.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ancestor_alias.b.a.foo<0>"() {
+define external fastcc void @"ancestor_alias#.b#.a#.foo<0>"() {
   ret void
 }
 
@@ -207,18 +207,18 @@ foo()<{}; {}; {}>:
 ; ModuleID = 'ancestor_alias.b.c'
 
 source_filename = "!ROOT!/final-dump/ancestor_alias.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ancestor_alias.b.c.<0>"() {
-  tail call fastcc void @"ancestor_alias.b.c.foo<0>"()
-  tail call fastcc void @"ancestor_alias.b.a.foo<0>"()
-  tail call fastcc void @"ancestor_alias.a.foo<0>"()
+define external fastcc void @"ancestor_alias#.b#.c#.<0>"() {
+  tail call fastcc void @"ancestor_alias#.b#.c#.foo<0>"()
+  tail call fastcc void @"ancestor_alias#.b#.a#.foo<0>"()
+  tail call fastcc void @"ancestor_alias#.a#.foo<0>"()
   ret void
 }
 
-define external fastcc void @"ancestor_alias.b.c.foo<0>"() {
+define external fastcc void @"ancestor_alias#.b#.c#.foo<0>"() {
   ret void
 }
diff --git a/test-cases/final-dump/anon_field.exp b/test-cases/final-dump/anon_field.exp
index da0c85c4..10a1ee03 100644
--- a/test-cases/final-dump/anon_field.exp
+++ b/test-cases/final-dump/anon_field.exp
@@ -361,7 +361,7 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'anon_field'
 
 source_filename = "!ROOT!/final-dump/anon_field.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"bad\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"good\00", align 8
@@ -372,12 +372,12 @@ target triple    ????
 @"string#6" = private unnamed_addr constant {i64, i64} { i64 5, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 @"string#7" = private unnamed_addr constant {i64, i64} { i64 5, i64 ptrtoint( ptr @"cstring#3" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"anon_field.<0>"() {
+define external fastcc void @"anon_field#.<0>"() {
   %"tmp#30##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#21##0" = ptrtoint ptr %"tmp#30##0" to i64
   %"tmp#31##0" = inttoptr i64 %"tmp#21##0" to ptr
@@ -393,19 +393,19 @@ define external fastcc void @"anon_field.<0>"() {
   %"tmp#37##0" = inttoptr i64 %"tmp#25##0" to ptr
   store i64 1, ptr %"tmp#37##0"
   %"tmp#2##0" = or i64 %"tmp#25##0", 1
-  %"tmp#17##0" = tail call fastcc i1 @"anon_field.=<0>"(i64 %"tmp#21##0", i64 %"tmp#2##0")
+  %"tmp#17##0" = tail call fastcc i1 @"anon_field#.=<0>"(i64 %"tmp#21##0", i64 %"tmp#2##0")
   br i1 %"tmp#17##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"anon_field.#cont#1<0>"()
+  tail call fastcc void @"anon_field#.#cont#1<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"anon_field.#cont#1<0>"()
+  tail call fastcc void @"anon_field#.#cont#1<0>"()
   ret void
 }
 
-define external fastcc void @"anon_field.#cont#1<0>"() {
+define external fastcc void @"anon_field#.#cont#1<0>"() {
   %"tmp#31##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#20##0" = ptrtoint ptr %"tmp#31##0" to i64
   %"tmp#32##0" = inttoptr i64 %"tmp#20##0" to ptr
@@ -421,16 +421,16 @@ define external fastcc void @"anon_field.#cont#1<0>"() {
   %"tmp#25##0" = icmp eq i2 %"tmp#24##0", 0
   br i1 %"tmp#25##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"anon_field.#cont#2<0>"()
+  tail call fastcc void @"anon_field#.#cont#2<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"anon_field.#cont#2<0>"()
+  tail call fastcc void @"anon_field#.#cont#2<0>"()
   ret void
 }
 
-define external fastcc void @"anon_field.#cont#2<0>"() {
+define external fastcc void @"anon_field#.#cont#2<0>"() {
   %"tmp#30##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#18##0" = ptrtoint ptr %"tmp#30##0" to i64
   %"tmp#31##0" = inttoptr i64 %"tmp#18##0" to ptr
@@ -451,19 +451,19 @@ define external fastcc void @"anon_field.#cont#2<0>"() {
   %"tmp#40##0" = add i64 %"tmp#24##0", 16
   %"tmp#41##0" = inttoptr i64 %"tmp#40##0" to ptr
   store i64 1, ptr %"tmp#41##0"
-  %"tmp#14##0" = tail call fastcc i1 @"anon_field.=<0>"(i64 %"tmp#18##0", i64 %"tmp#24##0")
+  %"tmp#14##0" = tail call fastcc i1 @"anon_field#.=<0>"(i64 %"tmp#18##0", i64 %"tmp#24##0")
   br i1 %"tmp#14##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"anon_field.#cont#3<0>"()
+  tail call fastcc void @"anon_field#.#cont#3<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"anon_field.#cont#3<0>"()
+  tail call fastcc void @"anon_field#.#cont#3<0>"()
   ret void
 }
 
-define external fastcc void @"anon_field.#cont#3<0>"() {
+define external fastcc void @"anon_field#.#cont#3<0>"() {
   %"tmp#25##0" = call ccc ptr @wybe_malloc(i32 8)
   %"tmp#15##0" = ptrtoint ptr %"tmp#25##0" to i64
   %"tmp#26##0" = inttoptr i64 %"tmp#15##0" to ptr
@@ -480,7 +480,7 @@ if.then.0:
   %"tmp#13##0" = icmp ne i64 %"tmp#10##0", 2
   br i1 %"tmp#13##0", label %if.then.1, label %if.else.1
 if.then.1:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 if.else.1:
@@ -489,7 +489,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc i1 @"anon_field.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"anon_field#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#45##0" = trunc i64 %"#left##0" to i2
   %"tmp#13##0" = and i2 %"tmp#45##0", 3
   switch i2 %"tmp#13##0", label %case.3.switch.0 [
@@ -569,7 +569,7 @@ case.3.switch.0:
   ret i1 0
 }
 
-define external fastcc i64 @"anon_field.bar<0>"(i64 %"bar#1##0") {
+define external fastcc i64 @"anon_field#.bar<0>"(i64 %"bar#1##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -578,7 +578,7 @@ define external fastcc i64 @"anon_field.bar<0>"(i64 %"bar#1##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"anon_field.bar<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"anon_field#.bar<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 1
@@ -596,7 +596,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"anon_field.baz<0>"(i64 %"field##0") {
+define external fastcc i64 @"anon_field#.baz<0>"(i64 %"field##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -605,7 +605,7 @@ define external fastcc i64 @"anon_field.baz<0>"(i64 %"field##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"anon_field.baz<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"anon_field#.baz<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 2
@@ -623,7 +623,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"anon_field.field<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"anon_field#.field<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 2
@@ -641,7 +641,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"anon_field.field<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"anon_field#.field<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 2
@@ -665,7 +665,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc i64 @"anon_field.foo<0>"(i64 %"foo#1##0", i1 %"foo#2##0", i64 %"i##0") {
+define external fastcc i64 @"anon_field#.foo<0>"(i64 %"foo#1##0", i1 %"foo#2##0", i64 %"i##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -679,7 +679,7 @@ define external fastcc i64 @"anon_field.foo<0>"(i64 %"foo#1##0", i1 %"foo#2##0",
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1, i64, i1} @"anon_field.foo<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1, i64, i1} @"anon_field#.foo<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 0
@@ -706,7 +706,7 @@ if.else.0:
   ret {i64, i1, i64, i1} %"tmp#18##0"
 }
 
-define external fastcc {i64, i1} @"anon_field.i<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"anon_field#.i<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 0
@@ -724,7 +724,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"anon_field.i<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"anon_field#.i<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 0
@@ -746,8 +746,8 @@ if.else.0:
   ret {i64, i1} %"tmp#11##0"
 }
 
-define external fastcc i1 @"anon_field.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"anon_field.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"anon_field#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"anon_field#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
@@ -844,13 +844,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'anon_field.quux'
 
 source_filename = "!ROOT!/final-dump/anon_field.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"anon_field.quux.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"anon_field#.quux#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#quuz#1##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -870,14 +870,14 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"anon_field.quux.j<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"anon_field#.quux#.j<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"anon_field.quux.j<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"anon_field#.quux#.j<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -888,7 +888,7 @@ define external fastcc i64 @"anon_field.quux.j<1>"(i64 %"#rec##0", i64 %"#field#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"anon_field.quux.quuz<0>"(i64 %"quuz#1##0", i64 %"j##0") {
+define external fastcc i64 @"anon_field#.quux#.quuz<0>"(i64 %"quuz#1##0", i64 %"j##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -899,7 +899,7 @@ define external fastcc i64 @"anon_field.quux.quuz<0>"(i64 %"quuz#1##0", i64 %"j#
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"anon_field.quux.quuz<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"anon_field#.quux#.quuz<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -910,7 +910,7 @@ define external fastcc {i64, i64} @"anon_field.quux.quuz<1>"(i64 %"#result##0")
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"anon_field.quux.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"anon_field#.quux#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/anon_field_variable.exp b/test-cases/final-dump/anon_field_variable.exp
index 82218803..21b01348 100644
--- a/test-cases/final-dump/anon_field_variable.exp
+++ b/test-cases/final-dump/anon_field_variable.exp
@@ -128,17 +128,17 @@ foo(?foo#1##0:T <{}; {}; {1}>, #result##0:anon_field_variable(T) <{}; {}; {1}>,
 ; ModuleID = 'anon_field_variable'
 
 source_filename = "!ROOT!/final-dump/anon_field_variable.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"foo\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"anon_field_variable.<0>"() {
+define external fastcc void @"anon_field_variable#.<0>"() {
   %"tmp#12##0" = call ccc ptr @wybe_malloc(i32 8)
   %"tmp#5##0" = ptrtoint ptr %"tmp#12##0" to i64
   %"tmp#13##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -148,14 +148,14 @@ define external fastcc void @"anon_field_variable.<0>"() {
   %"tmp#8##0" = icmp eq i1 %"tmp#7##0", 0
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc i64 @"anon_field_variable.bar<0>"(i64 %"bar#1##0", i64 %"field##0", i64 %"bar#3##0") {
+define external fastcc i64 @"anon_field_variable#.bar<0>"(i64 %"bar#1##0", i64 %"field##0", i64 %"bar#3##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -170,7 +170,7 @@ define external fastcc i64 @"anon_field_variable.bar<0>"(i64 %"bar#1##0", i64 %"
   ret i64 %"tmp#6##0"
 }
 
-define external fastcc {i64, i64, i64, i1} @"anon_field_variable.bar<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i1} @"anon_field_variable#.bar<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -198,7 +198,7 @@ if.else.0:
   ret {i64, i64, i64, i1} %"tmp#19##0"
 }
 
-define external fastcc {i64, i1} @"anon_field_variable.field<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"anon_field_variable#.field<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -216,7 +216,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"anon_field_variable.field<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"anon_field_variable#.field<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -240,7 +240,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc i64 @"anon_field_variable.foo<0>"(i64 %"foo#1##0") {
+define external fastcc i64 @"anon_field_variable#.foo<0>"(i64 %"foo#1##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -248,7 +248,7 @@ define external fastcc i64 @"anon_field_variable.foo<0>"(i64 %"foo#1##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"anon_field_variable.foo<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"anon_field_variable#.foo<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 0
diff --git a/test-cases/final-dump/assert_error.exp b/test-cases/final-dump/assert_error.exp
index 7d564063..1b2a149c 100644
--- a/test-cases/final-dump/assert_error.exp
+++ b/test-cases/final-dump/assert_error.exp
@@ -26,18 +26,18 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'assert_error'
 
 source_filename = "!ROOT!/final-dump/assert_error.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"assert_error:3:2\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"assert_error:5:2\00", align 8
 @"cstring#2" = private unnamed_addr constant [ ?? x i8 ] c"we should never get here\00", align 8
 
-declare external fastcc void @"wybe.control.assert<0>"(i1, i64)
+declare external fastcc void @"wybe#.control#.assert<0>"(i1, i64)
 declare external ccc void @error_exit(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"assert_error.<0>"() {
-  tail call fastcc void @"wybe.control.assert<0>"(i1 0, i64 ptrtoint( ptr @"cstring#0" to i64 ))
+define external fastcc void @"assert_error#.<0>"() {
+  tail call fastcc void @"wybe#.control#.assert<0>"(i1 0, i64 ptrtoint( ptr @"cstring#0" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#1" to i64 ), i64 ptrtoint( ptr @"cstring#2" to i64 ))
   ret void
 }
diff --git a/test-cases/final-dump/backquote_OK.exp b/test-cases/final-dump/backquote_OK.exp
index 584729ea..53a82f7a 100644
--- a/test-cases/final-dump/backquote_OK.exp
+++ b/test-cases/final-dump/backquote_OK.exp
@@ -25,11 +25,11 @@ OK backquote use!(?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'backquote_OK'
 
 source_filename = "!ROOT!/final-dump/backquote_OK.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"backquote_OK.OK backquote use!<0>"() {
+define external fastcc i64 @"backquote_OK#.OK backquote use!<0>"() {
   ret i64 1
 }
diff --git a/test-cases/final-dump/backwards_assign.exp b/test-cases/final-dump/backwards_assign.exp
index 97d5bfcc..23301106 100644
--- a/test-cases/final-dump/backwards_assign.exp
+++ b/test-cases/final-dump/backwards_assign.exp
@@ -52,32 +52,32 @@ backwards_assign(?output##0:wybe.int, input##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'backwards_assign'
 
 source_filename = "!ROOT!/final-dump/backwards_assign.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"backwards_assign.<0>"() {
-  tail call fastcc void @"backwards_assign.#cont#1<0>"(i64 0)
+define external fastcc void @"backwards_assign#.<0>"() {
+  tail call fastcc void @"backwards_assign#.#cont#1<0>"(i64 0)
   ret void
 }
 
-define external fastcc void @"backwards_assign.#cont#1<0>"(i64 %"i##0") {
+define external fastcc void @"backwards_assign#.#cont#1<0>"(i64 %"i##0") {
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
   %"i##1" = add i64 %"i##0", 1
   %"tmp#0##0" = icmp slt i64 %"i##1", 10
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"backwards_assign.#cont#1<0>"(i64 %"i##1")
+  tail call fastcc void @"backwards_assign#.#cont#1<0>"(i64 %"i##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc i64 @"backwards_assign.backwards_assign<0>"(i64 %"input##0") {
+define external fastcc i64 @"backwards_assign#.backwards_assign<0>"(i64 %"input##0") {
   %"tmp#3##0" = add i64 %"input##0", 1
   ret i64 %"tmp#3##0"
 }
diff --git a/test-cases/final-dump/bar.exp b/test-cases/final-dump/bar.exp
index 643afa0c..2a298bda 100644
--- a/test-cases/final-dump/bar.exp
+++ b/test-cases/final-dump/bar.exp
@@ -32,17 +32,17 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'bar'
 
 source_filename = "!ROOT!/final-dump/bar.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i64 @"numbers.factorial<0>"(i64)
+declare external fastcc i64 @"numbers#.factorial<0>"(i64)
 declare external ccc void @print_float(double)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"bar.<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"numbers.factorial<0>"(i64 4)
+define external fastcc void @"bar#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"numbers#.factorial<0>"(i64 4)
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   call ccc void @print_float(double 35.0)
@@ -104,34 +104,34 @@ toCelsius(f##0:wybe.float, ?#result##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'numbers'
 
 source_filename = "!ROOT!/final-dump/numbers.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Numbers has been initialised.\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 29, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"numbers.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"numbers#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"numbers.factorial<0>"(i64 %"n##0") {
+define external fastcc i64 @"numbers#.factorial<0>"(i64 %"n##0") {
   %"tmp#4##0" = icmp sle i64 %"n##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
   ret i64 1
 if.else.0:
   %"tmp#3##0" = sub i64 %"n##0", 1
-  %"tmp#2##0" = tail call fastcc i64 @"numbers.factorial<0>"(i64 %"tmp#3##0")
+  %"tmp#2##0" = tail call fastcc i64 @"numbers#.factorial<0>"(i64 %"tmp#3##0")
   %"tmp#11##0" = mul i64 %"n##0", %"tmp#2##0"
   ret i64 %"tmp#11##0"
 }
 
-define external fastcc double @"numbers.toCelsius<0>"(double %"f##0") {
+define external fastcc double @"numbers#.toCelsius<0>"(double %"f##0") {
   %"tmp#1##0" = fsub double %"f##0", 32.0
   %"tmp#6##0" = fdiv double %"tmp#1##0", 1.8
   ret double %"tmp#6##0"
diff --git a/test-cases/final-dump/bbb.exp b/test-cases/final-dump/bbb.exp
index f8085455..8f5065ce 100644
--- a/test-cases/final-dump/bbb.exp
+++ b/test-cases/final-dump/bbb.exp
@@ -29,17 +29,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'bbb'
 
 source_filename = "!ROOT!/final-dump/bbb.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"BBB: Init\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 9, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"bbb.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"bbb#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -70,17 +70,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'ddd'
 
 source_filename = "!ROOT!/final-dump/ddd.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"DDD: Init\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 9, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ddd.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"ddd#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/benchmark_fib.exp b/test-cases/final-dump/benchmark_fib.exp
index a2ff3bad..45ba2bbd 100644
--- a/test-cases/final-dump/benchmark_fib.exp
+++ b/test-cases/final-dump/benchmark_fib.exp
@@ -46,24 +46,24 @@ time_execution(proc##0:{semipure}(), ?time##0:wybe.float, %call_source_location#
 ; ModuleID = 'benchmark'
 
 source_filename = "!ROOT!/../wybelibs/benchmark.o"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc double @benchmark_end(i64)
 declare external ccc void @benchmark_start(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc double @"benchmark.end<0>"(i64 %"call_source_location##0") {
+define external fastcc double @"benchmark#.end<0>"(i64 %"call_source_location##0") {
   %"tmp#0##0" = call ccc double @benchmark_end(i64 %"call_source_location##0")
   ret double %"tmp#0##0"
 }
 
-define external fastcc void @"benchmark.start<0>"(i64 %"call_source_location##0") {
+define external fastcc void @"benchmark#.start<0>"(i64 %"call_source_location##0") {
   call ccc void @benchmark_start(i64 %"call_source_location##0")
   ret void
 }
 
-define external fastcc double @"benchmark.time_execution<0>"(ptr %"proc##0", i64 %"call_source_location##0") {
+define external fastcc double @"benchmark#.time_execution<0>"(ptr %"proc##0", i64 %"call_source_location##0") {
   call ccc void @benchmark_start(i64 %"call_source_location##0")
   %"tmp#0##0" = load ptr, ptr %"proc##0"
   tail call fastcc void %"tmp#0##0"(ptr %"proc##0")
@@ -222,7 +222,7 @@ naive_fib1(n##0:wybe.int, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'benchmark_fib'
 
 source_filename = "!ROOT!/final-dump/benchmark_fib.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Elapsed time (s):  \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"benchmark_fib:18:21\00", align 8
@@ -235,7 +235,7 @@ target triple    ????
 @"cstring#8" = private unnamed_addr constant [ ?? x i8 ] c"n should be strictly positive\00", align 8
 @"string#9" = private unnamed_addr constant {i64, i64} { i64 19, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc double @benchmark_end(i64)
 declare external ccc void @benchmark_start(i64)
 declare external ccc void @error_exit(i64, i64)
@@ -243,39 +243,39 @@ declare external ccc void @print_float(double)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"benchmark_fib.<0>"() {
+define external fastcc void @"benchmark_fib#.<0>"() {
   call ccc void @benchmark_start(i64 ptrtoint( ptr @"cstring#2" to i64 ))
-  %"res##0" = tail call fastcc i64 @"benchmark_fib.naive_fib<0>"(i64 42)
+  %"res##0" = tail call fastcc i64 @"benchmark_fib#.naive_fib<0>"(i64 42)
   %"time##0" = call ccc double @benchmark_end(i64 ptrtoint( ptr @"cstring#3" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @print_float(double %"time##0")
   call ccc void @putchar(i8 10)
   call ccc void @benchmark_start(i64 ptrtoint( ptr @"cstring#4" to i64 ))
-  %"res##1" = tail call fastcc i64 @"benchmark_fib.fib<0>"(i64 42)
+  %"res##1" = tail call fastcc i64 @"benchmark_fib#.fib<0>"(i64 42)
   %"time##1" = call ccc double @benchmark_end(i64 ptrtoint( ptr @"cstring#5" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @print_float(double %"time##1")
   call ccc void @putchar(i8 10)
   call ccc void @benchmark_start(i64 ptrtoint( ptr @"cstring#6" to i64 ))
-  tail call fastcc void @"benchmark_fib.#anon#1<0>"()
+  tail call fastcc void @"benchmark_fib#.#anon#1<0>"()
   %"time##2" = call ccc double @benchmark_end(i64 ptrtoint( ptr @"cstring#6" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @print_float(double %"time##2")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"benchmark_fib.#anon#1<0>"() {
-  %"res##0" = tail call fastcc i64 @"benchmark_fib.naive_fib<0>"(i64 42)
+define external fastcc void @"benchmark_fib#.#anon#1<0>"() {
+  %"res##0" = tail call fastcc i64 @"benchmark_fib#.naive_fib<0>"(i64 42)
   ret void
 }
 
-define external fastcc void @"benchmark_fib.#anon#1<1>"(ptr %"#env##0") {
-  %"tmp#0##0" = tail call fastcc i64 @"benchmark_fib.naive_fib<0>"(i64 42)
+define external fastcc void @"benchmark_fib#.#anon#1<1>"(ptr %"#env##0") {
+  %"tmp#0##0" = tail call fastcc i64 @"benchmark_fib#.naive_fib<0>"(i64 42)
   ret void
 }
 
-define external fastcc i64 @"benchmark_fib.fib<0>"(i64 %"n##0") {
+define external fastcc i64 @"benchmark_fib#.fib<0>"(i64 %"n##0") {
   %"tmp#4##0" = icmp sle i64 %"n##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -293,11 +293,11 @@ if.then.2:
   ret i64 1
 if.else.2:
   %"tmp#1##0" = sub i64 %"n##0", 3
-  %"tmp#15##0" = tail call fastcc i64 @"benchmark_fib.fib1<0>"(i64 1, i64 1, i64 %"tmp#1##0")
+  %"tmp#15##0" = tail call fastcc i64 @"benchmark_fib#.fib1<0>"(i64 1, i64 1, i64 %"tmp#1##0")
   ret i64 %"tmp#15##0"
 }
 
-define external fastcc i64 @"benchmark_fib.fib1<0>"(i64 %"pprev##0", i64 %"prev##0", i64 %"n##0") {
+define external fastcc i64 @"benchmark_fib#.fib1<0>"(i64 %"pprev##0", i64 %"prev##0", i64 %"n##0") {
   %"tmp#5##0" = icmp eq i64 %"n##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -306,22 +306,22 @@ if.then.0:
 if.else.0:
   %"tmp#3##0" = add i64 %"pprev##0", %"prev##0"
   %"tmp#4##0" = sub i64 %"n##0", 1
-  %"tmp#15##0" = tail call fastcc i64 @"benchmark_fib.fib1<0>"(i64 %"prev##0", i64 %"tmp#3##0", i64 %"tmp#4##0")
+  %"tmp#15##0" = tail call fastcc i64 @"benchmark_fib#.fib1<0>"(i64 %"prev##0", i64 %"tmp#3##0", i64 %"tmp#4##0")
   ret i64 %"tmp#15##0"
 }
 
-define external fastcc i64 @"benchmark_fib.naive_fib<0>"(i64 %"n##0") {
+define external fastcc i64 @"benchmark_fib#.naive_fib<0>"(i64 %"n##0") {
   %"tmp#1##0" = icmp sle i64 %"n##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#7" to i64 ), i64 ptrtoint( ptr @"cstring#8" to i64 ))
   ret i64 undef
 if.else.0:
-  %"tmp#6##0" = tail call fastcc i64 @"benchmark_fib.naive_fib1<0>"(i64 %"n##0")
+  %"tmp#6##0" = tail call fastcc i64 @"benchmark_fib#.naive_fib1<0>"(i64 %"n##0")
   ret i64 %"tmp#6##0"
 }
 
-define external fastcc i64 @"benchmark_fib.naive_fib1<0>"(i64 %"n##0") {
+define external fastcc i64 @"benchmark_fib#.naive_fib1<0>"(i64 %"n##0") {
   %"tmp#7##0" = icmp eq i64 %"n##0", 1
   br i1 %"tmp#7##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -333,9 +333,9 @@ if.then.1:
   ret i64 1
 if.else.1:
   %"tmp#3##0" = sub i64 %"n##0", 1
-  %"tmp#2##0" = tail call fastcc i64 @"benchmark_fib.naive_fib1<0>"(i64 %"tmp#3##0")
+  %"tmp#2##0" = tail call fastcc i64 @"benchmark_fib#.naive_fib1<0>"(i64 %"tmp#3##0")
   %"tmp#5##0" = sub i64 %"n##0", 2
-  %"tmp#4##0" = tail call fastcc i64 @"benchmark_fib.naive_fib1<0>"(i64 %"tmp#5##0")
+  %"tmp#4##0" = tail call fastcc i64 @"benchmark_fib#.naive_fib1<0>"(i64 %"tmp#5##0")
   %"tmp#18##0" = add i64 %"tmp#2##0", %"tmp#4##0"
   ret i64 %"tmp#18##0"
 }
diff --git a/test-cases/final-dump/block_comment.exp b/test-cases/final-dump/block_comment.exp
index 4a6c018a..25073a00 100644
--- a/test-cases/final-dump/block_comment.exp
+++ b/test-cases/final-dump/block_comment.exp
@@ -38,23 +38,23 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'block_comment'
 
 source_filename = "!ROOT!/final-dump/block_comment.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"print(x:string) creates a newline already\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"println(x:string) generates an extra newline?\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 41, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 45, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"block_comment.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+define external fastcc void @"block_comment#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
   call ccc void @putchar(i8 99)
   call ccc void @putchar(i8 10)
diff --git a/test-cases/final-dump/break_in_loop_in_do.exp b/test-cases/final-dump/break_in_loop_in_do.exp
index ff55aad9..8383a408 100644
--- a/test-cases/final-dump/break_in_loop_in_do.exp
+++ b/test-cases/final-dump/break_in_loop_in_do.exp
@@ -53,7 +53,7 @@ proc #cont#2 > {inline,semipure} (1 calls)
 ; ModuleID = 'break_in_loop_in_do'
 
 source_filename = "!ROOT!/final-dump/break_in_loop_in_do.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -61,21 +61,21 @@ declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#break_in_loop_in_do.counter" = global i64 undef
 
-define external fastcc void @"break_in_loop_in_do.<0>"() {
+define external fastcc void @"break_in_loop_in_do#.<0>"() {
   %"tmp#3##0" = load i64, ptr @"resource#break_in_loop_in_do.counter"
   call ccc void @print_int(i64 %"tmp#3##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"break_in_loop_in_do.#cont#1<0>"() {
+define external fastcc void @"break_in_loop_in_do#.#cont#1<0>"() {
   %"tmp#1##0" = load i64, ptr @"resource#break_in_loop_in_do.counter"
   call ccc void @print_int(i64 %"tmp#1##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"break_in_loop_in_do.#cont#2<0>"(i64 %"tmp#1##0") {
+define external fastcc void @"break_in_loop_in_do#.#cont#2<0>"(i64 %"tmp#1##0") {
   store i64 %"tmp#1##0", ptr @"resource#break_in_loop_in_do.counter"
   call ccc void @print_int(i64 %"tmp#1##0")
   call ccc void @putchar(i8 10)
diff --git a/test-cases/final-dump/bug214.exp b/test-cases/final-dump/bug214.exp
index 5406c3ae..6eb6233e 100644
--- a/test-cases/final-dump/bug214.exp
+++ b/test-cases/final-dump/bug214.exp
@@ -319,16 +319,16 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'bug214'
 
 source_filename = "!ROOT!/final-dump/bug214.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Part 1: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"Part 2: \00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 8, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 8, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc i1 @"wybe.int.=<0>"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc i64 @"wybe.string.string<0>"(i64)
+declare external fastcc i1 @"wybe#.int#.=<0>"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc i64 @"wybe#.string#.string<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc i64 @read_int()
@@ -336,9 +336,9 @@ declare external ccc i64 @read_line()
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"bug214.<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"bug214.position.origin<0>"()
-  %"tmp#2##0" = tail call fastcc i64 @"bug214.position.origin<0>"()
+define external fastcc void @"bug214#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"bug214#.position#.origin<0>"()
+  %"tmp#2##0" = tail call fastcc i64 @"bug214#.position#.origin<0>"()
   %"tmp#19##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#17##0" = ptrtoint ptr %"tmp#19##0" to i64
   %"tmp#20##0" = inttoptr i64 %"tmp#17##0" to ptr
@@ -346,13 +346,13 @@ define external fastcc void @"bug214.<0>"() {
   %"tmp#21##0" = add i64 %"tmp#17##0", 8
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   store i64 0, ptr %"tmp#22##0"
-  tail call fastcc void @"bug214.#cont#2<0>[7477e50a09]"(i64 %"tmp#0##0", i64 %"tmp#17##0")
+  tail call fastcc void @"bug214#.#cont#2<0>[7477e50a09]"(i64 %"tmp#0##0", i64 %"tmp#17##0")
   ret void
 }
 
-define external fastcc void @"bug214.#cont#1<0>"(i64 %"pos##0", i64 %"sub##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
-  tail call fastcc void @"bug214.position.print<0>"(i64 %"pos##0")
+define external fastcc void @"bug214#.#cont#1<0>"(i64 %"pos##0", i64 %"sub##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"bug214#.position#.print<0>"(i64 %"pos##0")
   call ccc void @putchar(i8 32)
   %"tmp#39##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#6##0" = load i64, ptr %"tmp#39##0"
@@ -362,10 +362,10 @@ define external fastcc void @"bug214.#cont#1<0>"(i64 %"pos##0", i64 %"sub##0") {
   %"tmp#5##0" = mul i64 %"tmp#6##0", %"tmp#7##0"
   call ccc void @print_int(i64 %"tmp#5##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   %"tmp#42##0" = inttoptr i64 %"sub##0" to ptr
   %"tmp#8##0" = load i64, ptr %"tmp#42##0"
-  tail call fastcc void @"bug214.position.print<0>"(i64 %"tmp#8##0")
+  tail call fastcc void @"bug214#.position#.print<0>"(i64 %"tmp#8##0")
   call ccc void @putchar(i8 32)
   %"tmp#43##0" = inttoptr i64 %"tmp#8##0" to ptr
   %"tmp#10##0" = load i64, ptr %"tmp#43##0"
@@ -378,45 +378,45 @@ define external fastcc void @"bug214.#cont#1<0>"(i64 %"pos##0", i64 %"sub##0") {
   ret void
 }
 
-define external fastcc void @"bug214.#cont#2<0>"(i64 %"pos##0", i64 %"sub##0") {
+define external fastcc void @"bug214#.#cont#2<0>"(i64 %"pos##0", i64 %"sub##0") {
   %"tmp#16##0" = call ccc i64 @read_line()
-  %"dir_str##0" = tail call fastcc i64 @"wybe.string.string<0>"(i64 %"tmp#16##0")
-  %"tmp#23##0" = tail call fastcc {i2, i1} @"bug214.direction.parse_direction<0>"(i64 %"dir_str##0")
+  %"dir_str##0" = tail call fastcc i64 @"wybe#.string#.string<0>"(i64 %"tmp#16##0")
+  %"tmp#23##0" = tail call fastcc {i2, i1} @"bug214#.direction#.parse_direction<0>"(i64 %"dir_str##0")
   %"tmp#3##0" = extractvalue {i2, i1}%"tmp#23##0", 0
   %"tmp#14##0" = extractvalue {i2, i1}%"tmp#23##0", 1
   br i1 %"tmp#14##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"units##0" = call ccc i64 @read_int()
   %"tmp#21##0" = call ccc i64 @read_line()
-  %"pos##1" = tail call fastcc i64 @"bug214.move<0>"(i64 %"pos##0", i2 %"tmp#3##0", i64 %"units##0")
-  %"sub##1" = tail call fastcc i64 @"bug214.move<1>"(i64 %"sub##0", i2 %"tmp#3##0", i64 %"units##0")
-  tail call fastcc void @"bug214.#cont#2<0>"(i64 %"pos##1", i64 %"sub##1")
+  %"pos##1" = tail call fastcc i64 @"bug214#.move<0>"(i64 %"pos##0", i2 %"tmp#3##0", i64 %"units##0")
+  %"sub##1" = tail call fastcc i64 @"bug214#.move<1>"(i64 %"sub##0", i2 %"tmp#3##0", i64 %"units##0")
+  tail call fastcc void @"bug214#.#cont#2<0>"(i64 %"pos##1", i64 %"sub##1")
   ret void
 if.else.0:
-  tail call fastcc void @"bug214.#cont#2<0>"(i64 %"pos##0", i64 %"sub##0")
+  tail call fastcc void @"bug214#.#cont#2<0>"(i64 %"pos##0", i64 %"sub##0")
   ret void
 }
 
-define external fastcc void @"bug214.#cont#2<0>[7477e50a09]"(i64 %"pos##0", i64 %"sub##0") {
+define external fastcc void @"bug214#.#cont#2<0>[7477e50a09]"(i64 %"pos##0", i64 %"sub##0") {
   %"tmp#16##0" = call ccc i64 @read_line()
-  %"dir_str##0" = tail call fastcc i64 @"wybe.string.string<0>"(i64 %"tmp#16##0")
-  %"tmp#23##0" = tail call fastcc {i2, i1} @"bug214.direction.parse_direction<0>"(i64 %"dir_str##0")
+  %"dir_str##0" = tail call fastcc i64 @"wybe#.string#.string<0>"(i64 %"tmp#16##0")
+  %"tmp#23##0" = tail call fastcc {i2, i1} @"bug214#.direction#.parse_direction<0>"(i64 %"dir_str##0")
   %"tmp#3##0" = extractvalue {i2, i1}%"tmp#23##0", 0
   %"tmp#14##0" = extractvalue {i2, i1}%"tmp#23##0", 1
   br i1 %"tmp#14##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"units##0" = call ccc i64 @read_int()
   %"tmp#21##0" = call ccc i64 @read_line()
-  %"pos##1" = tail call fastcc i64 @"bug214.move<0>[410bae77d3]"(i64 %"pos##0", i2 %"tmp#3##0", i64 %"units##0")
-  %"sub##1" = tail call fastcc i64 @"bug214.move<1>[410bae77d3]"(i64 %"sub##0", i2 %"tmp#3##0", i64 %"units##0")
-  tail call fastcc void @"bug214.#cont#2<0>[7477e50a09]"(i64 %"pos##1", i64 %"sub##1")
+  %"pos##1" = tail call fastcc i64 @"bug214#.move<0>[410bae77d3]"(i64 %"pos##0", i2 %"tmp#3##0", i64 %"units##0")
+  %"sub##1" = tail call fastcc i64 @"bug214#.move<1>[410bae77d3]"(i64 %"sub##0", i2 %"tmp#3##0", i64 %"units##0")
+  tail call fastcc void @"bug214#.#cont#2<0>[7477e50a09]"(i64 %"pos##1", i64 %"sub##1")
   ret void
 if.else.0:
-  tail call fastcc void @"bug214.#cont#2<0>[7477e50a09]"(i64 %"pos##0", i64 %"sub##0")
+  tail call fastcc void @"bug214#.#cont#2<0>[7477e50a09]"(i64 %"pos##0", i64 %"sub##0")
   ret void
 }
 
-define external fastcc i1 @"bug214.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"bug214#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#16##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#sub_pos##0" = load i64, ptr %"tmp#16##0"
   %"tmp#17##0" = add i64 %"#left##0", 8
@@ -427,16 +427,16 @@ define external fastcc i1 @"bug214.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#20##0" = add i64 %"#right##0", 8
   %"tmp#21##0" = inttoptr i64 %"tmp#20##0" to ptr
   %"#right#aim##0" = load i64, ptr %"tmp#21##0"
-  %"tmp#22##0" = tail call fastcc {i64, i64} @"bug214.position.position<1>"(i64 %"#left#sub_pos##0")
+  %"tmp#22##0" = tail call fastcc {i64, i64} @"bug214#.position#.position<1>"(i64 %"#left#sub_pos##0")
   %"tmp#8##0" = extractvalue {i64, i64}%"tmp#22##0", 0
   %"tmp#9##0" = extractvalue {i64, i64}%"tmp#22##0", 1
-  %"tmp#23##0" = tail call fastcc {i64, i64} @"bug214.position.position<1>"(i64 %"#right#sub_pos##0")
+  %"tmp#23##0" = tail call fastcc {i64, i64} @"bug214#.position#.position<1>"(i64 %"#right#sub_pos##0")
   %"tmp#10##0" = extractvalue {i64, i64}%"tmp#23##0", 0
   %"tmp#11##0" = extractvalue {i64, i64}%"tmp#23##0", 1
-  %"tmp#12##0" = tail call fastcc i1 @"wybe.int.=<0>"(i64 %"tmp#8##0", i64 %"tmp#10##0")
+  %"tmp#12##0" = tail call fastcc i1 @"wybe#.int#.=<0>"(i64 %"tmp#8##0", i64 %"tmp#10##0")
   br i1 %"tmp#12##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#1##0" = tail call fastcc i1 @"wybe.int.=<0>"(i64 %"tmp#9##0", i64 %"tmp#11##0")
+  %"tmp#1##0" = tail call fastcc i1 @"wybe#.int#.=<0>"(i64 %"tmp#9##0", i64 %"tmp#11##0")
   br i1 %"tmp#1##0", label %if.then.1, label %if.else.1
 if.then.1:
   %"tmp#24##0" = icmp eq i64 %"#left#aim##0", %"#right#aim##0"
@@ -447,14 +447,14 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"bug214.aim<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"bug214#.aim<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"bug214.aim<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"bug214#.aim<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -465,7 +465,7 @@ define external fastcc i64 @"bug214.aim<1>"(i64 %"#rec##0", i64 %"#field##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"bug214.move<0>"(i64 %"pos##0", i2 %"dir##0", i64 %"units##0") {
+define external fastcc i64 @"bug214#.move<0>"(i64 %"pos##0", i2 %"dir##0", i64 %"units##0") {
   switch i2 %"dir##0", label %case.3.switch.0 [
     i2 0, label %case.0.switch.0
     i2 1, label %case.1.switch.0
@@ -512,7 +512,7 @@ case.3.switch.0:
   ret i64 %"pos##0"
 }
 
-define external fastcc i64 @"bug214.move<0>[410bae77d3]"(i64 %"pos##0", i2 %"dir##0", i64 %"units##0") {
+define external fastcc i64 @"bug214#.move<0>[410bae77d3]"(i64 %"pos##0", i2 %"dir##0", i64 %"units##0") {
   switch i2 %"dir##0", label %case.3.switch.0 [
     i2 0, label %case.0.switch.0
     i2 1, label %case.1.switch.0
@@ -547,7 +547,7 @@ case.3.switch.0:
   ret i64 %"pos##0"
 }
 
-define external fastcc i64 @"bug214.move<1>"(i64 %"sub##0", i2 %"dir##0", i64 %"units##0") {
+define external fastcc i64 @"bug214#.move<1>"(i64 %"sub##0", i2 %"dir##0", i64 %"units##0") {
   switch i2 %"dir##0", label %case.3.switch.0 [
     i2 0, label %case.0.switch.0
     i2 1, label %case.1.switch.0
@@ -621,7 +621,7 @@ case.3.switch.0:
   ret i64 %"sub##0"
 }
 
-define external fastcc i64 @"bug214.move<1>[410bae77d3]"(i64 %"sub##0", i2 %"dir##0", i64 %"units##0") {
+define external fastcc i64 @"bug214#.move<1>[410bae77d3]"(i64 %"sub##0", i2 %"dir##0", i64 %"units##0") {
   switch i2 %"dir##0", label %case.3.switch.0 [
     i2 0, label %case.0.switch.0
     i2 1, label %case.1.switch.0
@@ -683,13 +683,13 @@ case.3.switch.0:
   ret i64 %"sub##0"
 }
 
-define external fastcc i64 @"bug214.sub_pos<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"bug214#.sub_pos<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"bug214.sub_pos<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"bug214#.sub_pos<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -699,7 +699,7 @@ define external fastcc i64 @"bug214.sub_pos<1>"(i64 %"#rec##0", i64 %"#field##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"bug214.submarine<0>"(i64 %"sub_pos##0", i64 %"aim##0") {
+define external fastcc i64 @"bug214#.submarine<0>"(i64 %"sub_pos##0", i64 %"aim##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -710,7 +710,7 @@ define external fastcc i64 @"bug214.submarine<0>"(i64 %"sub_pos##0", i64 %"aim##
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"bug214.submarine<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"bug214#.submarine<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -721,7 +721,7 @@ define external fastcc {i64, i64} @"bug214.submarine<1>"(i64 %"#result##0") {
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"bug214.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"bug214#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#13##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#13##0"
   %"tmp#14##0" = add i64 %"#left##0", 8
@@ -732,16 +732,16 @@ define external fastcc i1 @"bug214.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#17##0" = add i64 %"#right##0", 8
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
   %"tmp#6##0" = load i64, ptr %"tmp#18##0"
-  %"tmp#19##0" = tail call fastcc {i64, i64} @"bug214.position.position<1>"(i64 %"tmp#3##0")
+  %"tmp#19##0" = tail call fastcc {i64, i64} @"bug214#.position#.position<1>"(i64 %"tmp#3##0")
   %"tmp#7##0" = extractvalue {i64, i64}%"tmp#19##0", 0
   %"tmp#8##0" = extractvalue {i64, i64}%"tmp#19##0", 1
-  %"tmp#20##0" = tail call fastcc {i64, i64} @"bug214.position.position<1>"(i64 %"tmp#5##0")
+  %"tmp#20##0" = tail call fastcc {i64, i64} @"bug214#.position#.position<1>"(i64 %"tmp#5##0")
   %"tmp#9##0" = extractvalue {i64, i64}%"tmp#20##0", 0
   %"tmp#10##0" = extractvalue {i64, i64}%"tmp#20##0", 1
-  %"tmp#11##0" = tail call fastcc i1 @"wybe.int.=<0>"(i64 %"tmp#7##0", i64 %"tmp#9##0")
+  %"tmp#11##0" = tail call fastcc i1 @"wybe#.int#.=<0>"(i64 %"tmp#7##0", i64 %"tmp#9##0")
   br i1 %"tmp#11##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#12##0" = tail call fastcc i1 @"wybe.int.=<0>"(i64 %"tmp#8##0", i64 %"tmp#10##0")
+  %"tmp#12##0" = tail call fastcc i1 @"wybe#.int#.=<0>"(i64 %"tmp#8##0", i64 %"tmp#10##0")
   br i1 %"tmp#12##0", label %if.then.1, label %if.else.1
 if.then.1:
   %"tmp#0##0" = icmp eq i64 %"tmp#4##0", %"tmp#6##0"
@@ -853,7 +853,7 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'bug214.direction'
 
 source_filename = "!ROOT!/final-dump/bug214.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"down\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"forward\00", align 8
@@ -862,24 +862,24 @@ target triple    ????
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 7, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"bug214.direction.=<0>"(i2 %"#left##0", i2 %"#right##0") {
+define external fastcc i1 @"bug214#.direction#.=<0>"(i2 %"#left##0", i2 %"#right##0") {
   %"tmp#1##0" = icmp eq i2 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i2 @"bug214.direction.down<0>"() {
+define external fastcc i2 @"bug214#.direction#.down<0>"() {
   ret i2 1
 }
 
-define external fastcc i2 @"bug214.direction.fwd<0>"() {
+define external fastcc i2 @"bug214#.direction#.fwd<0>"() {
   ret i2 0
 }
 
-define external fastcc {i2, i1} @"bug214.direction.parse_direction<0>"(i64 %"str##0") {
-  %"tmp#8##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 ptrtoint( ptr @"string#4" to i64 ), i64 %"str##0", i64 ptrtoint( ptr @"string#4" to i64 ), i64 %"str##0")
+define external fastcc {i2, i1} @"bug214#.direction#.parse_direction<0>"(i64 %"str##0") {
+  %"tmp#8##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 ptrtoint( ptr @"string#4" to i64 ), i64 %"str##0", i64 ptrtoint( ptr @"string#4" to i64 ), i64 %"str##0")
   %"tmp#5##0" = icmp eq i2 %"tmp#8##0", 1
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -887,7 +887,7 @@ if.then.0:
   %"tmp#16##0" = insertvalue {i2, i1} %"tmp#15##0", i1 1, 1
   ret {i2, i1} %"tmp#16##0"
 if.else.0:
-  %"tmp#11##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"str##0", i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"str##0")
+  %"tmp#11##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"str##0", i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"str##0")
   %"tmp#4##0" = icmp eq i2 %"tmp#11##0", 1
   br i1 %"tmp#4##0", label %if.then.1, label %if.else.1
 if.then.1:
@@ -895,7 +895,7 @@ if.then.1:
   %"tmp#18##0" = insertvalue {i2, i1} %"tmp#17##0", i1 1, 1
   ret {i2, i1} %"tmp#18##0"
 if.else.1:
-  %"tmp#14##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 ptrtoint( ptr @"string#5" to i64 ), i64 %"str##0", i64 ptrtoint( ptr @"string#5" to i64 ), i64 %"str##0")
+  %"tmp#14##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 ptrtoint( ptr @"string#5" to i64 ), i64 %"str##0", i64 ptrtoint( ptr @"string#5" to i64 ), i64 %"str##0")
   %"tmp#3##0" = icmp eq i2 %"tmp#14##0", 1
   br i1 %"tmp#3##0", label %if.then.2, label %if.else.2
 if.then.2:
@@ -908,11 +908,11 @@ if.else.2:
   ret {i2, i1} %"tmp#22##0"
 }
 
-define external fastcc i2 @"bug214.direction.up<0>"() {
+define external fastcc i2 @"bug214#.direction#.up<0>"() {
   ret i2 2
 }
 
-define external fastcc i1 @"bug214.direction.~=<0>"(i2 %"#left##0", i2 %"#right##0") {
+define external fastcc i1 @"bug214#.direction#.~=<0>"(i2 %"#left##0", i2 %"#right##0") {
   %"tmp#0##0" = icmp eq i2 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -1057,15 +1057,15 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'bug214.position'
 
 source_filename = "!ROOT!/final-dump/bug214.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"bug214.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"bug214#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -1085,7 +1085,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"bug214.position.origin<0>"() {
+define external fastcc i64 @"bug214#.position#.origin<0>"() {
   %"tmp#5##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#5##0" to i64
   %"tmp#6##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -1096,7 +1096,7 @@ define external fastcc i64 @"bug214.position.origin<0>"() {
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc i64 @"bug214.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"bug214#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1107,7 +1107,7 @@ define external fastcc i64 @"bug214.position.position<0>"(i64 %"x##0", i64 %"y##
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"bug214.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"bug214#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -1118,27 +1118,27 @@ define external fastcc {i64, i64} @"bug214.position.position<1>"(i64 %"#result##
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc void @"bug214.position.print<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1187)
+define external fastcc void @"bug214#.position#.print<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1187)
   %"tmp#25##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#26##0" = add i64 %"pos##0", 8
   %"tmp#27##0" = inttoptr i64 %"tmp#26##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#27##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   ret void
 }
 
-define external fastcc i64 @"bug214.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"bug214#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"bug214.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"bug214#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -1148,14 +1148,14 @@ define external fastcc i64 @"bug214.position.x<1>"(i64 %"#rec##0", i64 %"#field#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"bug214.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"bug214#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"bug214.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"bug214#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -1166,7 +1166,7 @@ define external fastcc i64 @"bug214.position.y<1>"(i64 %"#rec##0", i64 %"#field#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"bug214.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"bug214#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/bug217.exp b/test-cases/final-dump/bug217.exp
index 55eea633..e070e37a 100644
--- a/test-cases/final-dump/bug217.exp
+++ b/test-cases/final-dump/bug217.exp
@@ -21,7 +21,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'bug217'
 
 source_filename = "!ROOT!/final-dump/bug217.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -69,20 +69,20 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'bug217.foo'
 
 source_filename = "!ROOT!/final-dump/bug217.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"bug217.foo.=<0>"() {
+define external fastcc i1 @"bug217#.foo#.=<0>"() {
   ret i1 1
 }
 
-define external fastcc void @"bug217.foo.foo<0>"() {
+define external fastcc void @"bug217#.foo#.foo<0>"() {
   ret void
 }
 
-define external fastcc i1 @"bug217.foo.~=<0>"() {
+define external fastcc i1 @"bug217#.foo#.~=<0>"() {
   ret i1 0
 }
 
@@ -127,19 +127,19 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'bug217.foo.bar'
 
 source_filename = "!ROOT!/final-dump/bug217.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"bug217.foo.bar.=<0>"() {
+define external fastcc i1 @"bug217#.foo#.bar#.=<0>"() {
   ret i1 1
 }
 
-define external fastcc void @"bug217.foo.bar.bar<0>"() {
+define external fastcc void @"bug217#.foo#.bar#.bar<0>"() {
   ret void
 }
 
-define external fastcc i1 @"bug217.foo.bar.~=<0>"() {
+define external fastcc i1 @"bug217#.foo#.bar#.~=<0>"() {
   ret i1 0
 }
diff --git a/test-cases/final-dump/bug228-okay.exp b/test-cases/final-dump/bug228-okay.exp
index d52904ba..b9b362ac 100644
--- a/test-cases/final-dump/bug228-okay.exp
+++ b/test-cases/final-dump/bug228-okay.exp
@@ -49,7 +49,7 @@ init_res()<{}; {<<bug228-okay.res>>}; {}>:
 ; ModuleID = 'bug228-okay'
 
 source_filename = "!ROOT!/final-dump/bug228-okay.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -57,7 +57,7 @@ declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#bug228-okay.res" = global i64 undef
 
-define external fastcc void @"bug228-okay.<0>"() {
+define external fastcc void @"bug228-okay#.<0>"() {
   call ccc void @print_int(i64 1)
   call ccc void @putchar(i8 10)
   call ccc void @print_int(i64 2)
@@ -65,7 +65,7 @@ define external fastcc void @"bug228-okay.<0>"() {
   ret void
 }
 
-define external fastcc {i64, i64} @"bug228-okay.bar<0>"() {
+define external fastcc {i64, i64} @"bug228-okay#.bar<0>"() {
   %"tmp#1##0" = load i64, ptr @"resource#bug228-okay.res"
   store i64 %"tmp#1##0", ptr @"resource#bug228-okay.res"
   %"tmp#2##0" = insertvalue {i64, i64} undef, i64 1, 0
@@ -73,7 +73,7 @@ define external fastcc {i64, i64} @"bug228-okay.bar<0>"() {
   ret {i64, i64} %"tmp#3##0"
 }
 
-define external fastcc void @"bug228-okay.init_res<0>"() {
+define external fastcc void @"bug228-okay#.init_res<0>"() {
   store i64 2, ptr @"resource#bug228-okay.res"
   ret void
 }
diff --git a/test-cases/final-dump/bug_497.exp b/test-cases/final-dump/bug_497.exp
index bf392ed6..3f4f8568 100644
--- a/test-cases/final-dump/bug_497.exp
+++ b/test-cases/final-dump/bug_497.exp
@@ -107,50 +107,50 @@ proc#anon#1(^p##0:wybe.int, anon#1#1##0:wybe.int, ?#success##0:wybe.bool)<{}; {}
 ; ModuleID = 'bug_497'
 
 source_filename = "!ROOT!/final-dump/bug_497.wybe"
-target triple    ????
+target triple   = ????
 
-@"closure#0" = private unnamed_addr constant {ptr, i64} { ptr @"bug_497.#anon#1<1>", i64 3 }, align 8
+@"closure#0" = private unnamed_addr constant {ptr, i64} { ptr @"bug_497#.#anon#1<1>", i64 3 }, align 8
 
-declare external fastcc void @"wybe.bool.print<0>"(i1)
-declare external fastcc i64 @"wybe.int.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc i64 @"wybe.string.c_string<0>"(i64)
+declare external fastcc void @"wybe#.bool#.print<0>"(i1)
+declare external fastcc i64 @"wybe#.int#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc i64 @"wybe#.string#.c_string<0>"(i64)
 declare external ccc void @log_char(i8)
 declare external ccc void @log_string(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"bug_497.<0>"() {
-  %"tmp#0##0" = tail call fastcc i1 @"bug_497.call<0>"(ptr @"closure#0", i64 2)
-  tail call fastcc void @"wybe.bool.print<0>"(i1 %"tmp#0##0")
+define external fastcc void @"bug_497#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i1 @"bug_497#.call<0>"(ptr @"closure#0", i64 2)
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  %"tmp#5##0" = tail call fastcc i1 @"bug_497.proc<0>"(i64 3)
-  tail call fastcc void @"wybe.bool.print<0>"(i1 %"tmp#5##0")
+  %"tmp#5##0" = tail call fastcc i1 @"bug_497#.proc<0>"(i64 3)
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 %"tmp#5##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i1 @"bug_497.#anon#1<0>"(i64 %"p##0", i64 %"anon#1#1##0") {
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"p##0", i64 0, i8 32)
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"anon#1#1##0", i64 0, i8 32)
-  %"tmp#3##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 1155, i64 %"tmp#4##0")
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#2##0", i64 %"tmp#3##0")
-  %"tmp#15##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 %"tmp#1##0")
+define external fastcc i1 @"bug_497#.#anon#1<0>"(i64 %"p##0", i64 %"anon#1#1##0") {
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"p##0", i64 0, i8 32)
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"anon#1#1##0", i64 0, i8 32)
+  %"tmp#3##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 1155, i64 %"tmp#4##0")
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#2##0", i64 %"tmp#3##0")
+  %"tmp#15##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 %"tmp#1##0")
   call ccc void @log_string(i64 %"tmp#15##0")
   call ccc void @log_char(i8 10)
   %"tmp#18##0" = icmp eq i64 %"p##0", 3
   ret i1 %"tmp#18##0"
 }
 
-define external fastcc i64 @"bug_497.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
+define external fastcc i64 @"bug_497#.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
   %"tmp#7##0" = getelementptr inbounds {ptr, i64}, ptr %"#env##0", i64 0, i32 1
   %"p##0" = load i64, ptr %"tmp#7##0"
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"p##0", i64 0, i8 32)
-  %"tmp#3##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"generic#anon#1#1##0", i64 0, i8 32)
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 1155, i64 %"tmp#3##0")
-  %"tmp#5##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#2##0", i64 %"tmp#4##0")
-  %"tmp#6##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 %"tmp#5##0")
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"p##0", i64 0, i8 32)
+  %"tmp#3##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"generic#anon#1#1##0", i64 0, i8 32)
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 1155, i64 %"tmp#3##0")
+  %"tmp#5##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#2##0", i64 %"tmp#4##0")
+  %"tmp#6##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 %"tmp#5##0")
   call ccc void @log_string(i64 %"tmp#6##0")
   call ccc void @log_char(i8 10)
   %"#success##0" = icmp eq i64 %"p##0", 3
@@ -158,43 +158,43 @@ define external fastcc i64 @"bug_497.#anon#1<1>"(ptr %"#env##0", i64 %"generic#a
   ret i64 %"tmp#8##0"
 }
 
-define external fastcc i1 @"bug_497.call<0>"(ptr %"f##0", i64 %"x##0") {
+define external fastcc i1 @"bug_497#.call<0>"(ptr %"f##0", i64 %"x##0") {
   %"tmp#1##0" = load ptr, ptr %"f##0"
   %"tmp#2##0" = tail call fastcc i1 %"tmp#1##0"(ptr %"f##0", i64 %"x##0")
   ret i1 %"tmp#2##0"
 }
 
-define external fastcc i1 @"bug_497.proc<0>"(i64 %"p##0") {
+define external fastcc i1 @"bug_497#.proc<0>"(i64 %"p##0") {
   %"tmp#6##0" = getelementptr inbounds {ptr, i64}, ptr null, i64 1
   %"tmp#7##0" = ptrtoint ptr %"tmp#6##0" to i32
   %"tmp#5##0" = call ccc ptr @wybe_malloc(i32 %"tmp#7##0")
-  store ptr @"bug_497.proc#anon#1<1>", ptr %"tmp#5##0"
+  store ptr @"bug_497#.proc#anon#1<1>", ptr %"tmp#5##0"
   %"tmp#8##0" = getelementptr inbounds {ptr, i64}, ptr %"tmp#5##0", i64 0, i32 1
   store i64 %"p##0", ptr %"tmp#8##0"
-  %"tmp#9##0" = tail call fastcc i1 @"bug_497.call<0>"(ptr %"tmp#5##0", i64 2)
+  %"tmp#9##0" = tail call fastcc i1 @"bug_497#.call<0>"(ptr %"tmp#5##0", i64 2)
   ret i1 %"tmp#9##0"
 }
 
-define external fastcc i1 @"bug_497.proc#anon#1<0>"(i64 %"p##0", i64 %"anon#1#1##0") {
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"p##0", i64 0, i8 32)
-  %"tmp#3##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"anon#1#1##0", i64 0, i8 32)
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 1155, i64 %"tmp#3##0")
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#1##0", i64 %"tmp#2##0")
-  %"tmp#14##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 %"tmp#0##0")
+define external fastcc i1 @"bug_497#.proc#anon#1<0>"(i64 %"p##0", i64 %"anon#1#1##0") {
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"p##0", i64 0, i8 32)
+  %"tmp#3##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"anon#1#1##0", i64 0, i8 32)
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 1155, i64 %"tmp#3##0")
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#1##0", i64 %"tmp#2##0")
+  %"tmp#14##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 %"tmp#0##0")
   call ccc void @log_string(i64 %"tmp#14##0")
   call ccc void @log_char(i8 10)
   %"tmp#17##0" = icmp eq i64 %"p##0", 3
   ret i1 %"tmp#17##0"
 }
 
-define external fastcc i64 @"bug_497.proc#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
+define external fastcc i64 @"bug_497#.proc#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
   %"tmp#7##0" = getelementptr inbounds {ptr, i64}, ptr %"#env##0", i64 0, i32 1
   %"p##0" = load i64, ptr %"tmp#7##0"
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"p##0", i64 0, i8 32)
-  %"tmp#3##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"generic#anon#1#1##0", i64 0, i8 32)
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 1155, i64 %"tmp#3##0")
-  %"tmp#5##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#2##0", i64 %"tmp#4##0")
-  %"tmp#6##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 %"tmp#5##0")
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"p##0", i64 0, i8 32)
+  %"tmp#3##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"generic#anon#1#1##0", i64 0, i8 32)
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 1155, i64 %"tmp#3##0")
+  %"tmp#5##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#2##0", i64 %"tmp#4##0")
+  %"tmp#6##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 %"tmp#5##0")
   call ccc void @log_string(i64 %"tmp#6##0")
   call ccc void @log_char(i8 10)
   %"#success##0" = icmp eq i64 %"p##0", 3
@@ -279,13 +279,13 @@ lognl()<{}; {}; {}>:
 ; ModuleID = 'logging'
 
 source_filename = "!ROOT!/../wybelibs/logging.o"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"false\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"true\00", align 8
 @"array#2" = private unnamed_addr constant [ 2 x i64 ] [i64 ptrtoint( ptr @"cstring#0" to i64 ), i64 ptrtoint( ptr @"cstring#1" to i64 )]
 
-declare external fastcc i64 @"wybe.string.c_string<0>"(i64)
+declare external fastcc i64 @"wybe#.string#.c_string<0>"(i64)
 declare external ccc void @log_char(i8)
 declare external ccc void @log_count(i64)
 declare external ccc void @log_float(double)
@@ -293,38 +293,38 @@ declare external ccc void @log_int(i64)
 declare external ccc void @log_string(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"logging.logmsg<0>"(i64 %"x##0") {
+define external fastcc void @"logging#.logmsg<0>"(i64 %"x##0") {
   call ccc void @log_int(i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<1>"(i64 %"x##0") {
+define external fastcc void @"logging#.logmsg<1>"(i64 %"x##0") {
   call ccc void @log_count(i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<2>"(double %"x##0") {
+define external fastcc void @"logging#.logmsg<2>"(double %"x##0") {
   call ccc void @log_float(double %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<3>"(i8 %"x##0") {
+define external fastcc void @"logging#.logmsg<3>"(i8 %"x##0") {
   call ccc void @log_char(i8 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<4>"(i64 %"x##0") {
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 %"x##0")
+define external fastcc void @"logging#.logmsg<4>"(i64 %"x##0") {
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 %"x##0")
   call ccc void @log_string(i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<5>"(i64 %"x##0") {
+define external fastcc void @"logging#.logmsg<5>"(i64 %"x##0") {
   call ccc void @log_string(i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<6>"(i1 %"x##0") {
+define external fastcc void @"logging#.logmsg<6>"(i1 %"x##0") {
   %"tmp#6##0" = zext i1 %"x##0" to i64
   %"tmp#5##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#2", i64 0, i64 %"tmp#6##0"
   %"tmp#4##0" = load i64, ptr %"tmp#5##0"
@@ -332,7 +332,7 @@ define external fastcc void @"logging.logmsg<6>"(i1 %"x##0") {
   ret void
 }
 
-define external fastcc void @"logging.lognl<0>"() {
+define external fastcc void @"logging#.lognl<0>"() {
   call ccc void @log_char(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/bug_509.exp b/test-cases/final-dump/bug_509.exp
index 1ded824f..12d6d5a2 100644
--- a/test-cases/final-dump/bug_509.exp
+++ b/test-cases/final-dump/bug_509.exp
@@ -48,32 +48,32 @@ call(f##0:(wybe.bool, ?wybe.bool), ?x##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'bug_509'
 
 source_filename = "!ROOT!/final-dump/bug_509.wybe"
-target triple    ????
+target triple   = ????
 
-@"closure#0" = private unnamed_addr constant {ptr} { ptr @"bug_509.#anon#1<1>" }, align 8
+@"closure#0" = private unnamed_addr constant {ptr} { ptr @"bug_509#.#anon#1<1>" }, align 8
 
-declare external fastcc void @"wybe.bool.print<0>"(i1)
+declare external fastcc void @"wybe#.bool#.print<0>"(i1)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"bug_509.<0>"() {
-  %"x##0" = tail call fastcc i1 @"bug_509.call<0>"(ptr @"closure#0")
-  tail call fastcc void @"wybe.bool.print<0>"(i1 %"x##0")
+define external fastcc void @"bug_509#.<0>"() {
+  %"x##0" = tail call fastcc i1 @"bug_509#.call<0>"(ptr @"closure#0")
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 %"x##0")
   ret void
 }
 
-define external fastcc i1 @"bug_509.#anon#1<0>"(i1 %"anon#1#1##0") {
+define external fastcc i1 @"bug_509#.#anon#1<0>"(i1 %"anon#1#1##0") {
   %"tmp#4##0" = icmp eq i1 %"anon#1#1##0", 1
   ret i1 %"tmp#4##0"
 }
 
-define external fastcc i64 @"bug_509.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
+define external fastcc i64 @"bug_509#.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
   %"anon#1#1##0" = trunc i64 %"generic#anon#1#1##0" to i1
   %"anon#1#2##0" = icmp eq i1 %"anon#1#1##0", 1
   %"tmp#2##0" = zext i1 %"anon#1#2##0" to i64
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"bug_509.call<0>"(ptr %"f##0") {
+define external fastcc i1 @"bug_509#.call<0>"(ptr %"f##0") {
   %"tmp#1##0" = load ptr, ptr %"f##0"
   %"tmp#2##0" = tail call fastcc i1 %"tmp#1##0"(ptr %"f##0", i1 0)
   ret i1 %"tmp#2##0"
diff --git a/test-cases/final-dump/bug_510_llvm_retval.exp b/test-cases/final-dump/bug_510_llvm_retval.exp
index ed5ca614..b06aeba3 100644
--- a/test-cases/final-dump/bug_510_llvm_retval.exp
+++ b/test-cases/final-dump/bug_510_llvm_retval.exp
@@ -51,33 +51,33 @@ proc#anon#1(^p##0:wybe.int, ?#success##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'bug_510_llvm_retval'
 
 source_filename = "!ROOT!/final-dump/bug_510_llvm_retval.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"wybe.bool.print<0>"(i1)
+declare external fastcc void @"wybe#.bool#.print<0>"(i1)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"bug_510_llvm_retval.<0>"() {
-  %"tmp#0##0" = tail call fastcc i1 @"bug_510_llvm_retval.proc<0>"(i64 3)
-  tail call fastcc void @"wybe.bool.print<0>"(i1 %"tmp#0##0")
+define external fastcc void @"bug_510_llvm_retval#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i1 @"bug_510_llvm_retval#.proc<0>"(i64 3)
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i1 @"bug_510_llvm_retval.proc<0>"(i64 %"p##0") {
+define external fastcc i1 @"bug_510_llvm_retval#.proc<0>"(i64 %"p##0") {
   %"tmp#2##0" = icmp eq i64 %"p##0", 3
   %"tmp#3##0" = zext i1 %"tmp#2##0" to i64
   %"tmp#4##0" = trunc i64 %"tmp#3##0" to i1
   ret i1 %"tmp#4##0"
 }
 
-define external fastcc i1 @"bug_510_llvm_retval.proc#anon#1<0>"(i64 %"p##0") {
+define external fastcc i1 @"bug_510_llvm_retval#.proc#anon#1<0>"(i64 %"p##0") {
   %"tmp#3##0" = icmp eq i64 %"p##0", 3
   ret i1 %"tmp#3##0"
 }
 
-define external fastcc i64 @"bug_510_llvm_retval.proc#anon#1<1>"(ptr %"#env##0") {
+define external fastcc i64 @"bug_510_llvm_retval#.proc#anon#1<1>"(ptr %"#env##0") {
   %"tmp#1##0" = getelementptr inbounds {ptr, i64}, ptr %"#env##0", i64 0, i32 1
   %"p##0" = load i64, ptr %"tmp#1##0"
   %"#success##0" = icmp eq i64 %"p##0", 3
diff --git a/test-cases/final-dump/bug_523.exp b/test-cases/final-dump/bug_523.exp
index 4795073e..e7438593 100644
--- a/test-cases/final-dump/bug_523.exp
+++ b/test-cases/final-dump/bug_523.exp
@@ -41,22 +41,22 @@ semipure()<{}; {}; {}>:
 ; ModuleID = 'bug_523'
 
 source_filename = "!ROOT!/final-dump/bug_523.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"bug_523.impure<0>"() {
+define external fastcc void @"bug_523#.impure<0>"() {
   ret void
 }
 
-define external fastcc void @"bug_523.pure<0>"() {
-  tail call fastcc void @"bug_523.semipure<0>"()
-  tail call fastcc void @"bug_523.impure<0>"()
+define external fastcc void @"bug_523#.pure<0>"() {
+  tail call fastcc void @"bug_523#.semipure<0>"()
+  tail call fastcc void @"bug_523#.impure<0>"()
   ret void
 }
 
-define external fastcc void @"bug_523.semipure<0>"() {
-  tail call fastcc void @"bug_523.impure<0>"()
+define external fastcc void @"bug_523#.semipure<0>"() {
+  tail call fastcc void @"bug_523#.impure<0>"()
   ret void
 }
diff --git a/test-cases/final-dump/bug_var_def.exp b/test-cases/final-dump/bug_var_def.exp
index 6174082d..af1ded9f 100644
--- a/test-cases/final-dump/bug_var_def.exp
+++ b/test-cases/final-dump/bug_var_def.exp
@@ -24,11 +24,11 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'bug_var_def'
 
 source_filename = "!ROOT!/final-dump/bug_var_def.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"bug_var_def.<0>"() {
+define external fastcc void @"bug_var_def#.<0>"() {
   ret void
 }
diff --git a/test-cases/final-dump/call_site_id.exp b/test-cases/final-dump/call_site_id.exp
index 33b79851..4edf01eb 100644
--- a/test-cases/final-dump/call_site_id.exp
+++ b/test-cases/final-dump/call_site_id.exp
@@ -86,58 +86,58 @@ foo(x##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'call_site_id'
 
 source_filename = "!ROOT!/final-dump/call_site_id.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc i64 @read_int()
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"call_site_id.<0>"() {
+define external fastcc void @"call_site_id#.<0>"() {
   %"x##0" = call ccc i64 @read_int()
   %"y##0" = call ccc i64 @read_int()
   %"tmp#5##0" = icmp sgt i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"call_site_id.foo<0>"(i64 %"x##0")
+  tail call fastcc void @"call_site_id#.foo<0>"(i64 %"x##0")
   %"tmp#3##0" = icmp sgt i64 %"y##0", 0
   br i1 %"tmp#3##0", label %if.then.1, label %if.else.1
 if.then.1:
-  tail call fastcc void @"call_site_id.foo<0>"(i64 %"y##0")
+  tail call fastcc void @"call_site_id#.foo<0>"(i64 %"y##0")
   ret void
 if.else.1:
   %"tmp#0##0" = sub i64 0, %"y##0"
-  tail call fastcc void @"call_site_id.foo<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"call_site_id#.foo<0>"(i64 %"tmp#0##0")
   ret void
 if.else.0:
   %"tmp#1##0" = sub i64 0, %"x##0"
-  tail call fastcc void @"call_site_id.foo<0>"(i64 %"tmp#1##0")
+  tail call fastcc void @"call_site_id#.foo<0>"(i64 %"tmp#1##0")
   %"tmp#4##0" = icmp sgt i64 %"y##0", 0
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
-  tail call fastcc void @"call_site_id.foo<0>"(i64 %"y##0")
+  tail call fastcc void @"call_site_id#.foo<0>"(i64 %"y##0")
   ret void
 if.else.2:
   %"tmp#2##0" = sub i64 0, %"y##0"
-  tail call fastcc void @"call_site_id.foo<0>"(i64 %"tmp#2##0")
+  tail call fastcc void @"call_site_id#.foo<0>"(i64 %"tmp#2##0")
   ret void
 }
 
-define external fastcc void @"call_site_id.bar<0>"(i64 %"x##0") {
-  tail call fastcc void @"call_site_id.foo<0>"(i64 %"x##0")
+define external fastcc void @"call_site_id#.bar<0>"(i64 %"x##0") {
+  tail call fastcc void @"call_site_id#.foo<0>"(i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"call_site_id.foo<0>"(i64 %"x##0") {
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1155)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1155)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1155)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1155)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1155)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1155)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1155)
+define external fastcc void @"call_site_id#.foo<0>"(i64 %"x##0") {
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1155)
   %"tmp#1##0" = mul i64 %"x##0", 5
   %"tmp#0##0" = add i64 %"tmp#1##0", 10
   call ccc void @print_int(i64 %"tmp#0##0")
diff --git a/test-cases/final-dump/card.exp b/test-cases/final-dump/card.exp
index 90a6ff67..db62b08b 100644
--- a/test-cases/final-dump/card.exp
+++ b/test-cases/final-dump/card.exp
@@ -196,19 +196,19 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'card'
 
 source_filename = "!ROOT!/final-dump/card.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"card.<0>"() {
-  %"tmp#1##0" = tail call fastcc i64 @"card.suit.suits<0>"()
-  tail call fastcc void @"card.#cont#1<0>"(i64 %"tmp#1##0")
+define external fastcc void @"card#.<0>"() {
+  %"tmp#1##0" = tail call fastcc i64 @"card#.suit#.suits<0>"()
+  tail call fastcc void @"card#.#cont#1<0>"(i64 %"tmp#1##0")
   ret void
 }
 
-define external fastcc void @"card.#cont#1<0>"(i64 %"tmp#0##0") {
+define external fastcc void @"card#.#cont#1<0>"(i64 %"tmp#0##0") {
   %"tmp#10##0" = icmp ne i64 %"tmp#0##0", 0
   br i1 %"tmp#10##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -217,14 +217,14 @@ if.then.0:
   %"tmp#12##0" = add i64 %"tmp#0##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   %"tmp#0##1" = load i64, ptr %"tmp#13##0"
-  %"tmp#3##0" = tail call fastcc i64 @"card.rank.ranks<0>"()
-  tail call fastcc void @"card.#cont#2<0>"(i2 %"s##0", i64 %"tmp#0##1", i64 %"tmp#3##0")
+  %"tmp#3##0" = tail call fastcc i64 @"card#.rank#.ranks<0>"()
+  tail call fastcc void @"card#.#cont#2<0>"(i2 %"s##0", i64 %"tmp#0##1", i64 %"tmp#3##0")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"card.#cont#2<0>"(i2 %"s##0", i64 %"tmp#0##0", i64 %"tmp#2##0") {
+define external fastcc void @"card#.#cont#2<0>"(i2 %"s##0", i64 %"tmp#0##0", i64 %"tmp#2##0") {
   %"tmp#9##0" = icmp ne i64 %"tmp#2##0", 0
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -237,21 +237,21 @@ if.then.0:
   %"tmp#13##0" = shl i6 %"tmp#12##0", 2
   %"tmp#14##0" = zext i2 %"s##0" to i6
   %"tmp#4##0" = or i6 %"tmp#13##0", %"tmp#14##0"
-  tail call fastcc void @"card.print<0>"(i6 %"tmp#4##0")
+  tail call fastcc void @"card#.print<0>"(i6 %"tmp#4##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"card.#cont#2<0>"(i2 %"s##0", i64 %"tmp#0##0", i64 %"tmp#2##1")
+  tail call fastcc void @"card#.#cont#2<0>"(i2 %"s##0", i64 %"tmp#0##0", i64 %"tmp#2##1")
   ret void
 if.else.0:
-  tail call fastcc void @"card.#cont#1<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"card#.#cont#1<0>"(i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc i1 @"card.=<0>"(i6 %"#left##0", i6 %"#right##0") {
+define external fastcc i1 @"card#.=<0>"(i6 %"#left##0", i6 %"#right##0") {
   %"tmp#1##0" = icmp eq i6 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i6 @"card.card<0>"(i4 %"rank##0", i2 %"suit##0") {
+define external fastcc i6 @"card#.card<0>"(i4 %"rank##0", i2 %"suit##0") {
   %"#temp##0" = zext i4 %"rank##0" to i6
   %"#temp##1" = shl i6 %"#temp##0", 2
   %"#temp##2" = zext i2 %"suit##0" to i6
@@ -259,7 +259,7 @@ define external fastcc i6 @"card.card<0>"(i4 %"rank##0", i2 %"suit##0") {
   ret i6 %"tmp#0##0"
 }
 
-define external fastcc {i4, i2} @"card.card<1>"(i6 %"#result##0") {
+define external fastcc {i4, i2} @"card#.card<1>"(i6 %"#result##0") {
   %"#temp##0" = lshr i6 %"#result##0", 2
   %"#temp2##0" = and i6 %"#temp##0", 15
   %"tmp#0##0" = trunc i6 %"#temp2##0" to i4
@@ -270,25 +270,25 @@ define external fastcc {i4, i2} @"card.card<1>"(i6 %"#result##0") {
   ret {i4, i2} %"tmp#3##0"
 }
 
-define external fastcc void @"card.print<0>"(i6 %"c##0") {
+define external fastcc void @"card#.print<0>"(i6 %"c##0") {
   %"tmp#3##0" = lshr i6 %"c##0", 2
   %"tmp#4##0" = and i6 %"tmp#3##0", 15
   %"tmp#0##0" = trunc i6 %"tmp#4##0" to i4
-  tail call fastcc void @"card.rank.print<0>"(i4 %"tmp#0##0")
+  tail call fastcc void @"card#.rank#.print<0>"(i4 %"tmp#0##0")
   %"tmp#6##0" = and i6 %"c##0", 3
   %"tmp#1##0" = trunc i6 %"tmp#6##0" to i2
-  tail call fastcc void @"card.suit.print<0>"(i2 %"tmp#1##0")
+  tail call fastcc void @"card#.suit#.print<0>"(i2 %"tmp#1##0")
   ret void
 }
 
-define external fastcc i4 @"card.rank<0>"(i6 %"#rec##0") {
+define external fastcc i4 @"card#.rank<0>"(i6 %"#rec##0") {
   %"#rec##1" = lshr i6 %"#rec##0", 2
   %"#field##0" = and i6 %"#rec##1", 15
   %"tmp#0##0" = trunc i6 %"#field##0" to i4
   ret i4 %"tmp#0##0"
 }
 
-define external fastcc i6 @"card.rank<1>"(i6 %"#rec##0", i4 %"#field##0") {
+define external fastcc i6 @"card#.rank<1>"(i6 %"#rec##0", i4 %"#field##0") {
   %"#rec##1" = and i6 %"#rec##0", -61
   %"#temp##0" = zext i4 %"#field##0" to i6
   %"#temp##1" = shl i6 %"#temp##0", 2
@@ -296,20 +296,20 @@ define external fastcc i6 @"card.rank<1>"(i6 %"#rec##0", i4 %"#field##0") {
   ret i6 %"tmp#0##0"
 }
 
-define external fastcc i2 @"card.suit<0>"(i6 %"#rec##0") {
+define external fastcc i2 @"card#.suit<0>"(i6 %"#rec##0") {
   %"#field##0" = and i6 %"#rec##0", 3
   %"tmp#0##0" = trunc i6 %"#field##0" to i2
   ret i2 %"tmp#0##0"
 }
 
-define external fastcc i6 @"card.suit<1>"(i6 %"#rec##0", i2 %"#field##0") {
+define external fastcc i6 @"card#.suit<1>"(i6 %"#rec##0", i2 %"#field##0") {
   %"#rec##1" = and i6 %"#rec##0", -4
   %"#temp##0" = zext i2 %"#field##0" to i6
   %"tmp#0##0" = or i6 %"#rec##1", %"#temp##0"
   ret i6 %"tmp#0##0"
 }
 
-define external fastcc i1 @"card.~=<0>"(i6 %"#left##0", i6 %"#right##0") {
+define external fastcc i1 @"card#.~=<0>"(i6 %"#left##0", i6 %"#right##0") {
   %"tmp#0##0" = icmp eq i6 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -541,29 +541,29 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'card.rank'
 
 source_filename = "!ROOT!/final-dump/card.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"card:42:22\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"shouldn't happen!\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"array#3" = private unnamed_addr constant [ ?? x i8 ] [i8 50, i8 51, i8 52, i8 53, i8 54, i8 55, i8 56, i8 57, i8 84, i8 74, i8 81, i8 75, i8 65]
 
-declare external fastcc i64 @"wybe.string.c_string<0>"(i64)
+declare external fastcc i64 @"wybe#.string#.c_string<0>"(i64)
 declare external ccc void @error_exit(i64, i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"card.rank.=<0>"(i4 %"#left##0", i4 %"#right##0") {
+define external fastcc i1 @"card#.rank#.=<0>"(i4 %"#left##0", i4 %"#right##0") {
   %"tmp#1##0" = icmp eq i4 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i4 @"card.rank.ace<0>"() {
+define external fastcc i4 @"card#.rank#.ace<0>"() {
   ret i4 12
 }
 
-define external fastcc i8 @"card.rank.char<0>"(i4 %"r##0") {
+define external fastcc i8 @"card#.rank#.char<0>"(i4 %"r##0") {
   %"tmp#80##0" = icmp ule i4 %"r##0", 13
   br i1 %"tmp#80##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -572,66 +572,66 @@ if.then.0:
   %"tmp#68##0" = load i8, ptr %"tmp#81##0"
   ret i8 %"tmp#68##0"
 if.else.0:
-  %"tmp#55##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  %"tmp#55##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#0" to i64 ), i64 %"tmp#55##0")
   ret i8 undef
 }
 
-define external fastcc i4 @"card.rank.jack<0>"() {
+define external fastcc i4 @"card#.rank#.jack<0>"() {
   ret i4 9
 }
 
-define external fastcc i4 @"card.rank.king<0>"() {
+define external fastcc i4 @"card#.rank#.king<0>"() {
   ret i4 11
 }
 
-define external fastcc void @"card.rank.print<0>"(i4 %"r##0") {
-  %"tmp#0##0" = tail call fastcc i8 @"card.rank.char<0>"(i4 %"r##0")
+define external fastcc void @"card#.rank#.print<0>"(i4 %"r##0") {
+  %"tmp#0##0" = tail call fastcc i8 @"card#.rank#.char<0>"(i4 %"r##0")
   call ccc void @putchar(i8 %"tmp#0##0")
   ret void
 }
 
-define external fastcc i4 @"card.rank.queen<0>"() {
+define external fastcc i4 @"card#.rank#.queen<0>"() {
   ret i4 10
 }
 
-define external fastcc i4 @"card.rank.r10<0>"() {
+define external fastcc i4 @"card#.rank#.r10<0>"() {
   ret i4 8
 }
 
-define external fastcc i4 @"card.rank.r2<0>"() {
+define external fastcc i4 @"card#.rank#.r2<0>"() {
   ret i4 0
 }
 
-define external fastcc i4 @"card.rank.r3<0>"() {
+define external fastcc i4 @"card#.rank#.r3<0>"() {
   ret i4 1
 }
 
-define external fastcc i4 @"card.rank.r4<0>"() {
+define external fastcc i4 @"card#.rank#.r4<0>"() {
   ret i4 2
 }
 
-define external fastcc i4 @"card.rank.r5<0>"() {
+define external fastcc i4 @"card#.rank#.r5<0>"() {
   ret i4 3
 }
 
-define external fastcc i4 @"card.rank.r6<0>"() {
+define external fastcc i4 @"card#.rank#.r6<0>"() {
   ret i4 4
 }
 
-define external fastcc i4 @"card.rank.r7<0>"() {
+define external fastcc i4 @"card#.rank#.r7<0>"() {
   ret i4 5
 }
 
-define external fastcc i4 @"card.rank.r8<0>"() {
+define external fastcc i4 @"card#.rank#.r8<0>"() {
   ret i4 6
 }
 
-define external fastcc i4 @"card.rank.r9<0>"() {
+define external fastcc i4 @"card#.rank#.r9<0>"() {
   ret i4 7
 }
 
-define external fastcc i64 @"card.rank.ranks<0>"() {
+define external fastcc i64 @"card#.rank#.ranks<0>"() {
   %"tmp#79##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#29##0" = ptrtoint ptr %"tmp#79##0" to i64
   %"tmp#80##0" = inttoptr i64 %"tmp#29##0" to ptr
@@ -726,7 +726,7 @@ define external fastcc i64 @"card.rank.ranks<0>"() {
   ret i64 %"tmp#77##0"
 }
 
-define external fastcc i1 @"card.rank.~=<0>"(i4 %"#left##0", i4 %"#right##0") {
+define external fastcc i1 @"card#.rank#.~=<0>"(i4 %"#left##0", i4 %"#right##0") {
   %"tmp#0##0" = icmp eq i4 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -845,7 +845,7 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'card.suit'
 
 source_filename = "!ROOT!/final-dump/card.wybe"
-target triple    ????
+target triple   = ????
 
 @"array#0" = private unnamed_addr constant [ ?? x i8 ] [i8 67, i8 68, i8 72, i8 83]
 
@@ -853,41 +853,41 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"card.suit.=<0>"(i2 %"#left##0", i2 %"#right##0") {
+define external fastcc i1 @"card#.suit#.=<0>"(i2 %"#left##0", i2 %"#right##0") {
   %"tmp#1##0" = icmp eq i2 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i8 @"card.suit.char<0>"(i2 %"s##0") {
+define external fastcc i8 @"card#.suit#.char<0>"(i2 %"s##0") {
   %"tmp#27##0" = zext i2 %"s##0" to i64
   %"tmp#26##0" = getelementptr inbounds [ ?? x i8 ], ptr @"array#0", i64 0, i64 %"tmp#27##0"
   %"tmp#23##0" = load i8, ptr %"tmp#26##0"
   ret i8 %"tmp#23##0"
 }
 
-define external fastcc i2 @"card.suit.clubs<0>"() {
+define external fastcc i2 @"card#.suit#.clubs<0>"() {
   ret i2 0
 }
 
-define external fastcc i2 @"card.suit.diamonds<0>"() {
+define external fastcc i2 @"card#.suit#.diamonds<0>"() {
   ret i2 1
 }
 
-define external fastcc i2 @"card.suit.hearts<0>"() {
+define external fastcc i2 @"card#.suit#.hearts<0>"() {
   ret i2 2
 }
 
-define external fastcc void @"card.suit.print<0>"(i2 %"r##0") {
-  %"tmp#0##0" = tail call fastcc i8 @"card.suit.char<0>"(i2 %"r##0")
+define external fastcc void @"card#.suit#.print<0>"(i2 %"r##0") {
+  %"tmp#0##0" = tail call fastcc i8 @"card#.suit#.char<0>"(i2 %"r##0")
   call ccc void @putchar(i8 %"tmp#0##0")
   ret void
 }
 
-define external fastcc i2 @"card.suit.spades<0>"() {
+define external fastcc i2 @"card#.suit#.spades<0>"() {
   ret i2 3
 }
 
-define external fastcc i64 @"card.suit.suits<0>"() {
+define external fastcc i64 @"card#.suit#.suits<0>"() {
   %"tmp#25##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#11##0" = ptrtoint ptr %"tmp#25##0" to i64
   %"tmp#26##0" = inttoptr i64 %"tmp#11##0" to ptr
@@ -919,7 +919,7 @@ define external fastcc i64 @"card.suit.suits<0>"() {
   ret i64 %"tmp#23##0"
 }
 
-define external fastcc i1 @"card.suit.~=<0>"(i2 %"#left##0", i2 %"#right##0") {
+define external fastcc i1 @"card#.suit#.~=<0>"(i2 %"#left##0", i2 %"#right##0") {
   %"tmp#0##0" = icmp eq i2 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
diff --git a/test-cases/final-dump/caret.exp b/test-cases/final-dump/caret.exp
index 56d439fd..ce1e0009 100644
--- a/test-cases/final-dump/caret.exp
+++ b/test-cases/final-dump/caret.exp
@@ -100,22 +100,22 @@ expand_region(reg##0:caret.region, ?reg##4:caret.region, point##0:position.posit
 ; ModuleID = 'caret'
 
 source_filename = "!ROOT!/final-dump/caret.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"now ten = \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"ten = \00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 10, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 6, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc i64 @"wybe.int.max<0>"(i64, i64)
-declare external fastcc i64 @"wybe.int.min<0>"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc i64 @"wybe#.int#.max<0>"(i64, i64)
+declare external fastcc i64 @"wybe#.int#.min<0>"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"caret.<0>"() {
+define external fastcc void @"caret#.<0>"() {
   %"tmp#34##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#15##0" = ptrtoint ptr %"tmp#34##0" to i64
   %"tmp#35##0" = inttoptr i64 %"tmp#15##0" to ptr
@@ -139,14 +139,14 @@ define external fastcc void @"caret.<0>"() {
   store i64 %"tmp#19##0", ptr %"tmp#45##0"
   %"tmp#46##0" = inttoptr i64 %"tmp#19##0" to ptr
   %"ten##0" = load i64, ptr %"tmp#46##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @print_int(i64 %"ten##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"caret.#cont#1<0>[410bae77d3]"(i64 %"tmp#23##0")
+  tail call fastcc void @"caret#.#cont#1<0>[410bae77d3]"(i64 %"tmp#23##0")
   ret void
 }
 
-define external fastcc void @"caret.#cont#1<0>"(i64 %"reg##0") {
+define external fastcc void @"caret#.#cont#1<0>"(i64 %"reg##0") {
   %"tmp#25##0" = add i64 %"reg##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
   %"tmp#6##0" = load i64, ptr %"tmp#26##0"
@@ -161,13 +161,13 @@ define external fastcc void @"caret.#cont#1<0>"(i64 %"reg##0") {
   store i64 %"tmp#5##1", ptr %"tmp#31##0"
   %"tmp#32##0" = inttoptr i64 %"tmp#30##0" to ptr
   %"ten##0" = load i64, ptr %"tmp#32##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @print_int(i64 %"ten##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"caret.#cont#1<0>[410bae77d3]"(i64 %"reg##0") {
+define external fastcc void @"caret#.#cont#1<0>[410bae77d3]"(i64 %"reg##0") {
   %"tmp#25##0" = add i64 %"reg##0", 8
   %"tmp#26##0" = inttoptr i64 %"tmp#25##0" to ptr
   %"tmp#6##0" = load i64, ptr %"tmp#26##0"
@@ -178,20 +178,20 @@ define external fastcc void @"caret.#cont#1<0>[410bae77d3]"(i64 %"reg##0") {
   store i64 %"tmp#5##1", ptr %"tmp#28##0"
   %"tmp#29##0" = inttoptr i64 %"tmp#6##0" to ptr
   %"ten##0" = load i64, ptr %"tmp#29##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @print_int(i64 %"ten##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"caret.expand_region<0>"(i64 %"reg##0", i64 %"point##0") {
+define external fastcc i64 @"caret#.expand_region<0>"(i64 %"reg##0", i64 %"point##0") {
   %"tmp#52##0" = inttoptr i64 %"reg##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#52##0"
   %"tmp#53##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#53##0"
   %"tmp#54##0" = inttoptr i64 %"point##0" to ptr
   %"tmp#4##0" = load i64, ptr %"tmp#54##0"
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.int.min<0>"(i64 %"tmp#2##0", i64 %"tmp#4##0")
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.int#.min<0>"(i64 %"tmp#2##0", i64 %"tmp#4##0")
   %"tmp#55##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#56##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#56##0", ptr %"tmp#55##0", i64 16, i1 0)
@@ -210,7 +210,7 @@ define external fastcc i64 @"caret.expand_region<0>"(i64 %"reg##0", i64 %"point#
   %"tmp#65##0" = add i64 %"point##0", 8
   %"tmp#66##0" = inttoptr i64 %"tmp#65##0" to ptr
   %"tmp#9##0" = load i64, ptr %"tmp#66##0"
-  %"tmp#6##0" = tail call fastcc i64 @"wybe.int.min<0>"(i64 %"tmp#7##0", i64 %"tmp#9##0")
+  %"tmp#6##0" = tail call fastcc i64 @"wybe#.int#.min<0>"(i64 %"tmp#7##0", i64 %"tmp#9##0")
   %"tmp#67##0" = inttoptr i64 %"tmp#57##0" to ptr
   %"tmp#68##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#68##0", ptr %"tmp#67##0", i64 16, i1 0)
@@ -229,7 +229,7 @@ define external fastcc i64 @"caret.expand_region<0>"(i64 %"reg##0", i64 %"point#
   %"tmp#10##0" = load i64, ptr %"tmp#77##0"
   %"tmp#78##0" = inttoptr i64 %"tmp#10##0" to ptr
   %"tmp#12##0" = load i64, ptr %"tmp#78##0"
-  %"tmp#11##0" = tail call fastcc i64 @"wybe.int.max<0>"(i64 %"tmp#12##0", i64 %"tmp#4##0")
+  %"tmp#11##0" = tail call fastcc i64 @"wybe#.int#.max<0>"(i64 %"tmp#12##0", i64 %"tmp#4##0")
   %"tmp#79##0" = inttoptr i64 %"tmp#10##0" to ptr
   %"tmp#80##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#80##0", ptr %"tmp#79##0", i64 16, i1 0)
@@ -246,7 +246,7 @@ define external fastcc i64 @"caret.expand_region<0>"(i64 %"reg##0", i64 %"point#
   %"tmp#88##0" = add i64 %"tmp#81##0", 8
   %"tmp#89##0" = inttoptr i64 %"tmp#88##0" to ptr
   %"tmp#17##0" = load i64, ptr %"tmp#89##0"
-  %"tmp#16##0" = tail call fastcc i64 @"wybe.int.max<0>"(i64 %"tmp#17##0", i64 %"tmp#9##0")
+  %"tmp#16##0" = tail call fastcc i64 @"wybe#.int#.max<0>"(i64 %"tmp#17##0", i64 %"tmp#9##0")
   %"tmp#90##0" = inttoptr i64 %"tmp#81##0" to ptr
   %"tmp#91##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#91##0", ptr %"tmp#90##0", i64 16, i1 0)
@@ -418,13 +418,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'caret.region'
 
 source_filename = "!ROOT!/final-dump/caret.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"caret.region.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"caret#.region#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#19##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#lower_left##0" = load i64, ptr %"tmp#19##0"
   %"tmp#20##0" = add i64 %"#left##0", 8
@@ -474,13 +474,13 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"caret.region.lower_left<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"caret#.region#.lower_left<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"caret.region.lower_left<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"caret#.region#.lower_left<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -490,7 +490,7 @@ define external fastcc i64 @"caret.region.lower_left<1>"(i64 %"#rec##0", i64 %"#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"caret.region.region<0>"(i64 %"lower_left##0", i64 %"upper_right##0") {
+define external fastcc i64 @"caret#.region#.region<0>"(i64 %"lower_left##0", i64 %"upper_right##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -501,7 +501,7 @@ define external fastcc i64 @"caret.region.region<0>"(i64 %"lower_left##0", i64 %
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"caret.region.region<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"caret#.region#.region<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -512,14 +512,14 @@ define external fastcc {i64, i64} @"caret.region.region<1>"(i64 %"#result##0") {
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"caret.region.upper_right<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"caret#.region#.upper_right<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"caret.region.upper_right<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"caret#.region#.upper_right<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -530,7 +530,7 @@ define external fastcc i64 @"caret.region.upper_right<1>"(i64 %"#rec##0", i64 %"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"caret.region.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"caret#.region#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#18##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#18##0"
   %"tmp#19##0" = add i64 %"#left##0", 8
@@ -631,28 +631,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -765,13 +765,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -791,7 +791,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -802,7 +802,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -813,13 +813,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -829,14 +829,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -847,7 +847,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/cases.exp b/test-cases/final-dump/cases.exp
index 1d40707e..3ed793fc 100644
--- a/test-cases/final-dump/cases.exp
+++ b/test-cases/final-dump/cases.exp
@@ -51,33 +51,33 @@ len2(lst##0:wybe.list(T) <{}; {}; {0}>, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'cases'
 
 source_filename = "!ROOT!/final-dump/cases.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"cases.len<0>"(i64 %"lst##0") {
+define external fastcc i64 @"cases#.len<0>"(i64 %"lst##0") {
   %"tmp#5##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#8##0" = add i64 %"lst##0", 8
   %"tmp#9##0" = inttoptr i64 %"tmp#8##0" to ptr
   %"t##0" = load i64, ptr %"tmp#9##0"
-  %"tmp#2##0" = tail call fastcc i64 @"cases.len<0>"(i64 %"t##0")
+  %"tmp#2##0" = tail call fastcc i64 @"cases#.len<0>"(i64 %"t##0")
   %"tmp#10##0" = add i64 %"tmp#2##0", 1
   ret i64 %"tmp#10##0"
 if.else.0:
   ret i64 0
 }
 
-define external fastcc i64 @"cases.len2<0>"(i64 %"lst##0") {
+define external fastcc i64 @"cases#.len2<0>"(i64 %"lst##0") {
   %"tmp#6##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#6##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#9##0" = add i64 %"lst##0", 8
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   %"t##0" = load i64, ptr %"tmp#10##0"
-  %"tmp#3##0" = tail call fastcc i64 @"cases.len2<0>"(i64 %"t##0")
+  %"tmp#3##0" = tail call fastcc i64 @"cases#.len2<0>"(i64 %"t##0")
   %"tmp#11##0" = add i64 %"tmp#3##0", 1
   ret i64 %"tmp#11##0"
 if.else.0:
diff --git a/test-cases/final-dump/ccc.exp b/test-cases/final-dump/ccc.exp
index a480c4f3..7a737309 100644
--- a/test-cases/final-dump/ccc.exp
+++ b/test-cases/final-dump/ccc.exp
@@ -29,17 +29,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'ccc'
 
 source_filename = "!ROOT!/final-dump/ccc.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"CCC: Init\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 9, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ccc.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"ccc#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -70,17 +70,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'ddd'
 
 source_filename = "!ROOT!/final-dump/ddd.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"DDD: Init\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 9, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ddd.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"ddd#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/chain_assign.exp b/test-cases/final-dump/chain_assign.exp
index a8768315..70b71697 100644
--- a/test-cases/final-dump/chain_assign.exp
+++ b/test-cases/final-dump/chain_assign.exp
@@ -25,11 +25,11 @@ chain(?z##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'chain_assign'
 
 source_filename = "!ROOT!/final-dump/chain_assign.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"chain_assign.chain<0>"() {
+define external fastcc i64 @"chain_assign#.chain<0>"() {
   ret i64 1
 }
diff --git a/test-cases/final-dump/char-escape.exp b/test-cases/final-dump/char-escape.exp
index b31bdc42..4b9a0a69 100644
--- a/test-cases/final-dump/char-escape.exp
+++ b/test-cases/final-dump/char-escape.exp
@@ -52,7 +52,7 @@ test(ch##0:wybe.char, code##0:wybe.int, name##0:wybe.string)<{<<wybe.io.io>>}; {
 ; ModuleID = 'char-escape'
 
 source_filename = "!ROOT!/final-dump/char-escape.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"\07string with hex character escapes!\0A\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c" char escapes don't work\00", align 8
@@ -82,33 +82,33 @@ target triple    ????
 @"string#25" = private unnamed_addr constant {i64, i64} { i64 12, i64 ptrtoint( ptr @"cstring#12" to i64 ) }, align 8
 @"array#26" = private unnamed_addr constant [ 2 x i64 ] [i64 ptrtoint( ptr @"string#14" to i64 ), i64 ptrtoint( ptr @"string#15" to i64 )]
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"char-escape.<0>"() {
-  tail call fastcc void @"char-escape.test<0>"(i8 0, i64 0, i64 ptrtoint( ptr @"string#24" to i64 ))
-  tail call fastcc void @"char-escape.test<0>"(i8 7, i64 7, i64 ptrtoint( ptr @"string#17" to i64 ))
-  tail call fastcc void @"char-escape.test<0>"(i8 8, i64 8, i64 ptrtoint( ptr @"string#16" to i64 ))
-  tail call fastcc void @"char-escape.test<0>"(i8 27, i64 27, i64 ptrtoint( ptr @"string#19" to i64 ))
-  tail call fastcc void @"char-escape.test<0>"(i8 12, i64 12, i64 ptrtoint( ptr @"string#20" to i64 ))
-  tail call fastcc void @"char-escape.test<0>"(i8 10, i64 10, i64 ptrtoint( ptr @"string#23" to i64 ))
-  tail call fastcc void @"char-escape.test<0>"(i8 13, i64 13, i64 ptrtoint( ptr @"string#18" to i64 ))
-  tail call fastcc void @"char-escape.test<0>"(i8 9, i64 9, i64 ptrtoint( ptr @"string#22" to i64 ))
-  tail call fastcc void @"char-escape.test<0>"(i8 11, i64 11, i64 ptrtoint( ptr @"string#25" to i64 ))
-  tail call fastcc void @"char-escape.test<0>"(i8 32, i64 32, i64 ptrtoint( ptr @"string#21" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+define external fastcc void @"char-escape#.<0>"() {
+  tail call fastcc void @"char-escape#.test<0>"(i8 0, i64 0, i64 ptrtoint( ptr @"string#24" to i64 ))
+  tail call fastcc void @"char-escape#.test<0>"(i8 7, i64 7, i64 ptrtoint( ptr @"string#17" to i64 ))
+  tail call fastcc void @"char-escape#.test<0>"(i8 8, i64 8, i64 ptrtoint( ptr @"string#16" to i64 ))
+  tail call fastcc void @"char-escape#.test<0>"(i8 27, i64 27, i64 ptrtoint( ptr @"string#19" to i64 ))
+  tail call fastcc void @"char-escape#.test<0>"(i8 12, i64 12, i64 ptrtoint( ptr @"string#20" to i64 ))
+  tail call fastcc void @"char-escape#.test<0>"(i8 10, i64 10, i64 ptrtoint( ptr @"string#23" to i64 ))
+  tail call fastcc void @"char-escape#.test<0>"(i8 13, i64 13, i64 ptrtoint( ptr @"string#18" to i64 ))
+  tail call fastcc void @"char-escape#.test<0>"(i8 9, i64 9, i64 ptrtoint( ptr @"string#22" to i64 ))
+  tail call fastcc void @"char-escape#.test<0>"(i8 11, i64 11, i64 ptrtoint( ptr @"string#25" to i64 ))
+  tail call fastcc void @"char-escape#.test<0>"(i8 32, i64 32, i64 ptrtoint( ptr @"string#21" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
   ret void
 }
 
-define external fastcc void @"char-escape.test<0>"(i8 %"ch##0", i64 %"code##0", i64 %"name##0") {
+define external fastcc void @"char-escape#.test<0>"(i8 %"ch##0", i64 %"code##0", i64 %"name##0") {
   %"tmp#0##0" = zext i8 %"ch##0" to i64
   %"tmp#1##0" = icmp eq i64 %"code##0", %"tmp#0##0"
   %"tmp#14##0" = zext i1 %"tmp#1##0" to i64
   %"tmp#13##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#26", i64 0, i64 %"tmp#14##0"
   %"tmp#12##0" = load i64, ptr %"tmp#13##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"name##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#12##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"name##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#12##0")
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/common_fields.exp b/test-cases/final-dump/common_fields.exp
index 91666604..7e37074f 100644
--- a/test-cases/final-dump/common_fields.exp
+++ b/test-cases/final-dump/common_fields.exp
@@ -599,21 +599,21 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'common_fields'
 
 source_filename = "!ROOT!/final-dump/common_fields.wybe"
-target triple    ????
+target triple   = ????
 
 @"array#0" = private unnamed_addr constant [ 4 x i64 ] [i64 0, i64 -1, i64 -2, i64 -3]
 @"array#1" = private unnamed_addr constant [ 4 x i64 ] [i64 24, i64 15, i64 22, i64 5]
 @"array#2" = private unnamed_addr constant [ 4 x i64 ] [i64 32, i64 24, i64 32, i64 16]
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"common_fields.<0>"() {
+define external fastcc void @"common_fields#.<0>"() {
   %"tmp#68##0" = call ccc ptr @wybe_malloc(i32 32)
   %"tmp#30##0" = ptrtoint ptr %"tmp#68##0" to i64
   %"tmp#69##0" = inttoptr i64 %"tmp#30##0" to ptr
@@ -638,34 +638,34 @@ define external fastcc void @"common_fields.<0>"() {
   %"tmp#81##0" = inttoptr i64 %"tmp#80##0" to ptr
   store i64 1, ptr %"tmp#81##0"
   %"tmp#1##0" = or i64 %"tmp#42##0", 1
-  %"tmp#2##0" = tail call fastcc i64 @"common_fields.title<0>"(i64 %"tmp#30##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#2##0")
+  %"tmp#2##0" = tail call fastcc i64 @"common_fields#.title<0>"(i64 %"tmp#30##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
-  %"tmp#3##0" = tail call fastcc i64 @"common_fields.id<0>"(i64 %"tmp#1##0")
+  %"tmp#3##0" = tail call fastcc i64 @"common_fields#.id<0>"(i64 %"tmp#1##0")
   call ccc void @print_int(i64 %"tmp#3##0")
   call ccc void @putchar(i8 10)
-  %"c##1" = tail call fastcc i64 @"common_fields.id<1>[410bae77d3]"(i64 %"tmp#1##0", i64 10)
-  %"tmp#4##0" = tail call fastcc i64 @"common_fields.id<0>"(i64 %"c##1")
+  %"c##1" = tail call fastcc i64 @"common_fields#.id<1>[410bae77d3]"(i64 %"tmp#1##0", i64 10)
+  %"tmp#4##0" = tail call fastcc i64 @"common_fields#.id<0>"(i64 %"c##1")
   call ccc void @print_int(i64 %"tmp#4##0")
   call ccc void @putchar(i8 10)
-  %"tmp#82##0" = tail call fastcc {i64, i1} @"common_fields.genre<0>"(i64 %"tmp#30##0")
+  %"tmp#82##0" = tail call fastcc {i64, i1} @"common_fields#.genre<0>"(i64 %"tmp#30##0")
   %"tmp#5##0" = extractvalue {i64, i1}%"tmp#82##0", 0
   %"tmp#9##0" = extractvalue {i64, i1}%"tmp#82##0", 1
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#83##0" = tail call fastcc {i64, i1} @"common_fields.genre<1>"(i64 %"tmp#30##0", i64 1439)
+  %"tmp#83##0" = tail call fastcc {i64, i1} @"common_fields#.genre<1>"(i64 %"tmp#30##0", i64 1439)
   %"b##1" = extractvalue {i64, i1}%"tmp#83##0", 0
   %"tmp#10##0" = extractvalue {i64, i1}%"tmp#83##0", 1
   br i1 %"tmp#10##0", label %if.then.1, label %if.else.1
 if.then.1:
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#5##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#5##0")
   call ccc void @putchar(i8 10)
-  %"tmp#84##0" = tail call fastcc {i64, i1} @"common_fields.genre<0>"(i64 %"b##1")
+  %"tmp#84##0" = tail call fastcc {i64, i1} @"common_fields#.genre<0>"(i64 %"b##1")
   %"tmp#6##0" = extractvalue {i64, i1}%"tmp#84##0", 0
   %"tmp#8##0" = extractvalue {i64, i1}%"tmp#84##0", 1
   br i1 %"tmp#8##0", label %if.then.2, label %if.else.2
 if.then.2:
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#6##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#6##0")
   call ccc void @putchar(i8 10)
   ret void
 if.else.2:
@@ -676,7 +676,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc i1 @"common_fields.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"common_fields#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#80##0" = trunc i64 %"#left##0" to i2
   %"tmp#23##0" = and i2 %"tmp#80##0", 3
   switch i2 %"tmp#23##0", label %case.3.switch.0 [
@@ -712,15 +712,15 @@ if.then.1:
   %"tmp#94##0" = add i64 %"#right##0", 24
   %"tmp#95##0" = inttoptr i64 %"tmp#94##0" to ptr
   %"#right#id##0" = load i64, ptr %"tmp#95##0"
-  %"tmp#71##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#title##0", i64 %"#right#title##0", i64 %"#left#title##0", i64 %"#right#title##0")
+  %"tmp#71##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#title##0", i64 %"#right#title##0", i64 %"#left#title##0", i64 %"#right#title##0")
   %"tmp#2##0" = icmp eq i2 %"tmp#71##0", 1
   br i1 %"tmp#2##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#74##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#author##0", i64 %"#right#author##0", i64 %"#left#author##0", i64 %"#right#author##0")
+  %"tmp#74##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#author##0", i64 %"#right#author##0", i64 %"#left#author##0", i64 %"#right#author##0")
   %"tmp#3##0" = icmp eq i2 %"tmp#74##0", 1
   br i1 %"tmp#3##0", label %if.then.3, label %if.else.3
 if.then.3:
-  %"tmp#77##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#genre##0", i64 %"#right#genre##0", i64 %"#left#genre##0", i64 %"#right#genre##0")
+  %"tmp#77##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#genre##0", i64 %"#right#genre##0", i64 %"#left#genre##0", i64 %"#right#genre##0")
   %"tmp#4##0" = icmp eq i2 %"tmp#77##0", 1
   br i1 %"tmp#4##0", label %if.then.4, label %if.else.4
 if.then.4:
@@ -758,7 +758,7 @@ if.then.5:
   %"tmp#109##0" = add i64 %"#right##0", 15
   %"tmp#110##0" = inttoptr i64 %"tmp#109##0" to ptr
   %"tmp#111##0" = load i64, ptr %"tmp#110##0"
-  %"tmp#61##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#title##1", i64 %"tmp#106##0", i64 %"#left#title##1", i64 %"tmp#106##0")
+  %"tmp#61##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#title##1", i64 %"tmp#106##0", i64 %"#left#title##1", i64 %"tmp#106##0")
   %"tmp#7##0" = icmp eq i2 %"tmp#61##0", 1
   br i1 %"tmp#7##0", label %if.then.6, label %if.else.6
 if.then.6:
@@ -803,15 +803,15 @@ if.then.8:
   %"tmp#130##0" = add i64 %"#right##0", 22
   %"tmp#131##0" = inttoptr i64 %"tmp#130##0" to ptr
   %"tmp#132##0" = load i64, ptr %"tmp#131##0"
-  %"tmp#47##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#title##2", i64 %"tmp#124##0", i64 %"#left#title##2", i64 %"tmp#124##0")
+  %"tmp#47##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#title##2", i64 %"tmp#124##0", i64 %"#left#title##2", i64 %"tmp#124##0")
   %"tmp#11##0" = icmp eq i2 %"tmp#47##0", 1
   br i1 %"tmp#11##0", label %if.then.9, label %if.else.9
 if.then.9:
-  %"tmp#50##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#director##0", i64 %"#right#director##0", i64 %"#left#director##0", i64 %"#right#director##0")
+  %"tmp#50##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#director##0", i64 %"#right#director##0", i64 %"#left#director##0", i64 %"#right#director##0")
   %"tmp#12##0" = icmp eq i2 %"tmp#50##0", 1
   br i1 %"tmp#12##0", label %if.then.10, label %if.else.10
 if.then.10:
-  %"tmp#53##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#genre##1", i64 %"tmp#129##0", i64 %"#left#genre##1", i64 %"tmp#129##0")
+  %"tmp#53##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#genre##1", i64 %"tmp#129##0", i64 %"#left#genre##1", i64 %"tmp#129##0")
   %"tmp#13##0" = icmp eq i2 %"tmp#53##0", 1
   br i1 %"tmp#13##0", label %if.then.11, label %if.else.11
 if.then.11:
@@ -843,7 +843,7 @@ if.then.12:
   %"tmp#142##0" = add i64 %"#right##0", 5
   %"tmp#143##0" = inttoptr i64 %"tmp#142##0" to ptr
   %"tmp#144##0" = load i64, ptr %"tmp#143##0"
-  %"tmp#39##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#title##3", i64 %"tmp#141##0", i64 %"#left#title##3", i64 %"tmp#141##0")
+  %"tmp#39##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#title##3", i64 %"tmp#141##0", i64 %"#left#title##3", i64 %"tmp#141##0")
   %"tmp#16##0" = icmp eq i2 %"tmp#39##0", 1
   br i1 %"tmp#16##0", label %if.then.13, label %if.else.13
 if.then.13:
@@ -855,7 +855,7 @@ if.else.12:
   ret i1 0
 }
 
-define external fastcc i64 @"common_fields.DVD<0>"(i64 %"title##0", i64 %"director##0", i64 %"genre##0", i64 %"id##0") {
+define external fastcc i64 @"common_fields#.DVD<0>"(i64 %"title##0", i64 %"director##0", i64 %"genre##0", i64 %"id##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 32)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -873,7 +873,7 @@ define external fastcc i64 @"common_fields.DVD<0>"(i64 %"title##0", i64 %"direct
   ret i64 %"tmp#8##0"
 }
 
-define external fastcc {i64, i64, i64, i64, i1} @"common_fields.DVD<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i64, i1} @"common_fields#.DVD<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 2
@@ -906,7 +906,7 @@ if.else.0:
   ret {i64, i64, i64, i64, i1} %"tmp#24##0"
 }
 
-define external fastcc {i64, i1} @"common_fields.author<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"common_fields#.author<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 0
@@ -924,7 +924,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"common_fields.author<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"common_fields#.author<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 0
@@ -946,7 +946,7 @@ if.else.0:
   ret {i64, i1} %"tmp#11##0"
 }
 
-define external fastcc i64 @"common_fields.book<0>"(i64 %"title##0", i64 %"author##0", i64 %"genre##0", i64 %"id##0") {
+define external fastcc i64 @"common_fields#.book<0>"(i64 %"title##0", i64 %"author##0", i64 %"genre##0", i64 %"id##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 32)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -963,7 +963,7 @@ define external fastcc i64 @"common_fields.book<0>"(i64 %"title##0", i64 %"autho
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64, i64, i1} @"common_fields.book<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i64, i1} @"common_fields#.book<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 0
@@ -995,7 +995,7 @@ if.else.0:
   ret {i64, i64, i64, i64, i1} %"tmp#23##0"
 }
 
-define external fastcc {i64, i1} @"common_fields.director<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"common_fields#.director<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 2
@@ -1013,7 +1013,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"common_fields.director<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"common_fields#.director<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 2
@@ -1037,7 +1037,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {i64, i1} @"common_fields.frequency<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"common_fields#.frequency<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 1
@@ -1055,7 +1055,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"common_fields.frequency<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"common_fields#.frequency<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 1
@@ -1079,7 +1079,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {i64, i1} @"common_fields.genre<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"common_fields#.genre<0>"(i64 %"#rec##0") {
   %"tmp#4##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#4##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 0
@@ -1107,7 +1107,7 @@ if.else.1:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"common_fields.genre<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"common_fields#.genre<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#4##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#4##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 0
@@ -1145,7 +1145,7 @@ if.else.1:
   ret {i64, i1} %"tmp#22##0"
 }
 
-define external fastcc i64 @"common_fields.id<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"common_fields#.id<0>"(i64 %"#rec##0") {
   %"tmp#24##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#24##0", 3
   %"tmp#26##0" = zext i2 %"tmp#1##0" to i64
@@ -1161,7 +1161,7 @@ define external fastcc i64 @"common_fields.id<0>"(i64 %"#rec##0") {
   ret i64 %"tmp#31##0"
 }
 
-define external fastcc i64 @"common_fields.id<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"common_fields#.id<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#33##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#33##0", 3
   %"tmp#35##0" = zext i2 %"tmp#1##0" to i64
@@ -1184,7 +1184,7 @@ define external fastcc i64 @"common_fields.id<1>"(i64 %"#rec##0", i64 %"#field##
   ret i64 %"tmp#43##0"
 }
 
-define external fastcc i64 @"common_fields.id<1>[410bae77d3]"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"common_fields#.id<1>[410bae77d3]"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#33##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#33##0", 3
   %"tmp#35##0" = zext i2 %"tmp#1##0" to i64
@@ -1200,7 +1200,7 @@ define external fastcc i64 @"common_fields.id<1>[410bae77d3]"(i64 %"#rec##0", i6
   ret i64 %"#rec##0"
 }
 
-define external fastcc i64 @"common_fields.magazine<0>"(i64 %"title##0", i64 %"frequency##0", i64 %"id##0") {
+define external fastcc i64 @"common_fields#.magazine<0>"(i64 %"title##0", i64 %"frequency##0", i64 %"id##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1215,7 +1215,7 @@ define external fastcc i64 @"common_fields.magazine<0>"(i64 %"title##0", i64 %"f
   ret i64 %"tmp#6##0"
 }
 
-define external fastcc {i64, i64, i64, i1} @"common_fields.magazine<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i1} @"common_fields#.magazine<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 1
@@ -1243,7 +1243,7 @@ if.else.0:
   ret {i64, i64, i64, i1} %"tmp#19##0"
 }
 
-define external fastcc i64 @"common_fields.other<0>"(i64 %"title##0", i64 %"id##0") {
+define external fastcc i64 @"common_fields#.other<0>"(i64 %"title##0", i64 %"id##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1255,7 +1255,7 @@ define external fastcc i64 @"common_fields.other<0>"(i64 %"title##0", i64 %"id##
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i64, i1} @"common_fields.other<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"common_fields#.other<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i2
   %"tmp#1##0" = and i2 %"tmp#2##0", 3
   %"tmp#0##0" = icmp eq i2 %"tmp#1##0", 3
@@ -1278,7 +1278,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#14##0"
 }
 
-define external fastcc i64 @"common_fields.title<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"common_fields#.title<0>"(i64 %"#rec##0") {
   %"tmp#24##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#24##0", 3
   %"tmp#26##0" = zext i2 %"tmp#1##0" to i64
@@ -1294,7 +1294,7 @@ define external fastcc i64 @"common_fields.title<0>"(i64 %"#rec##0") {
   ret i64 %"tmp#31##0"
 }
 
-define external fastcc i64 @"common_fields.title<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"common_fields#.title<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#6##0" = trunc i64 %"#rec##0" to i2
   %"tmp#1##0" = and i2 %"tmp#6##0", 3
   switch i2 %"tmp#1##0", label %case.3.switch.0 [
@@ -1345,8 +1345,8 @@ case.3.switch.0:
   ret i64 %"tmp#29##0"
 }
 
-define external fastcc i1 @"common_fields.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"common_fields.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"common_fields#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"common_fields#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/commonsubexpr.exp b/test-cases/final-dump/commonsubexpr.exp
index 5dad7336..74446b3c 100644
--- a/test-cases/final-dump/commonsubexpr.exp
+++ b/test-cases/final-dump/commonsubexpr.exp
@@ -51,14 +51,14 @@ common_subexpr(x##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'commonsubexpr'
 
 source_filename = "!ROOT!/final-dump/commonsubexpr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"commonsubexpr.<0>"() {
+define external fastcc void @"commonsubexpr#.<0>"() {
   call ccc void @print_int(i64 198)
   call ccc void @putchar(i8 10)
   call ccc void @print_int(i64 198)
@@ -68,7 +68,7 @@ define external fastcc void @"commonsubexpr.<0>"() {
   ret void
 }
 
-define external fastcc void @"commonsubexpr.common_subexpr<0>"(i64 %"x##0") {
+define external fastcc void @"commonsubexpr#.common_subexpr<0>"(i64 %"x##0") {
   %"tmp#2##0" = add i64 %"x##0", 1
   %"tmp#64##0" = sub i64 %"x##0", 1
   %"tmp#50##0" = mul i64 %"tmp#2##0", %"tmp#64##0"
diff --git a/test-cases/final-dump/compute.exp b/test-cases/final-dump/compute.exp
index f193289e..a211df0f 100644
--- a/test-cases/final-dump/compute.exp
+++ b/test-cases/final-dump/compute.exp
@@ -32,17 +32,17 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'compute'
 
 source_filename = "!ROOT!/final-dump/compute.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i64 @"math.utils.factorial<0>"(i64)
+declare external fastcc i64 @"math#.utils#.factorial<0>"(i64)
 declare external ccc void @print_float(double)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"compute.<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"math.utils.factorial<0>"(i64 4)
+define external fastcc void @"compute#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"math#.utils#.factorial<0>"(i64 4)
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   call ccc void @print_float(double 65.55555555555556)
@@ -73,7 +73,7 @@ define external fastcc void @"compute.<0>"() {
 ; ModuleID = 'math'
 
 source_filename = "!ROOT!/final-dump/math/_.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -102,12 +102,12 @@ toCelsius(f##0:wybe.float, ?#result##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'math.temperature'
 
 source_filename = "!ROOT!/final-dump/math/temperature.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc double @"math.temperature.toCelsius<0>"(double %"f##0") {
+define external fastcc double @"math#.temperature#.toCelsius<0>"(double %"f##0") {
   %"tmp#1##0" = fsub double %"f##0", 32.0
   %"tmp#6##0" = fdiv double %"tmp#1##0", 1.8
   ret double %"tmp#6##0"
@@ -157,29 +157,29 @@ factorial(n##0:wybe.int, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'math.utils'
 
 source_filename = "!ROOT!/final-dump/math/utils.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Utils has been initialised.\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 27, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"math.utils.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"math#.utils#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"math.utils.factorial<0>"(i64 %"n##0") {
+define external fastcc i64 @"math#.utils#.factorial<0>"(i64 %"n##0") {
   %"tmp#4##0" = icmp sle i64 %"n##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
   ret i64 1
 if.else.0:
   %"tmp#3##0" = sub i64 %"n##0", 1
-  %"tmp#2##0" = tail call fastcc i64 @"math.utils.factorial<0>"(i64 %"tmp#3##0")
+  %"tmp#2##0" = tail call fastcc i64 @"math#.utils#.factorial<0>"(i64 %"tmp#3##0")
   %"tmp#11##0" = mul i64 %"n##0", %"tmp#2##0"
   ret i64 %"tmp#11##0"
 }
diff --git a/test-cases/final-dump/cond_expr_no_else.exp b/test-cases/final-dump/cond_expr_no_else.exp
index 04c41a4e..39a00552 100644
--- a/test-cases/final-dump/cond_expr_no_else.exp
+++ b/test-cases/final-dump/cond_expr_no_else.exp
@@ -178,7 +178,7 @@ vowel_num(c##0:wybe.char, ?#result##0:wybe.int, ?#success##0:wybe.bool)<{}; {};
 ; ModuleID = 'cond_expr_no_else'
 
 source_filename = "!ROOT!/final-dump/cond_expr_no_else.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"-5:int -> \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"5:int -> \00", align 8
@@ -189,86 +189,86 @@ target triple    ????
 @"string#6" = private unnamed_addr constant {i64, i64} { i64 18, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 @"string#7" = private unnamed_addr constant {i64, i64} { i64 18, i64 ptrtoint( ptr @"cstring#3" to i64 ) }, align 8
 
-declare external fastcc i64 @"wybe.count.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.int.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.count#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.int#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"cond_expr_no_else.<0>"() {
-  %"tmp#20##0" = tail call fastcc {i64, i1} @"cond_expr_no_else.to_count<0>"(i64 5)
+define external fastcc void @"cond_expr_no_else#.<0>"() {
+  %"tmp#20##0" = tail call fastcc {i64, i1} @"cond_expr_no_else#.to_count<0>"(i64 5)
   %"tmp#3##0" = extractvalue {i64, i1}%"tmp#20##0", 0
   %"tmp#19##0" = extractvalue {i64, i1}%"tmp#20##0", 1
   br i1 %"tmp#19##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"cond_expr_no_else.#cont#1<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"cond_expr_no_else#.#cont#1<0>"(i64 %"tmp#3##0")
   ret void
 if.else.0:
-  tail call fastcc void @"cond_expr_no_else.#cont#1<0>"(i64 10)
+  tail call fastcc void @"cond_expr_no_else#.#cont#1<0>"(i64 10)
   ret void
 }
 
-define external fastcc void @"cond_expr_no_else.#cont#1<0>"(i64 %"tmp#2##0") {
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.count.fmt<2>"(i64 %"tmp#2##0", i64 0, i8 32)
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#5" to i64 ), i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#0##0")
+define external fastcc void @"cond_expr_no_else#.#cont#1<0>"(i64 %"tmp#2##0") {
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.count#.fmt<2>"(i64 %"tmp#2##0", i64 0, i8 32)
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#5" to i64 ), i64 %"tmp#1##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  %"tmp#23##0" = tail call fastcc {i64, i1} @"cond_expr_no_else.to_count<0>"(i64 -5)
+  %"tmp#23##0" = tail call fastcc {i64, i1} @"cond_expr_no_else#.to_count<0>"(i64 -5)
   %"tmp#7##0" = extractvalue {i64, i1}%"tmp#23##0", 0
   %"tmp#18##0" = extractvalue {i64, i1}%"tmp#23##0", 1
   br i1 %"tmp#18##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"cond_expr_no_else.#cont#2<0>"(i64 %"tmp#7##0")
+  tail call fastcc void @"cond_expr_no_else#.#cont#2<0>"(i64 %"tmp#7##0")
   ret void
 if.else.0:
-  tail call fastcc void @"cond_expr_no_else.#cont#2<0>"(i64 10)
+  tail call fastcc void @"cond_expr_no_else#.#cont#2<0>"(i64 10)
   ret void
 }
 
-define external fastcc void @"cond_expr_no_else.#cont#2<0>"(i64 %"tmp#6##0") {
-  %"tmp#5##0" = tail call fastcc i64 @"wybe.count.fmt<2>"(i64 %"tmp#6##0", i64 0, i8 32)
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#4" to i64 ), i64 %"tmp#5##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#4##0")
+define external fastcc void @"cond_expr_no_else#.#cont#2<0>"(i64 %"tmp#6##0") {
+  %"tmp#5##0" = tail call fastcc i64 @"wybe#.count#.fmt<2>"(i64 %"tmp#6##0", i64 0, i8 32)
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#4" to i64 ), i64 %"tmp#5##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#4##0")
   call ccc void @putchar(i8 10)
-  %"tmp#22##0" = tail call fastcc {i64, i1} @"cond_expr_no_else.vowel_num<0>"(i8 101)
+  %"tmp#22##0" = tail call fastcc {i64, i1} @"cond_expr_no_else#.vowel_num<0>"(i8 101)
   %"tmp#11##0" = extractvalue {i64, i1}%"tmp#22##0", 0
   %"tmp#17##0" = extractvalue {i64, i1}%"tmp#22##0", 1
   br i1 %"tmp#17##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"cond_expr_no_else.#cont#3<0>"(i64 %"tmp#11##0")
+  tail call fastcc void @"cond_expr_no_else#.#cont#3<0>"(i64 %"tmp#11##0")
   ret void
 if.else.0:
-  tail call fastcc void @"cond_expr_no_else.#cont#3<0>"(i64 0)
+  tail call fastcc void @"cond_expr_no_else#.#cont#3<0>"(i64 0)
   ret void
 }
 
-define external fastcc void @"cond_expr_no_else.#cont#3<0>"(i64 %"tmp#10##0") {
-  %"tmp#9##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"tmp#10##0", i64 0, i8 32)
-  %"tmp#8##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#6" to i64 ), i64 %"tmp#9##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#8##0")
+define external fastcc void @"cond_expr_no_else#.#cont#3<0>"(i64 %"tmp#10##0") {
+  %"tmp#9##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"tmp#10##0", i64 0, i8 32)
+  %"tmp#8##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#6" to i64 ), i64 %"tmp#9##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#8##0")
   call ccc void @putchar(i8 10)
-  %"tmp#21##0" = tail call fastcc {i64, i1} @"cond_expr_no_else.vowel_num<0>"(i8 102)
+  %"tmp#21##0" = tail call fastcc {i64, i1} @"cond_expr_no_else#.vowel_num<0>"(i8 102)
   %"tmp#15##0" = extractvalue {i64, i1}%"tmp#21##0", 0
   %"tmp#16##0" = extractvalue {i64, i1}%"tmp#21##0", 1
   br i1 %"tmp#16##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"cond_expr_no_else.#cont#4<0>"(i64 %"tmp#15##0")
+  tail call fastcc void @"cond_expr_no_else#.#cont#4<0>"(i64 %"tmp#15##0")
   ret void
 if.else.0:
-  tail call fastcc void @"cond_expr_no_else.#cont#4<0>"(i64 0)
+  tail call fastcc void @"cond_expr_no_else#.#cont#4<0>"(i64 0)
   ret void
 }
 
-define external fastcc void @"cond_expr_no_else.#cont#4<0>"(i64 %"tmp#14##0") {
-  %"tmp#13##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"tmp#14##0", i64 0, i8 32)
-  %"tmp#12##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#7" to i64 ), i64 %"tmp#13##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#12##0")
+define external fastcc void @"cond_expr_no_else#.#cont#4<0>"(i64 %"tmp#14##0") {
+  %"tmp#13##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"tmp#14##0", i64 0, i8 32)
+  %"tmp#12##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#7" to i64 ), i64 %"tmp#13##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#12##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc {i64, i1} @"cond_expr_no_else.to_count<0>"(i64 %"i##0") {
+define external fastcc {i64, i1} @"cond_expr_no_else#.to_count<0>"(i64 %"i##0") {
   %"tmp#1##0" = icmp sge i64 %"i##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -281,7 +281,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"cond_expr_no_else.vowel_num<0>"(i8 %"c##0") {
+define external fastcc {i64, i1} @"cond_expr_no_else#.vowel_num<0>"(i8 %"c##0") {
   %"tmp#5##0" = icmp eq i8 %"c##0", 97
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
diff --git a/test-cases/final-dump/constfold.exp b/test-cases/final-dump/constfold.exp
index f1891e15..bd824e35 100644
--- a/test-cases/final-dump/constfold.exp
+++ b/test-cases/final-dump/constfold.exp
@@ -52,23 +52,23 @@ fortytwo(?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'constfold'
 
 source_filename = "!ROOT!/final-dump/constfold.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"constfold.fold_add<0>"() {
+define external fastcc i64 @"constfold#.fold_add<0>"() {
   ret i64 42
 }
 
-define external fastcc i64 @"constfold.fold_mult<0>"() {
+define external fastcc i64 @"constfold#.fold_mult<0>"() {
   ret i64 42
 }
 
-define external fastcc i64 @"constfold.fold_test<0>"() {
+define external fastcc i64 @"constfold#.fold_test<0>"() {
   ret i64 42
 }
 
-define external fastcc i64 @"constfold.fortytwo<0>"() {
+define external fastcc i64 @"constfold#.fortytwo<0>"() {
   ret i64 42
 }
diff --git a/test-cases/final-dump/constructors.exp b/test-cases/final-dump/constructors.exp
index 2d620475..3f278b1b 100644
--- a/test-cases/final-dump/constructors.exp
+++ b/test-cases/final-dump/constructors.exp
@@ -120,13 +120,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'constructors'
 
 source_filename = "!ROOT!/final-dump/constructors.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"constructors.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"constructors#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -146,7 +146,7 @@ if.else.0:
   ret i1 %"tmp#14##0"
 }
 
-define external fastcc i64 @"constructors.just<0>"(i64 %"value##0") {
+define external fastcc i64 @"constructors#.just<0>"(i64 %"value##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -154,7 +154,7 @@ define external fastcc i64 @"constructors.just<0>"(i64 %"value##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"constructors.just<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"constructors#.just<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -169,11 +169,11 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc i64 @"constructors.nothing<0>"() {
+define external fastcc i64 @"constructors#.nothing<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"constructors.value<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"constructors#.value<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -188,7 +188,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"constructors.value<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"constructors#.value<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -207,8 +207,8 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i1 @"constructors.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"constructors.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"constructors#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"constructors#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/continuation_args.exp b/test-cases/final-dump/continuation_args.exp
index 6ac78ff0..0e82d71e 100644
--- a/test-cases/final-dump/continuation_args.exp
+++ b/test-cases/final-dump/continuation_args.exp
@@ -131,12 +131,12 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'continuation_args'
 
 source_filename = "!ROOT!/final-dump/continuation_args.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"continuation_args.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"continuation_args#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -156,17 +156,17 @@ if.else.0:
   ret i1 %"tmp#15##0"
 }
 
-define external fastcc i64 @"continuation_args.a<0>"() {
+define external fastcc i64 @"continuation_args#.a<0>"() {
   ret i64 0
 }
 
-define external fastcc i64 @"continuation_args.b<0>"(i1 %"c##0") {
+define external fastcc i64 @"continuation_args#.b<0>"(i1 %"c##0") {
   %"#temp##0" = zext i1 %"c##0" to i64
   %"tmp#0##0" = or i64 %"#temp##0", 2
   ret i64 %"tmp#0##0"
 }
 
-define external fastcc {i1, i1} @"continuation_args.b<1>"(i64 %"#result##0") {
+define external fastcc {i1, i1} @"continuation_args#.b<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -181,7 +181,7 @@ if.else.0:
   ret {i1, i1} %"tmp#5##0"
 }
 
-define external fastcc {i1, i1} @"continuation_args.c<0>"(i64 %"#rec##0") {
+define external fastcc {i1, i1} @"continuation_args#.c<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -196,7 +196,7 @@ if.else.0:
   ret {i1, i1} %"tmp#5##0"
 }
 
-define external fastcc {i64, i1} @"continuation_args.c<1>"(i64 %"#rec##0", i1 %"#field##0") {
+define external fastcc {i64, i1} @"continuation_args#.c<1>"(i64 %"#rec##0", i1 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -212,12 +212,12 @@ if.else.0:
   ret {i64, i1} %"tmp#5##0"
 }
 
-define external fastcc i64 @"continuation_args.foo<0>"() {
+define external fastcc i64 @"continuation_args#.foo<0>"() {
   ret i64 0
 }
 
-define external fastcc i1 @"continuation_args.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"continuation_args.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"continuation_args#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"continuation_args#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
@@ -273,25 +273,25 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'continuation_args.d'
 
 source_filename = "!ROOT!/final-dump/continuation_args.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"continuation_args.d.=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"continuation_args#.d#.=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#1##0" = icmp eq i1 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"continuation_args.d.e<0>"() {
+define external fastcc i1 @"continuation_args#.d#.e<0>"() {
   ret i1 0
 }
 
-define external fastcc i1 @"continuation_args.d.f<0>"() {
+define external fastcc i1 @"continuation_args#.d#.f<0>"() {
   ret i1 1
 }
 
-define external fastcc i1 @"continuation_args.d.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"continuation_args#.d#.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#0##0" = icmp eq i1 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
diff --git a/test-cases/final-dump/coordinate.exp b/test-cases/final-dump/coordinate.exp
index 55c11762..f52345a1 100644
--- a/test-cases/final-dump/coordinate.exp
+++ b/test-cases/final-dump/coordinate.exp
@@ -61,20 +61,20 @@ fcopy(crd1##0:coordinate.Coordinate, ?#result##0:coordinate.Coordinate)<{}; {};
 ; ModuleID = 'coordinate'
 
 source_filename = "!ROOT!/final-dump/coordinate.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"expect crd1^z=8000: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"expect crd2^z=1000: \00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 20, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 20, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"coordinate.<0>"() {
+define external fastcc void @"coordinate#.<0>"() {
   %"tmp#24##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#7##0" = ptrtoint ptr %"tmp#24##0" to i64
   %"tmp#25##0" = inttoptr i64 %"tmp#7##0" to ptr
@@ -88,19 +88,19 @@ define external fastcc void @"coordinate.<0>"() {
   %"tmp#30##0" = add i64 %"tmp#7##0", 16
   %"tmp#31##0" = inttoptr i64 %"tmp#30##0" to ptr
   store i64 8000, ptr %"tmp#31##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   %"tmp#32##0" = add i64 %"tmp#7##0", 16
   %"tmp#33##0" = inttoptr i64 %"tmp#32##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#33##0"
   call ccc void @print_int(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @print_int(i64 1000)
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"coordinate.fcopy<0>"(i64 %"crd1##0") {
+define external fastcc i64 @"coordinate#.fcopy<0>"(i64 %"crd1##0") {
   ret i64 %"crd1##0"
 }
 
@@ -249,13 +249,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'coordinate.Coordinate'
 
 source_filename = "!ROOT!/final-dump/coordinate.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"coordinate.Coordinate.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"coordinate#.Coordinate#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#12##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#12##0"
   %"tmp#13##0" = add i64 %"#left##0", 8
@@ -286,7 +286,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"coordinate.Coordinate.Coordinate<0>"(i64 %"x##0", i64 %"y##0", i64 %"z##0") {
+define external fastcc i64 @"coordinate#.Coordinate#.Coordinate<0>"(i64 %"x##0", i64 %"y##0", i64 %"z##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -300,7 +300,7 @@ define external fastcc i64 @"coordinate.Coordinate.Coordinate<0>"(i64 %"x##0", i
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64} @"coordinate.Coordinate.Coordinate<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64} @"coordinate#.Coordinate#.Coordinate<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -315,13 +315,13 @@ define external fastcc {i64, i64, i64} @"coordinate.Coordinate.Coordinate<1>"(i6
   ret {i64, i64, i64} %"tmp#10##0"
 }
 
-define external fastcc i64 @"coordinate.Coordinate.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"coordinate#.Coordinate#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"coordinate.Coordinate.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"coordinate#.Coordinate#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 24)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 24, i1 0)
@@ -331,14 +331,14 @@ define external fastcc i64 @"coordinate.Coordinate.x<1>"(i64 %"#rec##0", i64 %"#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"coordinate.Coordinate.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"coordinate#.Coordinate#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"coordinate.Coordinate.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"coordinate#.Coordinate#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 24)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 24, i1 0)
@@ -349,14 +349,14 @@ define external fastcc i64 @"coordinate.Coordinate.y<1>"(i64 %"#rec##0", i64 %"#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"coordinate.Coordinate.z<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"coordinate#.Coordinate#.z<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 16
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"coordinate.Coordinate.z<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"coordinate#.Coordinate#.z<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 24)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 24, i1 0)
@@ -367,7 +367,7 @@ define external fastcc i64 @"coordinate.Coordinate.z<1>"(i64 %"#rec##0", i64 %"#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"coordinate.Coordinate.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"coordinate#.Coordinate#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#11##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#11##0"
   %"tmp#12##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/ctor_char.exp b/test-cases/final-dump/ctor_char.exp
index 0af48e38..d1965694 100644
--- a/test-cases/final-dump/ctor_char.exp
+++ b/test-cases/final-dump/ctor_char.exp
@@ -266,21 +266,21 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'ctor_char'
 
 source_filename = "!ROOT!/final-dump/ctor_char.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ctor_char.<0>"() {
-  %"tmp#0##0" = tail call fastcc i8 @"ctor_char.foo<0>"(i64 706)
+define external fastcc void @"ctor_char#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i8 @"ctor_char#.foo<0>"(i64 706)
   call ccc void @putchar(i8 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i1 @"ctor_char.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"ctor_char#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -327,7 +327,7 @@ if.then.6:
   %"tmp#36##0" = add i64 %"#right##0", -1
   %"tmp#37##0" = inttoptr i64 %"tmp#36##0" to ptr
   %"#right#other_ctor#1##0" = load i64, ptr %"tmp#37##0"
-  %"tmp#38##0" = tail call fastcc i1 @"ctor_char.=<0>"(i64 %"#left#other_ctor#1##0", i64 %"#right#other_ctor#1##0")
+  %"tmp#38##0" = tail call fastcc i1 @"ctor_char#.=<0>"(i64 %"#left#other_ctor#1##0", i64 %"#right#other_ctor#1##0")
   ret i1 %"tmp#38##0"
 if.else.6:
   ret i1 0
@@ -340,7 +340,7 @@ if.else.0:
   ret i1 %"tmp#39##0"
 }
 
-define external fastcc {i8, i1} @"ctor_char.c<0>"(i64 %"#rec##0") {
+define external fastcc {i8, i1} @"ctor_char#.c<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -365,7 +365,7 @@ if.else.0:
   ret {i8, i1} %"tmp#10##0"
 }
 
-define external fastcc {i64, i1} @"ctor_char.c<1>"(i64 %"#rec##0", i8 %"#field##0") {
+define external fastcc {i64, i1} @"ctor_char#.c<1>"(i64 %"#rec##0", i8 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -391,18 +391,18 @@ if.else.0:
   ret {i64, i1} %"tmp#10##0"
 }
 
-define external fastcc i64 @"ctor_char.const<0>"() {
+define external fastcc i64 @"ctor_char#.const<0>"() {
   ret i64 0
 }
 
-define external fastcc i64 @"ctor_char.ctor<0>"(i8 %"c##0") {
+define external fastcc i64 @"ctor_char#.ctor<0>"(i8 %"c##0") {
   %"#temp##0" = zext i8 %"c##0" to i64
   %"#temp##1" = shl i64 %"#temp##0", 1
   %"tmp#0##0" = or i64 %"#temp##1", 512
   ret i64 %"tmp#0##0"
 }
 
-define external fastcc {i8, i1} @"ctor_char.ctor<1>"(i64 %"#result##0") {
+define external fastcc {i8, i1} @"ctor_char#.ctor<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -427,7 +427,7 @@ if.else.0:
   ret {i8, i1} %"tmp#10##0"
 }
 
-define external fastcc i8 @"ctor_char.foo<0>"(i64 %"this##0") {
+define external fastcc i8 @"ctor_char#.foo<0>"(i64 %"this##0") {
   %"tmp#3##0" = icmp ne i64 %"this##0", 0
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -446,7 +446,7 @@ if.else.0:
   ret i8 48
 }
 
-define external fastcc i64 @"ctor_char.other_ctor<0>"(i64 %"other_ctor#1##0") {
+define external fastcc i64 @"ctor_char#.other_ctor<0>"(i64 %"other_ctor#1##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -455,7 +455,7 @@ define external fastcc i64 @"ctor_char.other_ctor<0>"(i64 %"other_ctor#1##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"ctor_char.other_ctor<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"ctor_char#.other_ctor<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -480,8 +480,8 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc i1 @"ctor_char.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"ctor_char.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"ctor_char#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"ctor_char#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/ctor_char2.exp b/test-cases/final-dump/ctor_char2.exp
index fbf351af..b63eb15d 100644
--- a/test-cases/final-dump/ctor_char2.exp
+++ b/test-cases/final-dump/ctor_char2.exp
@@ -315,21 +315,21 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'ctor_char2'
 
 source_filename = "!ROOT!/final-dump/ctor_char2.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ctor_char2.<0>"() {
-  %"tmp#0##0" = tail call fastcc i8 @"ctor_char2.foo<0>"(i64 1412)
+define external fastcc void @"ctor_char2#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i8 @"ctor_char2#.foo<0>"(i64 1412)
   call ccc void @putchar(i8 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i1 @"ctor_char2.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"ctor_char2#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -376,7 +376,7 @@ if.then.5:
   %"tmp#52##0" = add i64 %"#right##0", -1
   %"tmp#53##0" = inttoptr i64 %"tmp#52##0" to ptr
   %"#right#other_ctor#1##0" = load i64, ptr %"tmp#53##0"
-  %"tmp#54##0" = tail call fastcc i1 @"ctor_char2.=<0>"(i64 %"#left#other_ctor#1##0", i64 %"#right#other_ctor#1##0")
+  %"tmp#54##0" = tail call fastcc i1 @"ctor_char2#.=<0>"(i64 %"#left#other_ctor#1##0", i64 %"#right#other_ctor#1##0")
   ret i1 %"tmp#54##0"
 if.else.5:
   ret i1 0
@@ -397,7 +397,7 @@ if.then.7:
   %"tmp#58##0" = add i64 %"#right##0", -2
   %"tmp#59##0" = inttoptr i64 %"tmp#58##0" to ptr
   %"#right#another_ctor#1##0" = load i64, ptr %"tmp#59##0"
-  %"tmp#60##0" = tail call fastcc i1 @"ctor_char2.=<0>"(i64 %"#left#another_ctor#1##0", i64 %"#right#another_ctor#1##0")
+  %"tmp#60##0" = tail call fastcc i1 @"ctor_char2#.=<0>"(i64 %"#left#another_ctor#1##0", i64 %"#right#another_ctor#1##0")
   ret i1 %"tmp#60##0"
 if.else.7:
   ret i1 0
@@ -410,7 +410,7 @@ if.else.0:
   ret i1 %"tmp#61##0"
 }
 
-define external fastcc i64 @"ctor_char2.another_ctor<0>"(i64 %"another_ctor#1##0") {
+define external fastcc i64 @"ctor_char2#.another_ctor<0>"(i64 %"another_ctor#1##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -419,7 +419,7 @@ define external fastcc i64 @"ctor_char2.another_ctor<0>"(i64 %"another_ctor#1##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"ctor_char2.another_ctor<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"ctor_char2#.another_ctor<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -444,7 +444,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i8, i1} @"ctor_char2.c<0>"(i64 %"#rec##0") {
+define external fastcc {i8, i1} @"ctor_char2#.c<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -469,7 +469,7 @@ if.else.0:
   ret {i8, i1} %"tmp#10##0"
 }
 
-define external fastcc {i64, i1} @"ctor_char2.c<1>"(i64 %"#rec##0", i8 %"#field##0") {
+define external fastcc {i64, i1} @"ctor_char2#.c<1>"(i64 %"#rec##0", i8 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -495,18 +495,18 @@ if.else.0:
   ret {i64, i1} %"tmp#10##0"
 }
 
-define external fastcc i64 @"ctor_char2.const<0>"() {
+define external fastcc i64 @"ctor_char2#.const<0>"() {
   ret i64 0
 }
 
-define external fastcc i64 @"ctor_char2.ctor<0>"(i8 %"c##0") {
+define external fastcc i64 @"ctor_char2#.ctor<0>"(i8 %"c##0") {
   %"#temp##0" = zext i8 %"c##0" to i64
   %"#temp##1" = shl i64 %"#temp##0", 2
   %"tmp#0##0" = or i64 %"#temp##1", 1024
   ret i64 %"tmp#0##0"
 }
 
-define external fastcc {i8, i1} @"ctor_char2.ctor<1>"(i64 %"#result##0") {
+define external fastcc {i8, i1} @"ctor_char2#.ctor<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -531,7 +531,7 @@ if.else.0:
   ret {i8, i1} %"tmp#10##0"
 }
 
-define external fastcc i8 @"ctor_char2.foo<0>"(i64 %"this##0") {
+define external fastcc i8 @"ctor_char2#.foo<0>"(i64 %"this##0") {
   %"tmp#3##0" = icmp ne i64 %"this##0", 0
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -550,7 +550,7 @@ if.else.0:
   ret i8 48
 }
 
-define external fastcc i64 @"ctor_char2.other_ctor<0>"(i64 %"other_ctor#1##0") {
+define external fastcc i64 @"ctor_char2#.other_ctor<0>"(i64 %"other_ctor#1##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -559,7 +559,7 @@ define external fastcc i64 @"ctor_char2.other_ctor<0>"(i64 %"other_ctor#1##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"ctor_char2.other_ctor<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"ctor_char2#.other_ctor<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -584,8 +584,8 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc i1 @"ctor_char2.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"ctor_char2.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"ctor_char2#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"ctor_char2#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/ctor_visibility.exp b/test-cases/final-dump/ctor_visibility.exp
index a2bd60b8..ebe6f33f 100644
--- a/test-cases/final-dump/ctor_visibility.exp
+++ b/test-cases/final-dump/ctor_visibility.exp
@@ -28,7 +28,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'ctor_visibility'
 
 source_filename = "!ROOT!/final-dump/ctor_visibility.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -83,25 +83,25 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'ctor_visibility.all_priv'
 
 source_filename = "!ROOT!/final-dump/ctor_visibility.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"ctor_visibility.all_priv.=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.all_priv#.=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#1##0" = icmp eq i1 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"ctor_visibility.all_priv.bar<0>"() {
+define external fastcc i1 @"ctor_visibility#.all_priv#.bar<0>"() {
   ret i1 1
 }
 
-define external fastcc i1 @"ctor_visibility.all_priv.foo<0>"() {
+define external fastcc i1 @"ctor_visibility#.all_priv#.foo<0>"() {
   ret i1 0
 }
 
-define external fastcc i1 @"ctor_visibility.all_priv.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.all_priv#.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#0##0" = icmp eq i1 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -159,25 +159,25 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'ctor_visibility.all_public_long'
 
 source_filename = "!ROOT!/final-dump/ctor_visibility.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"ctor_visibility.all_public_long.=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.all_public_long#.=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#1##0" = icmp eq i1 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"ctor_visibility.all_public_long.bar<0>"() {
+define external fastcc i1 @"ctor_visibility#.all_public_long#.bar<0>"() {
   ret i1 1
 }
 
-define external fastcc i1 @"ctor_visibility.all_public_long.foo<0>"() {
+define external fastcc i1 @"ctor_visibility#.all_public_long#.foo<0>"() {
   ret i1 0
 }
 
-define external fastcc i1 @"ctor_visibility.all_public_long.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.all_public_long#.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#0##0" = icmp eq i1 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -235,25 +235,25 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'ctor_visibility.all_public_short'
 
 source_filename = "!ROOT!/final-dump/ctor_visibility.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"ctor_visibility.all_public_short.=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.all_public_short#.=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#1##0" = icmp eq i1 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"ctor_visibility.all_public_short.bar<0>"() {
+define external fastcc i1 @"ctor_visibility#.all_public_short#.bar<0>"() {
   ret i1 1
 }
 
-define external fastcc i1 @"ctor_visibility.all_public_short.foo<0>"() {
+define external fastcc i1 @"ctor_visibility#.all_public_short#.foo<0>"() {
   ret i1 0
 }
 
-define external fastcc i1 @"ctor_visibility.all_public_short.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.all_public_short#.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#0##0" = icmp eq i1 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -309,25 +309,25 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'ctor_visibility.ctor_keyword'
 
 source_filename = "!ROOT!/final-dump/ctor_visibility.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"ctor_visibility.ctor_keyword.=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.ctor_keyword#.=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#1##0" = icmp eq i1 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"ctor_visibility.ctor_keyword.bar<0>"() {
+define external fastcc i1 @"ctor_visibility#.ctor_keyword#.bar<0>"() {
   ret i1 1
 }
 
-define external fastcc i1 @"ctor_visibility.ctor_keyword.foo<0>"() {
+define external fastcc i1 @"ctor_visibility#.ctor_keyword#.foo<0>"() {
   ret i1 0
 }
 
-define external fastcc i1 @"ctor_visibility.ctor_keyword.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.ctor_keyword#.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#0##0" = icmp eq i1 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -384,25 +384,25 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'ctor_visibility.one_pub'
 
 source_filename = "!ROOT!/final-dump/ctor_visibility.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"ctor_visibility.one_pub.=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.one_pub#.=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#1##0" = icmp eq i1 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"ctor_visibility.one_pub.bar<0>"() {
+define external fastcc i1 @"ctor_visibility#.one_pub#.bar<0>"() {
   ret i1 1
 }
 
-define external fastcc i1 @"ctor_visibility.one_pub.foo<0>"() {
+define external fastcc i1 @"ctor_visibility#.one_pub#.foo<0>"() {
   ret i1 0
 }
 
-define external fastcc i1 @"ctor_visibility.one_pub.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.one_pub#.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#0##0" = icmp eq i1 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -459,25 +459,25 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'ctor_visibility.one_pub2'
 
 source_filename = "!ROOT!/final-dump/ctor_visibility.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"ctor_visibility.one_pub2.=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.one_pub2#.=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#1##0" = icmp eq i1 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"ctor_visibility.one_pub2.bar<0>"() {
+define external fastcc i1 @"ctor_visibility#.one_pub2#.bar<0>"() {
   ret i1 1
 }
 
-define external fastcc i1 @"ctor_visibility.one_pub2.foo<0>"() {
+define external fastcc i1 @"ctor_visibility#.one_pub2#.foo<0>"() {
   ret i1 0
 }
 
-define external fastcc i1 @"ctor_visibility.one_pub2.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.one_pub2#.~=<0>"(i1 %"#left##0", i1 %"#right##0") {
   %"tmp#0##0" = icmp eq i1 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -683,7 +683,7 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'ctor_visibility.with_fields'
 
 source_filename = "!ROOT!/final-dump/ctor_visibility.wybe"
-target triple    ????
+target triple   = ????
 
 @"array#0" = private unnamed_addr constant [ 2 x i64 ] [i64 -1, i64 0]
 @"array#1" = private unnamed_addr constant [ 2 x i64 ] [i64 1, i64 0]
@@ -692,7 +692,7 @@ target triple    ????
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"ctor_visibility.with_fields.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.with_fields#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#26##0" = trunc i64 %"#left##0" to i1
   %"tmp#9##0" = and i1 %"tmp#26##0", 1
   %"tmp#10##0" = icmp eq i1 %"tmp#9##0", 0
@@ -745,7 +745,7 @@ if.else.2:
   ret i1 0
 }
 
-define external fastcc i64 @"ctor_visibility.with_fields.a<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"ctor_visibility#.with_fields#.a<0>"(i64 %"#rec##0") {
   %"tmp#8##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#8##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 0
@@ -764,7 +764,7 @@ define external fastcc i64 @"ctor_visibility.with_fields.a<0>"(i64 %"#rec##0") {
   ret i64 %"tmp#17##0"
 }
 
-define external fastcc i64 @"ctor_visibility.with_fields.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"ctor_visibility#.with_fields#.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#8##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#8##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 0
@@ -790,7 +790,7 @@ define external fastcc i64 @"ctor_visibility.with_fields.a<1>"(i64 %"#rec##0", i
   ret i64 %"tmp#20##0"
 }
 
-define external fastcc {i64, i1} @"ctor_visibility.with_fields.b<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"ctor_visibility#.with_fields#.b<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -808,7 +808,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"ctor_visibility.with_fields.b<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"ctor_visibility#.with_fields#.b<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -832,7 +832,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc i64 @"ctor_visibility.with_fields.bar<0>"(i64 %"a##0", i64 %"b##0") {
+define external fastcc i64 @"ctor_visibility#.with_fields#.bar<0>"(i64 %"a##0", i64 %"b##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -844,7 +844,7 @@ define external fastcc i64 @"ctor_visibility.with_fields.bar<0>"(i64 %"a##0", i6
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i64, i1} @"ctor_visibility.with_fields.bar<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"ctor_visibility#.with_fields#.bar<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -867,7 +867,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#14##0"
 }
 
-define external fastcc i64 @"ctor_visibility.with_fields.foo<0>"(i64 %"a##0") {
+define external fastcc i64 @"ctor_visibility#.with_fields#.foo<0>"(i64 %"a##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -875,7 +875,7 @@ define external fastcc i64 @"ctor_visibility.with_fields.foo<0>"(i64 %"a##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"ctor_visibility.with_fields.foo<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"ctor_visibility#.with_fields#.foo<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 0
@@ -892,8 +892,8 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i1 @"ctor_visibility.with_fields.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"ctor_visibility.with_fields.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"ctor_visibility#.with_fields#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"ctor_visibility#.with_fields#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
@@ -1090,13 +1090,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'ctor_visibility.with_fields2'
 
 source_filename = "!ROOT!/final-dump/ctor_visibility.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"ctor_visibility.with_fields2.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"ctor_visibility#.with_fields2#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#23##0" = trunc i64 %"#left##0" to i1
   %"tmp#8##0" = and i1 %"tmp#23##0", 1
   %"tmp#9##0" = icmp eq i1 %"tmp#8##0", 0
@@ -1138,7 +1138,7 @@ if.else.2:
   ret i1 0
 }
 
-define external fastcc {i64, i1} @"ctor_visibility.with_fields2.a<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"ctor_visibility#.with_fields2#.a<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 0
@@ -1155,7 +1155,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc {i64, i1} @"ctor_visibility.with_fields2.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"ctor_visibility#.with_fields2#.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 0
@@ -1176,7 +1176,7 @@ if.else.0:
   ret {i64, i1} %"tmp#10##0"
 }
 
-define external fastcc {i64, i1} @"ctor_visibility.with_fields2.b<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"ctor_visibility#.with_fields2#.b<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -1194,7 +1194,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"ctor_visibility.with_fields2.b<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"ctor_visibility#.with_fields2#.b<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -1218,7 +1218,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc i64 @"ctor_visibility.with_fields2.bar<0>"(i64 %"b##0") {
+define external fastcc i64 @"ctor_visibility#.with_fields2#.bar<0>"(i64 %"b##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1227,7 +1227,7 @@ define external fastcc i64 @"ctor_visibility.with_fields2.bar<0>"(i64 %"b##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"ctor_visibility.with_fields2.bar<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"ctor_visibility#.with_fields2#.bar<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -1245,7 +1245,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"ctor_visibility.with_fields2.foo<0>"(i64 %"a##0") {
+define external fastcc i64 @"ctor_visibility#.with_fields2#.foo<0>"(i64 %"a##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1253,7 +1253,7 @@ define external fastcc i64 @"ctor_visibility.with_fields2.foo<0>"(i64 %"a##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"ctor_visibility.with_fields2.foo<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"ctor_visibility#.with_fields2#.foo<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 0
@@ -1270,8 +1270,8 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i1 @"ctor_visibility.with_fields2.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"ctor_visibility.with_fields2.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"ctor_visibility#.with_fields2#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"ctor_visibility#.with_fields2#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/current_module_alias.exp b/test-cases/final-dump/current_module_alias.exp
index 3445d772..ad6a1031 100644
--- a/test-cases/final-dump/current_module_alias.exp
+++ b/test-cases/final-dump/current_module_alias.exp
@@ -40,21 +40,21 @@ toCelsius(f##0:wybe.float, ?#result##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'current_module_alias'
 
 source_filename = "!ROOT!/final-dump/current_module_alias.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_float(double)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"current_module_alias.<0>"() {
-  %"tmp#0##0" = tail call fastcc double @"current_module_alias.toCelsius<0>"(double 1.0)
+define external fastcc void @"current_module_alias#.<0>"() {
+  %"tmp#0##0" = tail call fastcc double @"current_module_alias#.toCelsius<0>"(double 1.0)
   call ccc void @print_float(double %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc double @"current_module_alias.toCelsius<0>"(double %"f##0") {
+define external fastcc double @"current_module_alias#.toCelsius<0>"(double %"f##0") {
   %"tmp#1##0" = fsub double %"f##0", 32.0
   %"tmp#6##0" = fdiv double %"tmp#1##0", 1.8
   ret double %"tmp#6##0"
@@ -84,12 +84,12 @@ toCelsius(f##0:wybe.float, ?#result##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'math.temperature'
 
 source_filename = "!ROOT!/final-dump/math/temperature.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc double @"math.temperature.toCelsius<0>"(double %"f##0") {
+define external fastcc double @"math#.temperature#.toCelsius<0>"(double %"f##0") {
   %"tmp#1##0" = fsub double %"f##0", 32.0
   %"tmp#6##0" = fdiv double %"tmp#1##0", 1.8
   ret double %"tmp#6##0"
diff --git a/test-cases/final-dump/current_module_alias_fail.exp b/test-cases/final-dump/current_module_alias_fail.exp
index 0ee209e3..ed98ae09 100644
--- a/test-cases/final-dump/current_module_alias_fail.exp
+++ b/test-cases/final-dump/current_module_alias_fail.exp
@@ -40,21 +40,21 @@ toCelsius(f##0:wybe.float, ?#result##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'current_module_alias_fail'
 
 source_filename = "!ROOT!/final-dump/current_module_alias_fail.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_float(double)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"current_module_alias_fail.<0>"() {
-  %"tmp#0##0" = tail call fastcc double @"current_module_alias_fail.toCelsius<0>"(double 1.0)
+define external fastcc void @"current_module_alias_fail#.<0>"() {
+  %"tmp#0##0" = tail call fastcc double @"current_module_alias_fail#.toCelsius<0>"(double 1.0)
   call ccc void @print_float(double %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc double @"current_module_alias_fail.toCelsius<0>"(double %"f##0") {
+define external fastcc double @"current_module_alias_fail#.toCelsius<0>"(double %"f##0") {
   %"tmp#1##0" = fsub double %"f##0", 32.0
   %"tmp#6##0" = fdiv double %"tmp#1##0", 1.8
   ret double %"tmp#6##0"
@@ -84,12 +84,12 @@ toCelsius(f##0:wybe.float, ?#result##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'math.temperature'
 
 source_filename = "!ROOT!/final-dump/math/temperature.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc double @"math.temperature.toCelsius<0>"(double %"f##0") {
+define external fastcc double @"math#.temperature#.toCelsius<0>"(double %"f##0") {
   %"tmp#1##0" = fsub double %"f##0", 32.0
   %"tmp#6##0" = fdiv double %"tmp#1##0", 1.8
   ret double %"tmp#6##0"
diff --git a/test-cases/final-dump/current_module_alias_type_args.exp b/test-cases/final-dump/current_module_alias_type_args.exp
index 8d94ea0c..9fa29a90 100644
--- a/test-cases/final-dump/current_module_alias_type_args.exp
+++ b/test-cases/final-dump/current_module_alias_type_args.exp
@@ -137,7 +137,7 @@ tail(#rec##0:current_module_alias_type_args(T) <{}; {}; {0}>, ?#rec##1:current_m
 ; ModuleID = 'current_module_alias_type_args'
 
 source_filename = "!ROOT!/final-dump/current_module_alias_type_args.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -145,7 +145,7 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"current_module_alias_type_args.<0>"() {
+define external fastcc void @"current_module_alias_type_args#.<0>"() {
   %"tmp#14##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#6##0" = ptrtoint ptr %"tmp#14##0" to i64
   %"tmp#15##0" = inttoptr i64 %"tmp#6##0" to ptr
@@ -165,7 +165,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc i64 @"current_module_alias_type_args.cons<0>"(i64 %"head##0", i64 %"tail##0") {
+define external fastcc i64 @"current_module_alias_type_args#.cons<0>"(i64 %"head##0", i64 %"tail##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -176,7 +176,7 @@ define external fastcc i64 @"current_module_alias_type_args.cons<0>"(i64 %"head#
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"current_module_alias_type_args.cons<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"current_module_alias_type_args#.cons<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -196,11 +196,11 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc i64 @"current_module_alias_type_args.empty<0>"() {
+define external fastcc i64 @"current_module_alias_type_args#.empty<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"current_module_alias_type_args.head<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"current_module_alias_type_args#.head<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -215,7 +215,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"current_module_alias_type_args.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"current_module_alias_type_args#.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -234,7 +234,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc {i64, i1} @"current_module_alias_type_args.tail<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"current_module_alias_type_args#.tail<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -250,7 +250,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"current_module_alias_type_args.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"current_module_alias_type_args#.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
diff --git a/test-cases/final-dump/current_module_alias_warning.exp b/test-cases/final-dump/current_module_alias_warning.exp
index 752850dd..cb57e8bd 100644
--- a/test-cases/final-dump/current_module_alias_warning.exp
+++ b/test-cases/final-dump/current_module_alias_warning.exp
@@ -48,27 +48,27 @@ toCelsius(f##0:wybe.float, ?#result##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'current_module_alias_warning'
 
 source_filename = "!ROOT!/final-dump/current_module_alias_warning.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_float(double)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"current_module_alias_warning.<0>"() {
-  %"tmp#0##0" = tail call fastcc double @"current_module_alias_warning.toCelsius<0>"(double 1.0)
+define external fastcc void @"current_module_alias_warning#.<0>"() {
+  %"tmp#0##0" = tail call fastcc double @"current_module_alias_warning#.toCelsius<0>"(double 1.0)
   call ccc void @print_float(double %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc double @"current_module_alias_warning.toCelsius<0>"(double %"f##0") {
+define external fastcc double @"current_module_alias_warning#.toCelsius<0>"(double %"f##0") {
   %"tmp#1##0" = fsub double %"f##0", 32.0
   %"tmp#6##0" = fdiv double %"tmp#1##0", 1.8
   ret double %"tmp#6##0"
 }
 
-define external fastcc double @"current_module_alias_warning.toCelsius<1>"(double %"f##0") {
+define external fastcc double @"current_module_alias_warning#.toCelsius<1>"(double %"f##0") {
   %"tmp#1##0" = fsub double %"f##0", 32.0
   %"tmp#6##0" = fdiv double %"tmp#1##0", 1.8
   ret double %"tmp#6##0"
@@ -98,12 +98,12 @@ toCelsius(f##0:wybe.float, ?#result##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'math.temperature'
 
 source_filename = "!ROOT!/final-dump/math/temperature.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc double @"math.temperature.toCelsius<0>"(double %"f##0") {
+define external fastcc double @"math#.temperature#.toCelsius<0>"(double %"f##0") {
   %"tmp#1##0" = fsub double %"f##0", 32.0
   %"tmp#6##0" = fdiv double %"tmp#1##0", 1.8
   ret double %"tmp#6##0"
diff --git a/test-cases/final-dump/ddd.exp b/test-cases/final-dump/ddd.exp
index 005b6f87..65a10cd4 100644
--- a/test-cases/final-dump/ddd.exp
+++ b/test-cases/final-dump/ddd.exp
@@ -28,17 +28,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'ddd'
 
 source_filename = "!ROOT!/final-dump/ddd.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"DDD: Init\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 9, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"ddd.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"ddd#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/dead_cell_size.exp b/test-cases/final-dump/dead_cell_size.exp
index 5b92c5c3..e0475b6e 100644
--- a/test-cases/final-dump/dead_cell_size.exp
+++ b/test-cases/final-dump/dead_cell_size.exp
@@ -302,7 +302,7 @@ print_t2(x##0:dead_cell_size.t2)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'dead_cell_size'
 
 source_filename = "!ROOT!/final-dump/dead_cell_size.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"t2a\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"t2b(\00", align 8
@@ -317,36 +317,36 @@ target triple    ????
 @"string#10" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#4" to i64 ) }, align 8
 @"string#11" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#5" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"dead_cell_size.<0>"() {
+define external fastcc void @"dead_cell_size#.<0>"() {
   %"tmp#15##0" = call ccc ptr @wybe_malloc(i32 8)
   %"tmp#7##0" = ptrtoint ptr %"tmp#15##0" to i64
   %"tmp#16##0" = inttoptr i64 %"tmp#7##0" to ptr
   store i64 9, ptr %"tmp#16##0"
-  %"tmp#0##0" = tail call fastcc i64 @"dead_cell_size.foo<0>"(i64 %"tmp#7##0")
-  tail call fastcc void @"dead_cell_size.print_t<0>"(i64 %"tmp#0##0")
+  %"tmp#0##0" = tail call fastcc i64 @"dead_cell_size#.foo<0>"(i64 %"tmp#7##0")
+  tail call fastcc void @"dead_cell_size#.print_t<0>"(i64 %"tmp#0##0")
   %"tmp#17##0" = call ccc ptr @wybe_malloc(i32 8)
   %"tmp#10##0" = ptrtoint ptr %"tmp#17##0" to i64
   %"tmp#18##0" = inttoptr i64 %"tmp#10##0" to ptr
   store i64 9, ptr %"tmp#18##0"
-  %"tmp#2##0" = tail call fastcc i64 @"dead_cell_size.bar<0>[410bae77d3]"(i64 %"tmp#10##0")
-  tail call fastcc void @"dead_cell_size.print_t<0>"(i64 %"tmp#2##0")
+  %"tmp#2##0" = tail call fastcc i64 @"dead_cell_size#.bar<0>[410bae77d3]"(i64 %"tmp#10##0")
+  tail call fastcc void @"dead_cell_size#.print_t<0>"(i64 %"tmp#2##0")
   %"tmp#19##0" = call ccc ptr @wybe_malloc(i32 8)
   %"tmp#13##0" = ptrtoint ptr %"tmp#19##0" to i64
   %"tmp#20##0" = inttoptr i64 %"tmp#13##0" to ptr
   store i64 9, ptr %"tmp#20##0"
-  %"tmp#4##0" = tail call fastcc i64 @"dead_cell_size.diff_type<0>[410bae77d3]"(i64 %"tmp#13##0")
-  tail call fastcc void @"dead_cell_size.print_t2<0>"(i64 %"tmp#4##0")
+  %"tmp#4##0" = tail call fastcc i64 @"dead_cell_size#.diff_type<0>[410bae77d3]"(i64 %"tmp#13##0")
+  tail call fastcc void @"dead_cell_size#.print_t2<0>"(i64 %"tmp#4##0")
   ret void
 }
 
-define external fastcc i64 @"dead_cell_size.bar<0>"(i64 %"x##0") {
+define external fastcc i64 @"dead_cell_size#.bar<0>"(i64 %"x##0") {
   %"tmp#3##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -369,7 +369,7 @@ if.else.0:
   ret i64 0
 }
 
-define external fastcc i64 @"dead_cell_size.bar<0>[410bae77d3]"(i64 %"x##0") {
+define external fastcc i64 @"dead_cell_size#.bar<0>[410bae77d3]"(i64 %"x##0") {
   %"tmp#3##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -386,7 +386,7 @@ if.else.0:
   ret i64 0
 }
 
-define external fastcc i64 @"dead_cell_size.diff_type<0>"(i64 %"x##0") {
+define external fastcc i64 @"dead_cell_size#.diff_type<0>"(i64 %"x##0") {
   %"tmp#4##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -416,7 +416,7 @@ if.else.0:
   ret i64 %"tmp#20##0"
 }
 
-define external fastcc i64 @"dead_cell_size.diff_type<0>[410bae77d3]"(i64 %"x##0") {
+define external fastcc i64 @"dead_cell_size#.diff_type<0>[410bae77d3]"(i64 %"x##0") {
   %"tmp#4##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -440,7 +440,7 @@ if.else.0:
   ret i64 %"tmp#17##0"
 }
 
-define external fastcc i64 @"dead_cell_size.foo<0>"(i64 %"x##0") {
+define external fastcc i64 @"dead_cell_size#.foo<0>"(i64 %"x##0") {
   %"tmp#3##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -469,11 +469,11 @@ if.else.0:
   ret i64 0
 }
 
-define external fastcc void @"dead_cell_size.print_t<0>"(i64 %"x##0") {
-  %"tmp#4##0" = tail call fastcc i1 @"dead_cell_size.t.=<0>"(i64 0, i64 %"x##0")
+define external fastcc void @"dead_cell_size#.print_t<0>"(i64 %"x##0") {
+  %"tmp#4##0" = tail call fastcc i1 @"dead_cell_size#.t#.=<0>"(i64 0, i64 %"x##0")
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 if.else.0:
@@ -489,9 +489,9 @@ if.then.1:
 case.0.switch.2:
   %"tmp#68##0" = inttoptr i64 %"x##0" to ptr
   %"a##0" = load i64, ptr %"tmp#68##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @print_int(i64 %"a##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 case.1.switch.2:
@@ -504,22 +504,22 @@ case.1.switch.2:
   %"tmp#73##0" = add i64 %"x##0", 15
   %"tmp#74##0" = inttoptr i64 %"tmp#73##0" to ptr
   %"c##0" = load i64, ptr %"tmp#74##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
   call ccc void @print_int(i64 %"a##1")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   call ccc void @print_int(i64 %"b##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   call ccc void @print_int(i64 %"c##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 case.2.switch.2:
   %"tmp#75##0" = add i64 %"x##0", -2
   %"tmp#76##0" = inttoptr i64 %"tmp#75##0" to ptr
   %"a##2" = load i64, ptr %"tmp#76##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
   call ccc void @print_int(i64 %"a##2")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 default.switch.2:
@@ -530,11 +530,11 @@ if.else.1:
   ret void
 }
 
-define external fastcc void @"dead_cell_size.print_t2<0>"(i64 %"x##0") {
-  %"tmp#2##0" = tail call fastcc i1 @"dead_cell_size.t2.=<0>"(i64 0, i64 %"x##0")
+define external fastcc void @"dead_cell_size#.print_t2<0>"(i64 %"x##0") {
+  %"tmp#2##0" = tail call fastcc i1 @"dead_cell_size#.t2#.=<0>"(i64 0, i64 %"x##0")
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 if.else.0:
@@ -543,9 +543,9 @@ if.else.0:
 if.then.1:
   %"tmp#19##0" = inttoptr i64 %"x##0" to ptr
   %"a##0" = load i64, ptr %"tmp#19##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @print_int(i64 %"a##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 if.else.1:
@@ -1060,13 +1060,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'dead_cell_size.t'
 
 source_filename = "!ROOT!/final-dump/dead_cell_size.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"dead_cell_size.t.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"dead_cell_size#.t#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1167,11 +1167,11 @@ if.else.0:
   ret i1 %"tmp#72##0"
 }
 
-define external fastcc i64 @"dead_cell_size.t.ta<0>"() {
+define external fastcc i64 @"dead_cell_size#.t#.ta<0>"() {
   ret i64 0
 }
 
-define external fastcc i64 @"dead_cell_size.t.tb<0>"(i64 %"tb1##0") {
+define external fastcc i64 @"dead_cell_size#.t#.tb<0>"(i64 %"tb1##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1179,7 +1179,7 @@ define external fastcc i64 @"dead_cell_size.t.tb<0>"(i64 %"tb1##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.tb<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.tb<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1203,7 +1203,7 @@ if.else.0:
   ret {i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.tb1<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.tb1<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1227,7 +1227,7 @@ if.else.0:
   ret {i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.tb1<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.tb1<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1255,7 +1255,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc i64 @"dead_cell_size.t.tc<0>"(i64 %"tc1##0", i64 %"tc2##0", i64 %"tc3##0") {
+define external fastcc i64 @"dead_cell_size#.t#.tc<0>"(i64 %"tc1##0", i64 %"tc2##0", i64 %"tc3##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1270,7 +1270,7 @@ define external fastcc i64 @"dead_cell_size.t.tc<0>"(i64 %"tc1##0", i64 %"tc2##0
   ret i64 %"tmp#6##0"
 }
 
-define external fastcc {i64, i64, i64, i1} @"dead_cell_size.t.tc<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i1} @"dead_cell_size#.t#.tc<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1307,7 +1307,7 @@ if.else.0:
   ret {i64, i64, i64, i1} %"tmp#24##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.tc1<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.tc1<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1332,7 +1332,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.tc1<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.tc1<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1363,7 +1363,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.tc2<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.tc2<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1388,7 +1388,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.tc2<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.tc2<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1419,7 +1419,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.tc3<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.tc3<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1444,7 +1444,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.tc3<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.tc3<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1475,7 +1475,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc i64 @"dead_cell_size.t.td<0>"(i64 %"td1##0") {
+define external fastcc i64 @"dead_cell_size#.t#.td<0>"(i64 %"td1##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1484,7 +1484,7 @@ define external fastcc i64 @"dead_cell_size.t.td<0>"(i64 %"td1##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.td<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.td<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1509,7 +1509,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.td1<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.td1<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1534,7 +1534,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t.td1<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t#.td1<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1565,8 +1565,8 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc i1 @"dead_cell_size.t.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"dead_cell_size.t.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"dead_cell_size#.t#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"dead_cell_size#.t#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
@@ -1690,13 +1690,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'dead_cell_size.t2'
 
 source_filename = "!ROOT!/final-dump/dead_cell_size.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"dead_cell_size.t2.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"dead_cell_size#.t2#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1716,7 +1716,7 @@ if.else.0:
   ret i1 %"tmp#14##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t2.a<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t2#.a<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1731,7 +1731,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t2.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t2#.a<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1750,11 +1750,11 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"dead_cell_size.t2.t2a<0>"() {
+define external fastcc i64 @"dead_cell_size#.t2#.t2a<0>"() {
   ret i64 0
 }
 
-define external fastcc i64 @"dead_cell_size.t2.t2b<0>"(i64 %"a##0") {
+define external fastcc i64 @"dead_cell_size#.t2#.t2b<0>"(i64 %"a##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1762,7 +1762,7 @@ define external fastcc i64 @"dead_cell_size.t2.t2b<0>"(i64 %"a##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"dead_cell_size.t2.t2b<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"dead_cell_size#.t2#.t2b<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1777,8 +1777,8 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc i1 @"dead_cell_size.t2.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"dead_cell_size.t2.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"dead_cell_size#.t2#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"dead_cell_size#.t2#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/decimal.exp b/test-cases/final-dump/decimal.exp
index 5fe6b626..0291eb98 100644
--- a/test-cases/final-dump/decimal.exp
+++ b/test-cases/final-dump/decimal.exp
@@ -46,7 +46,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'decimal'
 
 source_filename = "!ROOT!/final-dump/decimal.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_float(double)
@@ -54,7 +54,7 @@ declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"decimal.<0>"() {
+define external fastcc void @"decimal#.<0>"() {
   call ccc void @print_float(double 1.0e-2)
   call ccc void @putchar(i8 10)
   call ccc void @print_int(i64 255)
diff --git a/test-cases/final-dump/det_for.exp b/test-cases/final-dump/det_for.exp
index 967145a3..fc6d30ce 100644
--- a/test-cases/final-dump/det_for.exp
+++ b/test-cases/final-dump/det_for.exp
@@ -47,27 +47,27 @@ proc [|] > {inline} (1 calls)
 ; ModuleID = 'det_for'
 
 source_filename = "!ROOT!/final-dump/det_for.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"det_for.<0>"() {
-  tail call fastcc void @"det_for.#cont#1<0>"(i64 0)
+define external fastcc void @"det_for#.<0>"() {
+  tail call fastcc void @"det_for#.#cont#1<0>"(i64 0)
   ret void
 }
 
-define external fastcc void @"det_for.#cont#1<0>"(i64 %"tmp#0##0") {
+define external fastcc void @"det_for#.#cont#1<0>"(i64 %"tmp#0##0") {
   %"tmp#0##1" = add i64 %"tmp#0##0", 1
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"det_for.#cont#1<0>"(i64 %"tmp#0##1")
+  tail call fastcc void @"det_for#.#cont#1<0>"(i64 %"tmp#0##1")
   ret void
 }
 
-define external fastcc {i64, i64} @"det_for.[|]<0>"(i64 %"current##0") {
+define external fastcc {i64, i64} @"det_for#.[|]<0>"(i64 %"current##0") {
   %"tmp#3##0" = add i64 %"current##0", 1
   %"tmp#4##0" = insertvalue {i64, i64} undef, i64 %"current##0", 0
   %"tmp#5##0" = insertvalue {i64, i64} %"tmp#4##0", i64 %"tmp#3##0", 1
diff --git a/test-cases/final-dump/disjunction.exp b/test-cases/final-dump/disjunction.exp
index ed7d37ff..9d663c79 100644
--- a/test-cases/final-dump/disjunction.exp
+++ b/test-cases/final-dump/disjunction.exp
@@ -98,12 +98,12 @@ saturating_tail2(lst##0:wybe.list(T) <{}; {}; {0}>, ?#result##0:wybe.list(T) <{}
 ; ModuleID = 'disjunction'
 
 source_filename = "!ROOT!/final-dump/disjunction.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"disjunction.in<0>"(i64 %"e##0", i64 %"lst##0") {
+define external fastcc i1 @"disjunction#.in<0>"(i64 %"e##0", i64 %"lst##0") {
   %"tmp#6##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#6##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -117,13 +117,13 @@ if.else.1:
   %"tmp#14##0" = add i64 %"lst##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#15##0"
-  %"tmp#16##0" = tail call fastcc i1 @"disjunction.in<0>"(i64 %"e##0", i64 %"tmp#0##0")
+  %"tmp#16##0" = tail call fastcc i1 @"disjunction#.in<0>"(i64 %"e##0", i64 %"tmp#0##0")
   ret i1 %"tmp#16##0"
 if.else.0:
   ret i1 0
 }
 
-define external fastcc i1 @"disjunction.member<0>"(i64 %"e##0", i64 %"lst##0") {
+define external fastcc i1 @"disjunction#.member<0>"(i64 %"e##0", i64 %"lst##0") {
   %"tmp#4##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -137,13 +137,13 @@ if.then.0:
 if.then.1:
   ret i1 1
 if.else.1:
-  %"tmp#10##0" = tail call fastcc i1 @"disjunction.member<0>"(i64 %"e##0", i64 %"t##0")
+  %"tmp#10##0" = tail call fastcc i1 @"disjunction#.member<0>"(i64 %"e##0", i64 %"t##0")
   ret i1 %"tmp#10##0"
 if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"disjunction.saturating_tail<0>"(i64 %"lst##0") {
+define external fastcc i64 @"disjunction#.saturating_tail<0>"(i64 %"lst##0") {
   %"tmp#4##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -155,7 +155,7 @@ if.else.0:
   ret i64 0
 }
 
-define external fastcc i64 @"disjunction.saturating_tail2<0>"(i64 %"lst##0") {
+define external fastcc i64 @"disjunction#.saturating_tail2<0>"(i64 %"lst##0") {
   %"tmp#5##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
diff --git a/test-cases/final-dump/disjunctive-cond.exp b/test-cases/final-dump/disjunctive-cond.exp
index 74cd87c4..794b3556 100644
--- a/test-cases/final-dump/disjunctive-cond.exp
+++ b/test-cases/final-dump/disjunctive-cond.exp
@@ -95,7 +95,7 @@ proc #cont#3 > {semipure} (7 calls)
 ; ModuleID = 'disjunctive-cond'
 
 source_filename = "!ROOT!/final-dump/disjunctive-cond.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"all good\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"also good\00", align 8
@@ -111,60 +111,60 @@ target triple    ????
 @"array#11" = private unnamed_addr constant [ 2 x i64 ] [i64 ptrtoint( ptr @"string#8" to i64 ), i64 ptrtoint( ptr @"string#6" to i64 )]
 @"array#12" = private unnamed_addr constant [ 2 x i64 ] [i64 ptrtoint( ptr @"string#9" to i64 ), i64 ptrtoint( ptr @"string#8" to i64 )]
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"disjunctive-cond.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+define external fastcc void @"disjunctive-cond#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"disjunctive-cond.#cont#1<0>"(i1 1, i1 0)
+  tail call fastcc void @"disjunctive-cond#.#cont#1<0>"(i1 1, i1 0)
   ret void
 }
 
-define external fastcc void @"disjunctive-cond.#cont#1<0>"(i1 %"a##0", i1 %"b##0") {
+define external fastcc void @"disjunctive-cond#.#cont#1<0>"(i1 %"a##0", i1 %"b##0") {
   br i1 %"a##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"disjunctive-cond.#cont#2<0>"(i1 1, i1 %"b##0")
+  tail call fastcc void @"disjunctive-cond#.#cont#2<0>"(i1 1, i1 %"b##0")
   ret void
 if.else.0:
   %"tmp#17##0" = zext i1 %"b##0" to i64
   %"tmp#16##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#11", i64 0, i64 %"tmp#17##0"
   %"tmp#14##0" = load i64, ptr %"tmp#16##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#14##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#14##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"disjunctive-cond.#cont#2<0>"(i1 0, i1 %"b##0")
+  tail call fastcc void @"disjunctive-cond#.#cont#2<0>"(i1 0, i1 %"b##0")
   ret void
 }
 
-define external fastcc void @"disjunctive-cond.#cont#2<0>"(i1 %"a##0", i1 %"b##0") {
+define external fastcc void @"disjunctive-cond#.#cont#2<0>"(i1 %"a##0", i1 %"b##0") {
   br i1 %"a##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#17##0" = zext i1 %"b##0" to i64
   %"tmp#16##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#10", i64 0, i64 %"tmp#17##0"
   %"tmp#14##0" = load i64, ptr %"tmp#16##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#14##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#14##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"disjunctive-cond.#cont#3<0>"(i1 1, i1 %"b##0")
+  tail call fastcc void @"disjunctive-cond#.#cont#3<0>"(i1 1, i1 %"b##0")
   ret void
 if.else.0:
-  tail call fastcc void @"disjunctive-cond.#cont#3<0>"(i1 0, i1 %"b##0")
+  tail call fastcc void @"disjunctive-cond#.#cont#3<0>"(i1 0, i1 %"b##0")
   ret void
 }
 
-define external fastcc void @"disjunctive-cond.#cont#3<0>"(i1 %"a##0", i1 %"b##0") {
+define external fastcc void @"disjunctive-cond#.#cont#3<0>"(i1 %"a##0", i1 %"b##0") {
   br i1 %"a##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#14##0" = zext i1 %"b##0" to i64
   %"tmp#13##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#12", i64 0, i64 %"tmp#14##0"
   %"tmp#12##0" = load i64, ptr %"tmp#13##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#12##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#12##0")
   call ccc void @putchar(i8 10)
   ret void
 if.else.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/dont_care_constraint.exp b/test-cases/final-dump/dont_care_constraint.exp
index b105e2e3..214148e0 100644
--- a/test-cases/final-dump/dont_care_constraint.exp
+++ b/test-cases/final-dump/dont_care_constraint.exp
@@ -27,13 +27,13 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'dont_care_constraint'
 
 source_filename = "!ROOT!/final-dump/dont_care_constraint.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc i64 @read_line()
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"dont_care_constraint.<0>"() {
+define external fastcc void @"dont_care_constraint#.<0>"() {
   %"tmp#2##0" = call ccc i64 @read_line()
   ret void
 }
diff --git a/test-cases/final-dump/early_error.exp b/test-cases/final-dump/early_error.exp
index 1bae5238..4810cbe1 100644
--- a/test-cases/final-dump/early_error.exp
+++ b/test-cases/final-dump/early_error.exp
@@ -39,28 +39,28 @@ my_error(msg##0:wybe.string)<{}; {}; {}>:
 ; ModuleID = 'early_error'
 
 source_filename = "!ROOT!/final-dump/early_error.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"should print this\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"should print this error message\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 31, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @exit(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @puts(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"early_error.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+define external fastcc void @"early_error#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @putchar(i8 10)
   call ccc void @puts(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @exit(i64 1)
   ret void
 }
 
-define external fastcc void @"early_error.my_error<0>"(i64 %"msg##0") {
+define external fastcc void @"early_error#.my_error<0>"(i64 %"msg##0") {
   call ccc void @puts(i64 %"msg##0")
   call ccc void @exit(i64 1)
   ret void
diff --git a/test-cases/final-dump/early_exit.exp b/test-cases/final-dump/early_exit.exp
index 1aaba134..6ca2fd81 100644
--- a/test-cases/final-dump/early_exit.exp
+++ b/test-cases/final-dump/early_exit.exp
@@ -29,18 +29,18 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'early_exit'
 
 source_filename = "!ROOT!/final-dump/early_exit.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"should print this\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @exit(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"early_exit.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"early_exit#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   call ccc void @exit(i64 1)
   ret void
diff --git a/test-cases/final-dump/early_exit2.exp b/test-cases/final-dump/early_exit2.exp
index d3e05615..7d5a3540 100644
--- a/test-cases/final-dump/early_exit2.exp
+++ b/test-cases/final-dump/early_exit2.exp
@@ -37,24 +37,24 @@ my_exit(code##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'early_exit2'
 
 source_filename = "!ROOT!/final-dump/early_exit2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"should print this\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @exit(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"early_exit2.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"early_exit2#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   call ccc void @exit(i64 1)
   ret void
 }
 
-define external fastcc void @"early_exit2.my_exit<0>"(i64 %"code##0") {
+define external fastcc void @"early_exit2#.my_exit<0>"(i64 %"code##0") {
   call ccc void @exit(i64 %"code##0")
   ret void
 }
diff --git a/test-cases/final-dump/empty.exp b/test-cases/final-dump/empty.exp
index 687abe9e..f797357c 100644
--- a/test-cases/final-dump/empty.exp
+++ b/test-cases/final-dump/empty.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'empty'
 
 source_filename = "!ROOT!/final-dump/empty.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/eof_comment.exp b/test-cases/final-dump/eof_comment.exp
index 170617e6..bf2cc0c3 100644
--- a/test-cases/final-dump/eof_comment.exp
+++ b/test-cases/final-dump/eof_comment.exp
@@ -28,17 +28,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'eof_comment'
 
 source_filename = "!ROOT!/final-dump/eof_comment.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Wominjeka!\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 10, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"eof_comment.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"eof_comment#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/exp_if.exp b/test-cases/final-dump/exp_if.exp
index 5c1c0126..4a0053eb 100644
--- a/test-cases/final-dump/exp_if.exp
+++ b/test-cases/final-dump/exp_if.exp
@@ -39,7 +39,7 @@ if_test(x##0:wybe.int, ?#result##0:wybe.string)<{}; {}; {}>:
 ; ModuleID = 'exp_if'
 
 source_filename = "!ROOT!/final-dump/exp_if.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"expect larger: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"larger\00", align 8
@@ -49,17 +49,17 @@ target triple    ????
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 7, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 @"array#6" = private unnamed_addr constant [ 2 x i64 ] [i64 ptrtoint( ptr @"string#5" to i64 ), i64 ptrtoint( ptr @"string#4" to i64 )]
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"exp_if.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
-  %"tmp#0##0" = tail call fastcc i64 @"exp_if.if_test<0>"(i64 3)
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#0##0")
+define external fastcc void @"exp_if#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  %"tmp#0##0" = tail call fastcc i64 @"exp_if#.if_test<0>"(i64 3)
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc i64 @"exp_if.if_test<0>"(i64 %"x##0") {
+define external fastcc i64 @"exp_if#.if_test<0>"(i64 %"x##0") {
   %"tmp#1##0" = icmp sgt i64 %"x##0", 0
   %"tmp#7##0" = zext i1 %"tmp#1##0" to i64
   %"tmp#6##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#6", i64 0, i64 %"tmp#7##0"
diff --git a/test-cases/final-dump/exp_print.exp b/test-cases/final-dump/exp_print.exp
index 0825a892..1ad74391 100644
--- a/test-cases/final-dump/exp_print.exp
+++ b/test-cases/final-dump/exp_print.exp
@@ -38,23 +38,23 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'exp_print'
 
 source_filename = "!ROOT!/final-dump/exp_print.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"print(x:string) creates a newline already\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"println(x:string) generates an extra newline?\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 41, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 45, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"exp_print.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+define external fastcc void @"exp_print#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
   call ccc void @putchar(i8 99)
   call ccc void @putchar(i8 10)
diff --git a/test-cases/final-dump/exp_simple.exp b/test-cases/final-dump/exp_simple.exp
index 56b97f95..b582aad8 100644
--- a/test-cases/final-dump/exp_simple.exp
+++ b/test-cases/final-dump/exp_simple.exp
@@ -48,25 +48,25 @@ foreign_add(?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'exp_simple'
 
 source_filename = "!ROOT!/final-dump/exp_simple.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"hello\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 5, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_float(double)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"exp_simple.<0>"() {
+define external fastcc void @"exp_simple#.<0>"() {
   call ccc void @print_int(i64 3)
   call ccc void @putchar(i8 10)
   call ccc void @print_float(double 3.5999999999999996)
   call ccc void @putchar(i8 10)
   call ccc void @putchar(i8 104)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @print_int(i64 3)
   call ccc void @putchar(i8 10)
   call ccc void @print_int(i64 1001)
@@ -75,6 +75,6 @@ define external fastcc void @"exp_simple.<0>"() {
   ret void
 }
 
-define external fastcc i64 @"exp_simple.foreign_add<0>"() {
+define external fastcc i64 @"exp_simple#.foreign_add<0>"() {
   ret i64 3
 }
diff --git a/test-cases/final-dump/explicit_type_warning.exp b/test-cases/final-dump/explicit_type_warning.exp
index 5b0fc1bc..83a3de35 100644
--- a/test-cases/final-dump/explicit_type_warning.exp
+++ b/test-cases/final-dump/explicit_type_warning.exp
@@ -176,13 +176,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'explicit_type_warning'
 
 source_filename = "!ROOT!/final-dump/explicit_type_warning.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"explicit_type_warning.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"explicit_type_warning#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -202,7 +202,7 @@ if.then.1:
   %"tmp#4##0" = icmp eq i64 %"#left#h##0", %"#right#h##0"
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#18##0" = tail call fastcc i1 @"explicit_type_warning.=<0>"(i64 %"#left#t##0", i64 %"#right#t##0")
+  %"tmp#18##0" = tail call fastcc i1 @"explicit_type_warning#.=<0>"(i64 %"#left#t##0", i64 %"#right#t##0")
   ret i1 %"tmp#18##0"
 if.else.2:
   ret i1 0
@@ -213,7 +213,7 @@ if.else.0:
   ret i1 %"tmp#19##0"
 }
 
-define external fastcc {i64, i1} @"explicit_type_warning.h<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"explicit_type_warning#.h<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -228,7 +228,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"explicit_type_warning.h<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"explicit_type_warning#.h<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -247,11 +247,11 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"explicit_type_warning.mt<0>"() {
+define external fastcc i64 @"explicit_type_warning#.mt<0>"() {
   ret i64 0
 }
 
-define external fastcc i64 @"explicit_type_warning.oops<0>"(i64 %"h##0", i64 %"t##0") {
+define external fastcc i64 @"explicit_type_warning#.oops<0>"(i64 %"h##0", i64 %"t##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -262,7 +262,7 @@ define external fastcc i64 @"explicit_type_warning.oops<0>"(i64 %"h##0", i64 %"t
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"explicit_type_warning.oops<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"explicit_type_warning#.oops<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -282,21 +282,21 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc i64 @"explicit_type_warning.oops2<0>"(i64 %"l##0") {
+define external fastcc i64 @"explicit_type_warning#.oops2<0>"(i64 %"l##0") {
   %"tmp#6##0" = icmp ne i64 %"l##0", 0
   br i1 %"tmp#6##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#9##0" = add i64 %"l##0", 8
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   %"t##0" = load i64, ptr %"tmp#10##0"
-  %"tmp#3##0" = tail call fastcc i64 @"explicit_type_warning.oops2<0>"(i64 %"t##0")
+  %"tmp#3##0" = tail call fastcc i64 @"explicit_type_warning#.oops2<0>"(i64 %"t##0")
   %"tmp#11##0" = add i64 %"tmp#3##0", 1
   ret i64 %"tmp#11##0"
 if.else.0:
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"explicit_type_warning.t<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"explicit_type_warning#.t<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -312,7 +312,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"explicit_type_warning.t<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"explicit_type_warning#.t<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -332,8 +332,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"explicit_type_warning.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"explicit_type_warning.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"explicit_type_warning#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"explicit_type_warning#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/exporter.exp b/test-cases/final-dump/exporter.exp
index 7a40f45e..fde98a59 100644
--- a/test-cases/final-dump/exporter.exp
+++ b/test-cases/final-dump/exporter.exp
@@ -34,19 +34,19 @@ three(?n##0:wybe.int)<{<<exporter.res>>}; {}; {}>:
 ; ModuleID = 'exporter'
 
 source_filename = "!ROOT!/final-dump/exporter.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc i64 @ipow(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#exporter.res" = global i64 undef
 
-define external fastcc i64 @"exporter.fn<0>"(i64 %"i##0") {
+define external fastcc i64 @"exporter#.fn<0>"(i64 %"i##0") {
   %"tmp#3##0" = call ccc i64 @ipow(i64 2, i64 %"i##0")
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc i64 @"exporter.three<0>"() {
+define external fastcc i64 @"exporter#.three<0>"() {
   %"tmp#1##0" = load i64, ptr @"resource#exporter.res"
   ret i64 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/extern_anon_params_a.exp b/test-cases/final-dump/extern_anon_params_a.exp
index f3634e3f..eae17d18 100644
--- a/test-cases/final-dump/extern_anon_params_a.exp
+++ b/test-cases/final-dump/extern_anon_params_a.exp
@@ -48,29 +48,29 @@ run#anon#1(^func##0:{impure}())<{}; {}; {}>:
 ; ModuleID = 'extern_anon_params_a'
 
 source_filename = "!ROOT!/final-dump/extern_anon_params_a.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"extern_anon_params_a.need<0>"(ptr %"stmt##0") {
+define external fastcc void @"extern_anon_params_a#.need<0>"(ptr %"stmt##0") {
   %"tmp#0##0" = load ptr, ptr %"stmt##0"
   tail call fastcc void %"tmp#0##0"(ptr %"stmt##0")
   ret void
 }
 
-define external fastcc void @"extern_anon_params_a.run<0>"(ptr %"func##0") {
-  tail call fastcc void @"extern_anon_params_a.run#anon#1<0>"(ptr %"func##0")
+define external fastcc void @"extern_anon_params_a#.run<0>"(ptr %"func##0") {
+  tail call fastcc void @"extern_anon_params_a#.run#anon#1<0>"(ptr %"func##0")
   ret void
 }
 
-define external fastcc void @"extern_anon_params_a.run#anon#1<0>"(ptr %"func##0") {
+define external fastcc void @"extern_anon_params_a#.run#anon#1<0>"(ptr %"func##0") {
   %"tmp#0##0" = load ptr, ptr %"func##0"
   tail call fastcc void %"tmp#0##0"(ptr %"func##0")
   ret void
 }
 
-define external fastcc void @"extern_anon_params_a.run#anon#1<1>"(ptr %"#env##0") {
+define external fastcc void @"extern_anon_params_a#.run#anon#1<1>"(ptr %"#env##0") {
   %"tmp#1##0" = getelementptr inbounds {ptr, ptr}, ptr %"#env##0", i64 0, i32 1
   %"func##0" = load ptr, ptr %"tmp#1##0"
   %"tmp#2##0" = load ptr, ptr %"func##0"
diff --git a/test-cases/final-dump/extern_anon_params_b.exp b/test-cases/final-dump/extern_anon_params_b.exp
index fd7493f3..5eb1bb5e 100644
--- a/test-cases/final-dump/extern_anon_params_b.exp
+++ b/test-cases/final-dump/extern_anon_params_b.exp
@@ -48,29 +48,29 @@ run#anon#1(^func##0:{impure}())<{}; {}; {}>:
 ; ModuleID = 'extern_anon_params_a'
 
 source_filename = "!ROOT!/final-dump/extern_anon_params_a.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"extern_anon_params_a.need<0>"(ptr %"stmt##0") {
+define external fastcc void @"extern_anon_params_a#.need<0>"(ptr %"stmt##0") {
   %"tmp#0##0" = load ptr, ptr %"stmt##0"
   tail call fastcc void %"tmp#0##0"(ptr %"stmt##0")
   ret void
 }
 
-define external fastcc void @"extern_anon_params_a.run<0>"(ptr %"func##0") {
-  tail call fastcc void @"extern_anon_params_a.run#anon#1<0>"(ptr %"func##0")
+define external fastcc void @"extern_anon_params_a#.run<0>"(ptr %"func##0") {
+  tail call fastcc void @"extern_anon_params_a#.run#anon#1<0>"(ptr %"func##0")
   ret void
 }
 
-define external fastcc void @"extern_anon_params_a.run#anon#1<0>"(ptr %"func##0") {
+define external fastcc void @"extern_anon_params_a#.run#anon#1<0>"(ptr %"func##0") {
   %"tmp#0##0" = load ptr, ptr %"func##0"
   tail call fastcc void %"tmp#0##0"(ptr %"func##0")
   ret void
 }
 
-define external fastcc void @"extern_anon_params_a.run#anon#1<1>"(ptr %"#env##0") {
+define external fastcc void @"extern_anon_params_a#.run#anon#1<1>"(ptr %"#env##0") {
   %"tmp#1##0" = getelementptr inbounds {ptr, ptr}, ptr %"#env##0", i64 0, i32 1
   %"func##0" = load ptr, ptr %"tmp#1##0"
   %"tmp#2##0" = load ptr, ptr %"func##0"
@@ -114,22 +114,22 @@ proc #anon#1 > {inline,impure} (1 calls)
 ; ModuleID = 'extern_anon_params_b'
 
 source_filename = "!ROOT!/final-dump/extern_anon_params_b.wybe"
-target triple    ????
+target triple   = ????
 
-@"closure#0" = private unnamed_addr constant {ptr} { ptr @"extern_anon_params_b.#anon#1<1>" }, align 8
+@"closure#0" = private unnamed_addr constant {ptr} { ptr @"extern_anon_params_b#.#anon#1<1>" }, align 8
 
-declare external fastcc void @"extern_anon_params_a.run#anon#1<0>"(ptr)
+declare external fastcc void @"extern_anon_params_a#.run#anon#1<0>"(ptr)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"extern_anon_params_b.<0>"() {
-  tail call fastcc void @"extern_anon_params_a.run#anon#1<0>"(ptr @"closure#0")
+define external fastcc void @"extern_anon_params_b#.<0>"() {
+  tail call fastcc void @"extern_anon_params_a#.run#anon#1<0>"(ptr @"closure#0")
   ret void
 }
 
-define external fastcc void @"extern_anon_params_b.#anon#1<0>"() {
+define external fastcc void @"extern_anon_params_b#.#anon#1<0>"() {
   ret void
 }
 
-define external fastcc void @"extern_anon_params_b.#anon#1<1>"(ptr %"#env##0") {
+define external fastcc void @"extern_anon_params_b#.#anon#1<1>"(ptr %"#env##0") {
   ret void
 }
diff --git a/test-cases/final-dump/factor_bug.exp b/test-cases/final-dump/factor_bug.exp
index 49fdaf60..caa17d83 100644
--- a/test-cases/final-dump/factor_bug.exp
+++ b/test-cases/final-dump/factor_bug.exp
@@ -51,27 +51,27 @@ test(?#result##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'factor_bug'
 
 source_filename = "!ROOT!/final-dump/factor_bug.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"factor_bug.<0>"() {
+define external fastcc void @"factor_bug#.<0>"() {
   call ccc void @print_int(i64 20)
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"factor_bug.foo<0>"() {
+define external fastcc i64 @"factor_bug#.foo<0>"() {
   ret i64 20
 }
 
-define external fastcc void @"factor_bug.foo#cont#1<0>"(i64 %"ret##0") {
+define external fastcc void @"factor_bug#.foo#cont#1<0>"(i64 %"ret##0") {
   ret void
 }
 
-define external fastcc i1 @"factor_bug.test<0>"() {
+define external fastcc i1 @"factor_bug#.test<0>"() {
   ret i1 0
 }
diff --git a/test-cases/final-dump/failure_backtrack.exp b/test-cases/final-dump/failure_backtrack.exp
index bbdfd732..6ed6dd60 100644
--- a/test-cases/final-dump/failure_backtrack.exp
+++ b/test-cases/final-dump/failure_backtrack.exp
@@ -375,7 +375,7 @@ yup(?#success##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'failure_backtrack'
 
 source_filename = "!ROOT!/final-dump/failure_backtrack.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c", r = \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c", s = \00", align 8
@@ -416,286 +416,286 @@ target triple    ????
 @"string#36" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#17" to i64 ) }, align 8
 @"string#37" = private unnamed_addr constant {i64, i64} { i64 15, i64 ptrtoint( ptr @"cstring#18" to i64 ) }, align 8
 
-declare external fastcc i64 @"wybe.int.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.int#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#failure_backtrack.r" = global i64 undef
 @"resource#failure_backtrack.s" = global i64 undef
 
-define external fastcc void @"failure_backtrack.<0>"() {
+define external fastcc void @"failure_backtrack#.<0>"() {
   %"tmp#139##0" = load i64, ptr @"resource#failure_backtrack.r"
   %"tmp#140##0" = load i64, ptr @"resource#failure_backtrack.s"
   store i64 7, ptr @"resource#failure_backtrack.r"
   store i64 14, ptr @"resource#failure_backtrack.s"
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 42, i64 0, i8 32)
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 7, i64 0, i8 32)
-  %"tmp#3##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#4##0")
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#2##0", i64 %"tmp#3##0")
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#28" to i64 ), i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#0##0")
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 42, i64 0, i8 32)
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 7, i64 0, i8 32)
+  %"tmp#3##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#4##0")
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#2##0", i64 %"tmp#3##0")
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#28" to i64 ), i64 %"tmp#1##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  %"tmp#8##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#4##0")
-  %"tmp#6##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#2##0", i64 %"tmp#8##0")
-  %"tmp#5##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#34" to i64 ), i64 %"tmp#6##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#5##0")
+  %"tmp#8##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#4##0")
+  %"tmp#6##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#2##0", i64 %"tmp#8##0")
+  %"tmp#5##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#34" to i64 ), i64 %"tmp#6##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#5##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"failure_backtrack.#cont#1<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 42, i64 21)
+  tail call fastcc void @"failure_backtrack#.#cont#1<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 42, i64 21)
   ret void
 }
 
-define external fastcc void @"failure_backtrack.#cont#1<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
-  %"tmp#12##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"x##0", i64 0, i8 32)
+define external fastcc void @"failure_backtrack#.#cont#1<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
+  %"tmp#12##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"x##0", i64 0, i8 32)
   %"r##0" = load i64, ptr @"resource#failure_backtrack.r"
-  %"tmp#14##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"r##0", i64 0, i8 32)
-  %"tmp#13##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#14##0")
-  %"tmp#11##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#12##0", i64 %"tmp#13##0")
-  %"tmp#10##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#22" to i64 ), i64 %"tmp#11##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#10##0")
+  %"tmp#14##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"r##0", i64 0, i8 32)
+  %"tmp#13##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#14##0")
+  %"tmp#11##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#12##0", i64 %"tmp#13##0")
+  %"tmp#10##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#22" to i64 ), i64 %"tmp#11##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#10##0")
   call ccc void @putchar(i8 10)
-  %"tmp#18##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#14##0")
-  %"tmp#16##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#12##0", i64 %"tmp#18##0")
-  %"tmp#15##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#31" to i64 ), i64 %"tmp#16##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#15##0")
+  %"tmp#18##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#14##0")
+  %"tmp#16##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#12##0", i64 %"tmp#18##0")
+  %"tmp#15##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#31" to i64 ), i64 %"tmp#16##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#15##0")
   call ccc void @putchar(i8 10)
   store i64 9, ptr @"resource#failure_backtrack.r"
-  %"tmp#184##0" = tail call fastcc {i64, i1} @"failure_backtrack.nope2<0>"()
+  %"tmp#184##0" = tail call fastcc {i64, i1} @"failure_backtrack#.nope2<0>"()
   %"x##1" = extractvalue {i64, i1}%"tmp#184##0", 0
   %"tmp#165##0" = extractvalue {i64, i1}%"tmp#184##0", 1
   br i1 %"tmp#165##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#37" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#37" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"failure_backtrack.#cont#2<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##1", i64 %"y##0")
+  tail call fastcc void @"failure_backtrack#.#cont#2<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##1", i64 %"y##0")
   ret void
 if.else.0:
   store i64 %"r##0", ptr @"resource#failure_backtrack.r"
-  %"tmp#23##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#14##0")
-  %"tmp#21##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#12##0", i64 %"tmp#23##0")
-  %"tmp#20##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#36" to i64 ), i64 %"tmp#21##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#20##0")
+  %"tmp#23##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#14##0")
+  %"tmp#21##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#12##0", i64 %"tmp#23##0")
+  %"tmp#20##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#36" to i64 ), i64 %"tmp#21##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#20##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"failure_backtrack.#cont#2<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0")
+  tail call fastcc void @"failure_backtrack#.#cont#2<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0")
   ret void
 }
 
-define external fastcc void @"failure_backtrack.#cont#2<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
-  %"tmp#27##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"x##0", i64 0, i8 32)
+define external fastcc void @"failure_backtrack#.#cont#2<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
+  %"tmp#27##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"x##0", i64 0, i8 32)
   %"tmp#144##0" = load i64, ptr @"resource#failure_backtrack.r"
-  %"tmp#29##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"tmp#144##0", i64 0, i8 32)
-  %"tmp#28##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#29##0")
-  %"tmp#26##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#27##0", i64 %"tmp#28##0")
-  %"tmp#25##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#25" to i64 ), i64 %"tmp#26##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#25##0")
+  %"tmp#29##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"tmp#144##0", i64 0, i8 32)
+  %"tmp#28##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#29##0")
+  %"tmp#26##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#27##0", i64 %"tmp#28##0")
+  %"tmp#25##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#25" to i64 ), i64 %"tmp#26##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#25##0")
   call ccc void @putchar(i8 10)
-  %"tmp#33##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#29##0")
-  %"tmp#31##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#27##0", i64 %"tmp#33##0")
-  %"tmp#30##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#33" to i64 ), i64 %"tmp#31##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#30##0")
+  %"tmp#33##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#29##0")
+  %"tmp#31##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#27##0", i64 %"tmp#33##0")
+  %"tmp#30##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#33" to i64 ), i64 %"tmp#31##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#30##0")
   call ccc void @putchar(i8 10)
-  %"tmp#183##0" = tail call fastcc {i64, i1} @"failure_backtrack.nope2<0>"()
+  %"tmp#183##0" = tail call fastcc {i64, i1} @"failure_backtrack#.nope2<0>"()
   %"r##3" = extractvalue {i64, i1}%"tmp#183##0", 0
   %"tmp#164##0" = extractvalue {i64, i1}%"tmp#183##0", 1
   br i1 %"tmp#164##0", label %if.then.0, label %if.else.0
 if.then.0:
   store i64 %"r##3", ptr @"resource#failure_backtrack.r"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#37" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#37" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"failure_backtrack.#cont#3<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 25, i64 %"y##0")
+  tail call fastcc void @"failure_backtrack#.#cont#3<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 25, i64 %"y##0")
   ret void
 if.else.0:
-  %"tmp#38##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#29##0")
-  %"tmp#36##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#27##0", i64 %"tmp#38##0")
-  %"tmp#35##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#36" to i64 ), i64 %"tmp#36##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#35##0")
+  %"tmp#38##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#29##0")
+  %"tmp#36##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#27##0", i64 %"tmp#38##0")
+  %"tmp#35##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#36" to i64 ), i64 %"tmp#36##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#35##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"failure_backtrack.#cont#3<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0")
+  tail call fastcc void @"failure_backtrack#.#cont#3<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0")
   ret void
 }
 
-define external fastcc void @"failure_backtrack.#cont#3<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
-  %"tmp#42##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"x##0", i64 0, i8 32)
+define external fastcc void @"failure_backtrack#.#cont#3<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
+  %"tmp#42##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"x##0", i64 0, i8 32)
   %"r##0" = load i64, ptr @"resource#failure_backtrack.r"
-  %"tmp#44##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"r##0", i64 0, i8 32)
-  %"tmp#43##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#44##0")
-  %"tmp#41##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#42##0", i64 %"tmp#43##0")
-  %"tmp#40##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#27" to i64 ), i64 %"tmp#41##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#40##0")
+  %"tmp#44##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"r##0", i64 0, i8 32)
+  %"tmp#43##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#44##0")
+  %"tmp#41##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#42##0", i64 %"tmp#43##0")
+  %"tmp#40##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#27" to i64 ), i64 %"tmp#41##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#40##0")
   call ccc void @putchar(i8 10)
-  %"tmp#50##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"y##0", i64 0, i8 32)
+  %"tmp#50##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"y##0", i64 0, i8 32)
   %"s##0" = load i64, ptr @"resource#failure_backtrack.s"
-  %"tmp#55##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"s##0", i64 0, i8 32)
-  %"tmp#54##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#55##0")
-  %"tmp#52##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#44##0", i64 %"tmp#54##0")
-  %"tmp#51##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#52##0")
-  %"tmp#49##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#50##0", i64 %"tmp#51##0")
-  %"tmp#48##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#49##0")
-  %"tmp#46##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#42##0", i64 %"tmp#48##0")
-  %"tmp#45##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#30" to i64 ), i64 %"tmp#46##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#45##0")
+  %"tmp#55##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"s##0", i64 0, i8 32)
+  %"tmp#54##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#55##0")
+  %"tmp#52##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#44##0", i64 %"tmp#54##0")
+  %"tmp#51##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#52##0")
+  %"tmp#49##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#50##0", i64 %"tmp#51##0")
+  %"tmp#48##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#49##0")
+  %"tmp#46##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#42##0", i64 %"tmp#48##0")
+  %"tmp#45##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#30" to i64 ), i64 %"tmp#46##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#45##0")
   call ccc void @putchar(i8 10)
   store i64 10, ptr @"resource#failure_backtrack.r"
-  %"tmp#162##0" = tail call fastcc i1 @"failure_backtrack.yup<0>"()
+  %"tmp#162##0" = tail call fastcc i1 @"failure_backtrack#.yup<0>"()
   br i1 %"tmp#162##0", label %if.then.0, label %if.else.0
 if.then.0:
   store i64 41, ptr @"resource#failure_backtrack.s"
-  %"tmp#163##0" = tail call fastcc i1 @"failure_backtrack.nope<0>"()
+  %"tmp#163##0" = tail call fastcc i1 @"failure_backtrack#.nope<0>"()
   br i1 %"tmp#163##0", label %if.then.1, label %if.else.1
 if.then.1:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#35" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#35" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"failure_backtrack.#cont#4<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 26, i64 12)
+  tail call fastcc void @"failure_backtrack#.#cont#4<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 26, i64 12)
   ret void
 if.else.1:
   store i64 %"r##0", ptr @"resource#failure_backtrack.r"
   store i64 %"s##0", ptr @"resource#failure_backtrack.s"
-  %"tmp#65##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#55##0")
-  %"tmp#63##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#44##0", i64 %"tmp#65##0")
-  %"tmp#62##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#63##0")
-  %"tmp#60##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#50##0", i64 %"tmp#62##0")
-  %"tmp#59##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#60##0")
-  %"tmp#57##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#42##0", i64 %"tmp#59##0")
-  %"tmp#56##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#34" to i64 ), i64 %"tmp#57##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#56##0")
+  %"tmp#65##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#55##0")
+  %"tmp#63##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#44##0", i64 %"tmp#65##0")
+  %"tmp#62##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#63##0")
+  %"tmp#60##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#50##0", i64 %"tmp#62##0")
+  %"tmp#59##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#60##0")
+  %"tmp#57##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#42##0", i64 %"tmp#59##0")
+  %"tmp#56##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#34" to i64 ), i64 %"tmp#57##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#56##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"failure_backtrack.#cont#4<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0")
+  tail call fastcc void @"failure_backtrack#.#cont#4<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0")
   ret void
 if.else.0:
   store i64 %"r##0", ptr @"resource#failure_backtrack.r"
-  %"tmp#193##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#55##0")
-  %"tmp#194##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#44##0", i64 %"tmp#193##0")
-  %"tmp#195##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#194##0")
-  %"tmp#196##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#50##0", i64 %"tmp#195##0")
-  %"tmp#197##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#196##0")
-  %"tmp#198##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#42##0", i64 %"tmp#197##0")
-  %"tmp#199##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#34" to i64 ), i64 %"tmp#198##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#199##0")
+  %"tmp#193##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#55##0")
+  %"tmp#194##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#44##0", i64 %"tmp#193##0")
+  %"tmp#195##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#194##0")
+  %"tmp#196##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#50##0", i64 %"tmp#195##0")
+  %"tmp#197##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#196##0")
+  %"tmp#198##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#42##0", i64 %"tmp#197##0")
+  %"tmp#199##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#34" to i64 ), i64 %"tmp#198##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#199##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"failure_backtrack.#cont#4<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0")
+  tail call fastcc void @"failure_backtrack#.#cont#4<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0")
   ret void
 }
 
-define external fastcc void @"failure_backtrack.#cont#4<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
-  %"tmp#69##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"x##0", i64 0, i8 32)
-  %"tmp#72##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"y##0", i64 0, i8 32)
+define external fastcc void @"failure_backtrack#.#cont#4<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
+  %"tmp#69##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"x##0", i64 0, i8 32)
+  %"tmp#72##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"y##0", i64 0, i8 32)
   %"tmp#150##0" = load i64, ptr @"resource#failure_backtrack.r"
-  %"tmp#75##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"tmp#150##0", i64 0, i8 32)
+  %"tmp#75##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"tmp#150##0", i64 0, i8 32)
   %"s##0" = load i64, ptr @"resource#failure_backtrack.s"
-  %"tmp#77##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"s##0", i64 0, i8 32)
-  %"tmp#76##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#77##0")
-  %"tmp#74##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#75##0", i64 %"tmp#76##0")
-  %"tmp#73##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#74##0")
-  %"tmp#71##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#72##0", i64 %"tmp#73##0")
-  %"tmp#70##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#71##0")
-  %"tmp#68##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#69##0", i64 %"tmp#70##0")
-  %"tmp#67##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#24" to i64 ), i64 %"tmp#68##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#67##0")
+  %"tmp#77##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"s##0", i64 0, i8 32)
+  %"tmp#76##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#77##0")
+  %"tmp#74##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#75##0", i64 %"tmp#76##0")
+  %"tmp#73##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#74##0")
+  %"tmp#71##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#72##0", i64 %"tmp#73##0")
+  %"tmp#70##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#71##0")
+  %"tmp#68##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#69##0", i64 %"tmp#70##0")
+  %"tmp#67##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#24" to i64 ), i64 %"tmp#68##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#67##0")
   call ccc void @putchar(i8 10)
-  %"tmp#87##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#77##0")
-  %"tmp#85##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#75##0", i64 %"tmp#87##0")
-  %"tmp#84##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#85##0")
-  %"tmp#82##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#72##0", i64 %"tmp#84##0")
-  %"tmp#81##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#82##0")
-  %"tmp#79##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#69##0", i64 %"tmp#81##0")
-  %"tmp#78##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#29" to i64 ), i64 %"tmp#79##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#78##0")
+  %"tmp#87##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#77##0")
+  %"tmp#85##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#75##0", i64 %"tmp#87##0")
+  %"tmp#84##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#85##0")
+  %"tmp#82##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#72##0", i64 %"tmp#84##0")
+  %"tmp#81##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#82##0")
+  %"tmp#79##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#69##0", i64 %"tmp#81##0")
+  %"tmp#78##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#29" to i64 ), i64 %"tmp#79##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#78##0")
   call ccc void @putchar(i8 10)
   store i64 11, ptr @"resource#failure_backtrack.r"
   store i64 40, ptr @"resource#failure_backtrack.s"
-  %"tmp#161##0" = tail call fastcc i1 @"failure_backtrack.nope<0>"()
+  %"tmp#161##0" = tail call fastcc i1 @"failure_backtrack#.nope<0>"()
   br i1 %"tmp#161##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"failure_backtrack.#cont#5<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 27, i64 13)
+  tail call fastcc void @"failure_backtrack#.#cont#5<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 27, i64 13)
   ret void
 if.else.0:
   store i64 %"s##0", ptr @"resource#failure_backtrack.s"
   store i64 12, ptr @"resource#failure_backtrack.r"
-  tail call fastcc void @"failure_backtrack.#cont#5<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 28, i64 %"y##0")
+  tail call fastcc void @"failure_backtrack#.#cont#5<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 28, i64 %"y##0")
   ret void
 }
 
-define external fastcc void @"failure_backtrack.#cont#5<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
-  %"tmp#91##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"x##0", i64 0, i8 32)
-  %"tmp#94##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"y##0", i64 0, i8 32)
+define external fastcc void @"failure_backtrack#.#cont#5<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
+  %"tmp#91##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"x##0", i64 0, i8 32)
+  %"tmp#94##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"y##0", i64 0, i8 32)
   %"r##0" = load i64, ptr @"resource#failure_backtrack.r"
-  %"tmp#97##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"r##0", i64 0, i8 32)
+  %"tmp#97##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"r##0", i64 0, i8 32)
   %"s##0" = load i64, ptr @"resource#failure_backtrack.s"
-  %"tmp#99##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"s##0", i64 0, i8 32)
-  %"tmp#98##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#99##0")
-  %"tmp#96##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#97##0", i64 %"tmp#98##0")
-  %"tmp#95##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#96##0")
-  %"tmp#93##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#94##0", i64 %"tmp#95##0")
-  %"tmp#92##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#93##0")
-  %"tmp#90##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#91##0", i64 %"tmp#92##0")
-  %"tmp#89##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#23" to i64 ), i64 %"tmp#90##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#89##0")
+  %"tmp#99##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"s##0", i64 0, i8 32)
+  %"tmp#98##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#99##0")
+  %"tmp#96##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#97##0", i64 %"tmp#98##0")
+  %"tmp#95##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#96##0")
+  %"tmp#93##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#94##0", i64 %"tmp#95##0")
+  %"tmp#92##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#93##0")
+  %"tmp#90##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#91##0", i64 %"tmp#92##0")
+  %"tmp#89##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#23" to i64 ), i64 %"tmp#90##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#89##0")
   call ccc void @putchar(i8 10)
   store i64 14, ptr @"resource#failure_backtrack.s"
-  %"tmp#102##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 42, i64 0, i8 32)
-  %"tmp#105##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 21, i64 0, i8 32)
-  %"tmp#108##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 7, i64 0, i8 32)
-  %"tmp#110##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 14, i64 0, i8 32)
-  %"tmp#109##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#110##0")
-  %"tmp#107##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#108##0", i64 %"tmp#109##0")
-  %"tmp#106##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#107##0")
-  %"tmp#104##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#105##0", i64 %"tmp#106##0")
-  %"tmp#103##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#104##0")
-  %"tmp#101##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#102##0", i64 %"tmp#103##0")
-  %"tmp#100##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#32" to i64 ), i64 %"tmp#101##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#100##0")
+  %"tmp#102##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 42, i64 0, i8 32)
+  %"tmp#105##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 21, i64 0, i8 32)
+  %"tmp#108##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 7, i64 0, i8 32)
+  %"tmp#110##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 14, i64 0, i8 32)
+  %"tmp#109##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#110##0")
+  %"tmp#107##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#108##0", i64 %"tmp#109##0")
+  %"tmp#106##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#107##0")
+  %"tmp#104##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#105##0", i64 %"tmp#106##0")
+  %"tmp#103##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#104##0")
+  %"tmp#101##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#102##0", i64 %"tmp#103##0")
+  %"tmp#100##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#32" to i64 ), i64 %"tmp#101##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#100##0")
   call ccc void @putchar(i8 10)
   store i64 12, ptr @"resource#failure_backtrack.r"
-  %"tmp#160##0" = tail call fastcc i1 @"failure_backtrack.nope<0>"()
+  %"tmp#160##0" = tail call fastcc i1 @"failure_backtrack#.nope<0>"()
   br i1 %"tmp#160##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"failure_backtrack.#cont#6<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 28, i64 21)
+  tail call fastcc void @"failure_backtrack#.#cont#6<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 28, i64 21)
   ret void
 if.else.0:
   store i64 13, ptr @"resource#failure_backtrack.r"
-  %"tmp#159##0" = tail call fastcc i1 @"failure_backtrack.nope<0>"()
+  %"tmp#159##0" = tail call fastcc i1 @"failure_backtrack#.nope<0>"()
   br i1 %"tmp#159##0", label %if.then.1, label %if.else.1
 if.then.1:
-  tail call fastcc void @"failure_backtrack.#cont#6<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 29, i64 21)
+  tail call fastcc void @"failure_backtrack#.#cont#6<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 29, i64 21)
   ret void
 if.else.1:
   store i64 7, ptr @"resource#failure_backtrack.r"
-  tail call fastcc void @"failure_backtrack.#cont#6<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 42, i64 21)
+  tail call fastcc void @"failure_backtrack#.#cont#6<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 42, i64 21)
   ret void
 }
 
-define external fastcc void @"failure_backtrack.#cont#6<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
-  %"tmp#113##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"x##0", i64 0, i8 32)
-  %"tmp#116##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"y##0", i64 0, i8 32)
+define external fastcc void @"failure_backtrack#.#cont#6<0>"(i64 %"tmp#139##0", i64 %"tmp#140##0", i64 %"x##0", i64 %"y##0") {
+  %"tmp#113##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"x##0", i64 0, i8 32)
+  %"tmp#116##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"y##0", i64 0, i8 32)
   %"r##0" = load i64, ptr @"resource#failure_backtrack.r"
-  %"tmp#119##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"r##0", i64 0, i8 32)
+  %"tmp#119##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"r##0", i64 0, i8 32)
   %"s##0" = load i64, ptr @"resource#failure_backtrack.s"
-  %"tmp#121##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"s##0", i64 0, i8 32)
-  %"tmp#120##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#121##0")
-  %"tmp#118##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#119##0", i64 %"tmp#120##0")
-  %"tmp#117##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#118##0")
-  %"tmp#115##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#116##0", i64 %"tmp#117##0")
-  %"tmp#114##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#115##0")
-  %"tmp#112##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#113##0", i64 %"tmp#114##0")
-  %"tmp#111##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#26" to i64 ), i64 %"tmp#112##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#111##0")
+  %"tmp#121##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"s##0", i64 0, i8 32)
+  %"tmp#120##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#121##0")
+  %"tmp#118##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#119##0", i64 %"tmp#120##0")
+  %"tmp#117##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#19" to i64 ), i64 %"tmp#118##0")
+  %"tmp#115##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#116##0", i64 %"tmp#117##0")
+  %"tmp#114##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#21" to i64 ), i64 %"tmp#115##0")
+  %"tmp#112##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#113##0", i64 %"tmp#114##0")
+  %"tmp#111##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#26" to i64 ), i64 %"tmp#112##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#111##0")
   call ccc void @putchar(i8 10)
   store i64 %"tmp#139##0", ptr @"resource#failure_backtrack.r"
   store i64 %"tmp#140##0", ptr @"resource#failure_backtrack.s"
   ret void
 }
 
-define external fastcc i1 @"failure_backtrack.nope<0>"() {
+define external fastcc i1 @"failure_backtrack#.nope<0>"() {
   ret i1 0
 }
 
-define external fastcc {i64, i1} @"failure_backtrack.nope2<0>"() {
+define external fastcc {i64, i1} @"failure_backtrack#.nope2<0>"() {
   %"tmp#0##0" = insertvalue {i64, i1} undef, i64 2, 0
   %"tmp#1##0" = insertvalue {i64, i1} %"tmp#0##0", i1 0, 1
   ret {i64, i1} %"tmp#1##0"
 }
 
-define external fastcc i1 @"failure_backtrack.yup<0>"() {
+define external fastcc i1 @"failure_backtrack#.yup<0>"() {
   ret i1 1
 }
diff --git a/test-cases/final-dump/failure_in_cond_test.exp b/test-cases/final-dump/failure_in_cond_test.exp
index 03c094a4..3dbca7f4 100644
--- a/test-cases/final-dump/failure_in_cond_test.exp
+++ b/test-cases/final-dump/failure_in_cond_test.exp
@@ -36,18 +36,18 @@ foo(?i##3:wybe.int, ?#success##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'failure_in_cond_test'
 
 source_filename = "!ROOT!/final-dump/failure_in_cond_test.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"failure_in_cond_test.<0>"() {
+define external fastcc void @"failure_in_cond_test#.<0>"() {
   call ccc void @print_int(i64 1)
   ret void
 }
 
-define external fastcc {i64, i1} @"failure_in_cond_test.foo<0>"() {
+define external fastcc {i64, i1} @"failure_in_cond_test#.foo<0>"() {
   %"tmp#0##0" = insertvalue {i64, i1} undef, i64 1, 0
   %"tmp#1##0" = insertvalue {i64, i1} %"tmp#0##0", i1 1, 1
   ret {i64, i1} %"tmp#1##0"
diff --git a/test-cases/final-dump/fn_update.exp b/test-cases/final-dump/fn_update.exp
index 659c8f91..6bc9af85 100644
--- a/test-cases/final-dump/fn_update.exp
+++ b/test-cases/final-dump/fn_update.exp
@@ -35,19 +35,19 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'fn_update'
 
 source_filename = "!ROOT!/final-dump/fn_update.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"p =\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"fn_update.<0>"() {
+define external fastcc void @"fn_update#.<0>"() {
   call ccc void @print_int(i64 2)
   call ccc void @putchar(i8 10)
   %"tmp#17##0" = call ccc ptr @wybe_malloc(i32 16)
@@ -60,8 +60,8 @@ define external fastcc void @"fn_update.<0>"() {
   %"tmp#21##0" = add i64 %"tmp#10##0", 8
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   store i64 20, ptr %"tmp#22##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#10##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#10##0")
   ret void
 }
 
@@ -112,28 +112,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -246,13 +246,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -272,7 +272,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -283,7 +283,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -294,13 +294,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -310,14 +310,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -328,7 +328,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/foreign_def.exp b/test-cases/final-dump/foreign_def.exp
index 9fcf1a07..5ba13897 100644
--- a/test-cases/final-dump/foreign_def.exp
+++ b/test-cases/final-dump/foreign_def.exp
@@ -70,13 +70,13 @@ putchar(c##0:wybe.char)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'foreign_def'
 
 source_filename = "!ROOT!/final-dump/foreign_def.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"foreign_def.<0>"() {
+define external fastcc void @"foreign_def#.<0>"() {
   call ccc void @putchar(i8 87)
   call ccc void @putchar(i8 121)
   call ccc void @putchar(i8 98)
@@ -84,22 +84,22 @@ define external fastcc void @"foreign_def.<0>"() {
   ret void
 }
 
-define external fastcc double @"foreign_def.fmul<0>"(double %"x##0", double %"y##0") {
+define external fastcc double @"foreign_def#.fmul<0>"(double %"x##0", double %"y##0") {
   %"tmp#0##0" = fmul double %"x##0", %"y##0"
   ret double %"tmp#0##0"
 }
 
-define external fastcc double @"foreign_def.fmult<0>"(double %"x##0", double %"y##0") {
+define external fastcc double @"foreign_def#.fmult<0>"(double %"x##0", double %"y##0") {
   %"tmp#0##0" = fmul double %"x##0", %"y##0"
   ret double %"tmp#0##0"
 }
 
-define external fastcc void @"foreign_def.putc<0>"(i8 %"c##0") {
+define external fastcc void @"foreign_def#.putc<0>"(i8 %"c##0") {
   call ccc void @putchar(i8 %"c##0")
   ret void
 }
 
-define external fastcc void @"foreign_def.putchar<0>"(i8 %"c##0") {
+define external fastcc void @"foreign_def#.putchar<0>"(i8 %"c##0") {
   call ccc void @putchar(i8 %"c##0")
   ret void
 }
diff --git a/test-cases/final-dump/foreign_def_unordered.exp b/test-cases/final-dump/foreign_def_unordered.exp
index 02c21968..6a577641 100644
--- a/test-cases/final-dump/foreign_def_unordered.exp
+++ b/test-cases/final-dump/foreign_def_unordered.exp
@@ -225,7 +225,7 @@ repeated(x##0:wybe.int)<{<<foreign_def_unordered.a>>, <<foreign_def_unordered.b>
 ; ModuleID = 'foreign_def_unordered'
 
 source_filename = "!ROOT!/final-dump/foreign_def_unordered.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc i64 @a_in_b_inout(i64, i64)
@@ -250,11 +250,11 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#foreign_def_unordered.a" = global i64 undef
 @"resource#foreign_def_unordered.b" = global i64 undef
 
-define external fastcc void @"foreign_def_unordered.a_in_b_in<0>"() {
+define external fastcc void @"foreign_def_unordered#.a_in_b_in<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.a_in_b_inout<0>"() {
+define external fastcc void @"foreign_def_unordered#.a_in_b_inout<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"b##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"b##1" = call ccc i64 @a_in_b_inout(i64 %"tmp#0##0", i64 %"b##0")
@@ -262,14 +262,14 @@ define external fastcc void @"foreign_def_unordered.a_in_b_inout<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.a_in_b_out<0>"() {
+define external fastcc void @"foreign_def_unordered#.a_in_b_out<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"b##0" = call ccc i64 @a_in_b_out(i64 %"tmp#0##0")
   store i64 %"b##0", ptr @"resource#foreign_def_unordered.b"
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.a_inout_b_in<0>"() {
+define external fastcc void @"foreign_def_unordered#.a_inout_b_in<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"a##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"a##1" = call ccc i64 @a_inout_b_in(i64 %"a##0", i64 %"tmp#0##0")
@@ -277,7 +277,7 @@ define external fastcc void @"foreign_def_unordered.a_inout_b_in<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.a_inout_b_inout<0>"() {
+define external fastcc void @"foreign_def_unordered#.a_inout_b_inout<0>"() {
   %"a##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"b##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"tmp#0##0" = call ccc {i64, i64} @a_inout_b_inout(i64 %"a##0", i64 %"b##0")
@@ -288,7 +288,7 @@ define external fastcc void @"foreign_def_unordered.a_inout_b_inout<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.a_inout_b_out<0>"() {
+define external fastcc void @"foreign_def_unordered#.a_inout_b_out<0>"() {
   %"a##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"tmp#0##0" = call ccc {i64, i64} @a_inout_b_out(i64 %"a##0")
   %"a##1" = extractvalue {i64, i64}%"tmp#0##0", 0
@@ -298,14 +298,14 @@ define external fastcc void @"foreign_def_unordered.a_inout_b_out<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.a_out_b_in<0>"() {
+define external fastcc void @"foreign_def_unordered#.a_out_b_in<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"a##0" = call ccc i64 @a_out_b_in(i64 %"tmp#0##0")
   store i64 %"a##0", ptr @"resource#foreign_def_unordered.a"
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.a_out_b_inout<0>"() {
+define external fastcc void @"foreign_def_unordered#.a_out_b_inout<0>"() {
   %"b##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"tmp#0##0" = call ccc {i64, i64} @a_out_b_inout(i64 %"b##0")
   %"a##0" = extractvalue {i64, i64}%"tmp#0##0", 0
@@ -315,7 +315,7 @@ define external fastcc void @"foreign_def_unordered.a_out_b_inout<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.a_out_b_out<0>"() {
+define external fastcc void @"foreign_def_unordered#.a_out_b_out<0>"() {
   %"tmp#0##0" = call ccc {i64, i64} @a_out_b_out()
   %"a##0" = extractvalue {i64, i64}%"tmp#0##0", 0
   %"b##0" = extractvalue {i64, i64}%"tmp#0##0", 1
@@ -324,11 +324,11 @@ define external fastcc void @"foreign_def_unordered.a_out_b_out<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.b_in_a_in<0>"() {
+define external fastcc void @"foreign_def_unordered#.b_in_a_in<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.b_in_a_inout<0>"() {
+define external fastcc void @"foreign_def_unordered#.b_in_a_inout<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"a##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"a##1" = call ccc i64 @b_in_a_inout(i64 %"tmp#0##0", i64 %"a##0")
@@ -336,14 +336,14 @@ define external fastcc void @"foreign_def_unordered.b_in_a_inout<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.b_in_a_out<0>"() {
+define external fastcc void @"foreign_def_unordered#.b_in_a_out<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"a##0" = call ccc i64 @b_in_a_out(i64 %"tmp#0##0")
   store i64 %"a##0", ptr @"resource#foreign_def_unordered.a"
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.b_inout_a_in<0>"() {
+define external fastcc void @"foreign_def_unordered#.b_inout_a_in<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"b##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"b##1" = call ccc i64 @b_inout_a_in(i64 %"b##0", i64 %"tmp#0##0")
@@ -351,7 +351,7 @@ define external fastcc void @"foreign_def_unordered.b_inout_a_in<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.b_inout_a_inout<0>"() {
+define external fastcc void @"foreign_def_unordered#.b_inout_a_inout<0>"() {
   %"a##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"b##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"tmp#0##0" = call ccc {i64, i64} @b_inout_a_inout(i64 %"b##0", i64 %"a##0")
@@ -362,7 +362,7 @@ define external fastcc void @"foreign_def_unordered.b_inout_a_inout<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.b_inout_a_out<0>"() {
+define external fastcc void @"foreign_def_unordered#.b_inout_a_out<0>"() {
   %"b##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"tmp#0##0" = call ccc {i64, i64} @b_inout_a_out(i64 %"b##0")
   %"b##1" = extractvalue {i64, i64}%"tmp#0##0", 0
@@ -372,14 +372,14 @@ define external fastcc void @"foreign_def_unordered.b_inout_a_out<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.b_out_a_in<0>"() {
+define external fastcc void @"foreign_def_unordered#.b_out_a_in<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"b##0" = call ccc i64 @b_out_a_in(i64 %"tmp#0##0")
   store i64 %"b##0", ptr @"resource#foreign_def_unordered.b"
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.b_out_a_inout<0>"() {
+define external fastcc void @"foreign_def_unordered#.b_out_a_inout<0>"() {
   %"a##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"tmp#0##0" = call ccc {i64, i64} @b_out_a_inout(i64 %"a##0")
   %"b##0" = extractvalue {i64, i64}%"tmp#0##0", 0
@@ -389,7 +389,7 @@ define external fastcc void @"foreign_def_unordered.b_out_a_inout<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.b_out_a_out<0>"() {
+define external fastcc void @"foreign_def_unordered#.b_out_a_out<0>"() {
   %"tmp#0##0" = call ccc {i64, i64} @b_out_a_out()
   %"b##0" = extractvalue {i64, i64}%"tmp#0##0", 0
   %"a##0" = extractvalue {i64, i64}%"tmp#0##0", 1
@@ -398,14 +398,14 @@ define external fastcc void @"foreign_def_unordered.b_out_a_out<0>"() {
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.out_in<0>"() {
+define external fastcc void @"foreign_def_unordered#.out_in<0>"() {
   %"a##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"a##1" = call ccc i64 @out_in(i64 %"a##0")
   store i64 %"a##1", ptr @"resource#foreign_def_unordered.a"
   ret void
 }
 
-define external fastcc void @"foreign_def_unordered.repeated<0>"(i64 %"x##0") {
+define external fastcc void @"foreign_def_unordered#.repeated<0>"(i64 %"x##0") {
   %"tmp#0##0" = load i64, ptr @"resource#foreign_def_unordered.b"
   %"a##0" = load i64, ptr @"resource#foreign_def_unordered.a"
   %"a##1" = call ccc i64 @repeated(i64 %"x##0", i64 %"a##0", i64 %"tmp#0##0", i64 %"tmp#0##0", i64 %"a##0")
diff --git a/test-cases/final-dump/foreign_test.exp b/test-cases/final-dump/foreign_test.exp
index 50c0d854..b79a4f2e 100644
--- a/test-cases/final-dump/foreign_test.exp
+++ b/test-cases/final-dump/foreign_test.exp
@@ -94,7 +94,7 @@ neq(x##0:wybe.c_string, y##0:wybe.c_string, ?#success##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'foreign_test'
 
 source_filename = "!ROOT!/final-dump/foreign_test.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"lt(1,2)\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"neq(c\22string\22, c\22string\22)\00", align 8
@@ -105,55 +105,55 @@ target triple    ????
 @"string#6" = private unnamed_addr constant {i64, i64} { i64 25, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#7" = private unnamed_addr constant {i64, i64} { i64 25, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc i64 @strcmp(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"foreign_test.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+define external fastcc void @"foreign_test#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"foreign_test.#cont#2<0>"()
+  tail call fastcc void @"foreign_test#.#cont#2<0>"()
   ret void
 }
 
-define external fastcc void @"foreign_test.#cont#1<0>"() {
-  tail call fastcc void @"foreign_test.#cont#2<0>"()
+define external fastcc void @"foreign_test#.#cont#1<0>"() {
+  tail call fastcc void @"foreign_test#.#cont#2<0>"()
   ret void
 }
 
-define external fastcc void @"foreign_test.#cont#2<0>"() {
+define external fastcc void @"foreign_test#.#cont#2<0>"() {
   %"tmp#4##0" = call ccc i64 @strcmp(i64 ptrtoint( ptr @"cstring#3" to i64 ), i64 ptrtoint( ptr @"cstring#3" to i64 ))
   %"tmp#1##0" = icmp ne i64 %"tmp#4##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"foreign_test.#cont#3<0>"()
+  tail call fastcc void @"foreign_test#.#cont#3<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"foreign_test.#cont#3<0>"()
+  tail call fastcc void @"foreign_test#.#cont#3<0>"()
   ret void
 }
 
-define external fastcc void @"foreign_test.#cont#3<0>"() {
+define external fastcc void @"foreign_test#.#cont#3<0>"() {
   %"tmp#3##0" = call ccc i64 @strcmp(i64 ptrtoint( ptr @"cstring#3" to i64 ), i64 ptrtoint( ptr @"cstring#4" to i64 ))
   %"tmp#0##0" = icmp ne i64 %"tmp#3##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc i1 @"foreign_test.lt<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"foreign_test#.lt<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = icmp slt i64 %"x##0", %"y##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"foreign_test.neq<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"foreign_test#.neq<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc i64 @strcmp(i64 %"x##0", i64 %"y##0")
   %"tmp#2##0" = icmp ne i64 %"tmp#0##0", 0
   ret i1 %"tmp#2##0"
diff --git a/test-cases/final-dump/func_factorial.exp b/test-cases/final-dump/func_factorial.exp
index 40666405..b3dbb303 100644
--- a/test-cases/final-dump/func_factorial.exp
+++ b/test-cases/final-dump/func_factorial.exp
@@ -47,28 +47,28 @@ factorial(n##0:wybe.int, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'func_factorial'
 
 source_filename = "!ROOT!/final-dump/func_factorial.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"func_factorial.<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"func_factorial.factorial<0>"(i64 5)
+define external fastcc void @"func_factorial#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"func_factorial#.factorial<0>"(i64 5)
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"func_factorial.factorial<0>"(i64 %"n##0") {
+define external fastcc i64 @"func_factorial#.factorial<0>"(i64 %"n##0") {
   %"tmp#4##0" = icmp sle i64 %"n##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
   ret i64 1
 if.else.0:
   %"tmp#3##0" = sub i64 %"n##0", 1
-  %"tmp#2##0" = tail call fastcc i64 @"func_factorial.factorial<0>"(i64 %"tmp#3##0")
+  %"tmp#2##0" = tail call fastcc i64 @"func_factorial#.factorial<0>"(i64 %"tmp#3##0")
   %"tmp#11##0" = mul i64 %"n##0", %"tmp#2##0"
   ret i64 %"tmp#11##0"
 }
diff --git a/test-cases/final-dump/func_let.exp b/test-cases/final-dump/func_let.exp
index 3b36efc1..e405edc5 100644
--- a/test-cases/final-dump/func_let.exp
+++ b/test-cases/final-dump/func_let.exp
@@ -37,18 +37,18 @@ quad(x##0:wybe.int, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'func_let'
 
 source_filename = "!ROOT!/final-dump/func_let.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"func_let.<0>"() {
+define external fastcc void @"func_let#.<0>"() {
   call ccc void @print_int(i64 40)
   ret void
 }
 
-define external fastcc i64 @"func_let.quad<0>"(i64 %"x##0") {
+define external fastcc i64 @"func_let#.quad<0>"(i64 %"x##0") {
   %"tmp#0##0" = add i64 %"x##0", %"x##0"
   %"tmp#6##0" = add i64 %"tmp#0##0", %"tmp#0##0"
   ret i64 %"tmp#6##0"
diff --git a/test-cases/final-dump/func_quadruple.exp b/test-cases/final-dump/func_quadruple.exp
index 8eb58a11..f9bc7449 100644
--- a/test-cases/final-dump/func_quadruple.exp
+++ b/test-cases/final-dump/func_quadruple.exp
@@ -35,17 +35,17 @@ quadruple(a##0:wybe.int, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'func_quadruple'
 
 source_filename = "!ROOT!/final-dump/func_quadruple.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"func_quadruple.double<0>"(i64 %"a##0") {
+define external fastcc i64 @"func_quadruple#.double<0>"(i64 %"a##0") {
   %"tmp#3##0" = add i64 %"a##0", %"a##0"
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc i64 @"func_quadruple.quadruple<0>"(i64 %"a##0") {
+define external fastcc i64 @"func_quadruple#.quadruple<0>"(i64 %"a##0") {
   %"tmp#1##0" = add i64 %"a##0", %"a##0"
   %"tmp#4##0" = add i64 %"tmp#1##0", %"tmp#1##0"
   ret i64 %"tmp#4##0"
diff --git a/test-cases/final-dump/func_typed.exp b/test-cases/final-dump/func_typed.exp
index f0fd19d5..8f3cc6e9 100644
--- a/test-cases/final-dump/func_typed.exp
+++ b/test-cases/final-dump/func_typed.exp
@@ -25,12 +25,12 @@ plus(a##0:wybe.int, b##0:wybe.int, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'func_typed'
 
 source_filename = "!ROOT!/final-dump/func_typed.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"func_typed.plus<0>"(i64 %"a##0", i64 %"b##0") {
+define external fastcc i64 @"func_typed#.plus<0>"(i64 %"a##0", i64 %"b##0") {
   %"tmp#3##0" = add i64 %"a##0", %"b##0"
   ret i64 %"tmp#3##0"
 }
diff --git a/test-cases/final-dump/func_untyped.exp b/test-cases/final-dump/func_untyped.exp
index 94dac142..76ea1c21 100644
--- a/test-cases/final-dump/func_untyped.exp
+++ b/test-cases/final-dump/func_untyped.exp
@@ -25,12 +25,12 @@ incr(a##0:wybe.int, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'func_untyped'
 
 source_filename = "!ROOT!/final-dump/func_untyped.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"func_untyped.incr<0>"(i64 %"a##0") {
+define external fastcc i64 @"func_untyped#.incr<0>"(i64 %"a##0") {
   %"tmp#3##0" = add i64 %"a##0", 1
   ret i64 %"tmp#3##0"
 }
diff --git a/test-cases/final-dump/func_where.exp b/test-cases/final-dump/func_where.exp
index 04d3ace8..21f99544 100644
--- a/test-cases/final-dump/func_where.exp
+++ b/test-cases/final-dump/func_where.exp
@@ -26,12 +26,12 @@ quad(x##0:wybe.int, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'func_where'
 
 source_filename = "!ROOT!/final-dump/func_where.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"func_where.quad<0>"(i64 %"x##0") {
+define external fastcc i64 @"func_where#.quad<0>"(i64 %"x##0") {
   %"tmp#0##0" = add i64 %"x##0", %"x##0"
   %"tmp#6##0" = add i64 %"tmp#0##0", %"tmp#0##0"
   ret i64 %"tmp#6##0"
diff --git a/test-cases/final-dump/generic_list.exp b/test-cases/final-dump/generic_list.exp
index 8b6c898f..5503234f 100644
--- a/test-cases/final-dump/generic_list.exp
+++ b/test-cases/final-dump/generic_list.exp
@@ -170,13 +170,13 @@ nil(?#result##0:generic_list(T))<{}; {}; {}>:
 ; ModuleID = 'generic_list'
 
 source_filename = "!ROOT!/final-dump/generic_list.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"generic_list.append<0>"(i64 %"x##0", i64 %"y##0", ptr %"tmp#10##0") {
+define external fastcc void @"generic_list#.append<0>"(i64 %"x##0", i64 %"y##0", ptr %"tmp#10##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -192,14 +192,14 @@ if.then.0:
   store i64 %"tmp#8##0", ptr %"tmp#10##0"
   %"tmp#16##0" = add i64 %"tmp#8##0", 8
   %"tmp#17##0" = inttoptr i64 %"tmp#16##0" to ptr
-  musttail call fastcc void @"generic_list.append<0>"(i64 %"t##0", i64 %"y##0", ptr %"tmp#17##0")
+  musttail call fastcc void @"generic_list#.append<0>"(i64 %"t##0", i64 %"y##0", ptr %"tmp#17##0")
   ret void
 if.else.0:
   store i64 %"y##0", ptr %"tmp#10##0"
   ret void
 }
 
-define external fastcc {i64, i1} @"generic_list.car<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"generic_list#.car<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -214,7 +214,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"generic_list.car<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"generic_list#.car<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -233,7 +233,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc {i64, i1} @"generic_list.cdr<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"generic_list#.cdr<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -249,7 +249,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"generic_list.cdr<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"generic_list#.cdr<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -269,7 +269,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"generic_list.cons<0>"(i64 %"car##0", i64 %"cdr##0") {
+define external fastcc i64 @"generic_list#.cons<0>"(i64 %"car##0", i64 %"cdr##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -280,7 +280,7 @@ define external fastcc i64 @"generic_list.cons<0>"(i64 %"car##0", i64 %"cdr##0")
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"generic_list.cons<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"generic_list#.cons<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -300,12 +300,12 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc i64 @"generic_list.length<0>"(i64 %"x##0") {
-  %"tmp#1##0" = tail call fastcc i64 @"generic_list.length1<0>"(i64 %"x##0", i64 0)
+define external fastcc i64 @"generic_list#.length<0>"(i64 %"x##0") {
+  %"tmp#1##0" = tail call fastcc i64 @"generic_list#.length1<0>"(i64 %"x##0", i64 0)
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"generic_list.length1<0>"(i64 %"x##0", i64 %"acc##0") {
+define external fastcc i64 @"generic_list#.length1<0>"(i64 %"x##0", i64 %"acc##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -313,12 +313,12 @@ if.then.0:
   %"tmp#9##0" = inttoptr i64 %"tmp#8##0" to ptr
   %"t##0" = load i64, ptr %"tmp#9##0"
   %"tmp#2##0" = add i64 %"acc##0", 1
-  %"tmp#10##0" = tail call fastcc i64 @"generic_list.length1<0>"(i64 %"t##0", i64 %"tmp#2##0")
+  %"tmp#10##0" = tail call fastcc i64 @"generic_list#.length1<0>"(i64 %"t##0", i64 %"tmp#2##0")
   ret i64 %"tmp#10##0"
 if.else.0:
   ret i64 %"acc##0"
 }
 
-define external fastcc i64 @"generic_list.nil<0>"() {
+define external fastcc i64 @"generic_list#.nil<0>"() {
   ret i64 0
 }
diff --git a/test-cases/final-dump/generic_use.exp b/test-cases/final-dump/generic_use.exp
index 1d619365..b5336df3 100644
--- a/test-cases/final-dump/generic_use.exp
+++ b/test-cases/final-dump/generic_use.exp
@@ -170,13 +170,13 @@ nil(?#result##0:generic_list(T))<{}; {}; {}>:
 ; ModuleID = 'generic_list'
 
 source_filename = "!ROOT!/final-dump/generic_list.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"generic_list.append<0>"(i64 %"x##0", i64 %"y##0", ptr %"tmp#10##0") {
+define external fastcc void @"generic_list#.append<0>"(i64 %"x##0", i64 %"y##0", ptr %"tmp#10##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -192,14 +192,14 @@ if.then.0:
   store i64 %"tmp#8##0", ptr %"tmp#10##0"
   %"tmp#16##0" = add i64 %"tmp#8##0", 8
   %"tmp#17##0" = inttoptr i64 %"tmp#16##0" to ptr
-  musttail call fastcc void @"generic_list.append<0>"(i64 %"t##0", i64 %"y##0", ptr %"tmp#17##0")
+  musttail call fastcc void @"generic_list#.append<0>"(i64 %"t##0", i64 %"y##0", ptr %"tmp#17##0")
   ret void
 if.else.0:
   store i64 %"y##0", ptr %"tmp#10##0"
   ret void
 }
 
-define external fastcc {i64, i1} @"generic_list.car<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"generic_list#.car<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -214,7 +214,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"generic_list.car<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"generic_list#.car<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -233,7 +233,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc {i64, i1} @"generic_list.cdr<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"generic_list#.cdr<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -249,7 +249,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"generic_list.cdr<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"generic_list#.cdr<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -269,7 +269,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"generic_list.cons<0>"(i64 %"car##0", i64 %"cdr##0") {
+define external fastcc i64 @"generic_list#.cons<0>"(i64 %"car##0", i64 %"cdr##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -280,7 +280,7 @@ define external fastcc i64 @"generic_list.cons<0>"(i64 %"car##0", i64 %"cdr##0")
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"generic_list.cons<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"generic_list#.cons<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -300,12 +300,12 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc i64 @"generic_list.length<0>"(i64 %"x##0") {
-  %"tmp#1##0" = tail call fastcc i64 @"generic_list.length1<0>"(i64 %"x##0", i64 0)
+define external fastcc i64 @"generic_list#.length<0>"(i64 %"x##0") {
+  %"tmp#1##0" = tail call fastcc i64 @"generic_list#.length1<0>"(i64 %"x##0", i64 0)
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"generic_list.length1<0>"(i64 %"x##0", i64 %"acc##0") {
+define external fastcc i64 @"generic_list#.length1<0>"(i64 %"x##0", i64 %"acc##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -313,13 +313,13 @@ if.then.0:
   %"tmp#9##0" = inttoptr i64 %"tmp#8##0" to ptr
   %"t##0" = load i64, ptr %"tmp#9##0"
   %"tmp#2##0" = add i64 %"acc##0", 1
-  %"tmp#10##0" = tail call fastcc i64 @"generic_list.length1<0>"(i64 %"t##0", i64 %"tmp#2##0")
+  %"tmp#10##0" = tail call fastcc i64 @"generic_list#.length1<0>"(i64 %"t##0", i64 %"tmp#2##0")
   ret i64 %"tmp#10##0"
 if.else.0:
   ret i64 %"acc##0"
 }
 
-define external fastcc i64 @"generic_list.nil<0>"() {
+define external fastcc i64 @"generic_list#.nil<0>"() {
   ret i64 0
 }
 
@@ -575,39 +575,39 @@ reverse1(lst##0:generic_list(T) <{}; {}; {0}>, suffix##0:generic_list(T) <{}; {}
 ; ModuleID = 'generic_use'
 
 source_filename = "!ROOT!/final-dump/generic_use.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c", \00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"generic_use.<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"generic_use.fromto1<0>"(i64 1, i64 5, i64 0)
-  %"tmp#1##0" = tail call fastcc i64 @"generic_use.fromto1<0>"(i64 6, i64 10, i64 0)
-  tail call fastcc void @"generic_use.print<0>"(i64 %"tmp#0##0")
+define external fastcc void @"generic_use#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"generic_use#.fromto1<0>"(i64 1, i64 5, i64 0)
+  %"tmp#1##0" = tail call fastcc i64 @"generic_use#.fromto1<0>"(i64 6, i64 10, i64 0)
+  tail call fastcc void @"generic_use#.print<0>"(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"generic_use.print<0>"(i64 %"tmp#1##0")
+  tail call fastcc void @"generic_use#.print<0>"(i64 %"tmp#1##0")
   call ccc void @putchar(i8 10)
   %"tmp#24##0" = alloca i8, i64 8, align 8
-  call fastcc void @"generic_use.concat<0>"(i64 %"tmp#0##0", i64 %"tmp#1##0", ptr %"tmp#24##0")
+  call fastcc void @"generic_use#.concat<0>"(i64 %"tmp#0##0", i64 %"tmp#1##0", ptr %"tmp#24##0")
   %"tmp#2##0" = load i64, ptr %"tmp#24##0"
-  call fastcc void @"generic_use.print<0>"(i64 %"tmp#2##0")
+  call fastcc void @"generic_use#.print<0>"(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
-  %"tmp#3##0" = call fastcc i64 @"generic_use.reverse1<0>[410bae77d3]"(i64 %"tmp#0##0", i64 0)
-  call fastcc void @"generic_use.print<0>"(i64 %"tmp#3##0")
+  %"tmp#3##0" = call fastcc i64 @"generic_use#.reverse1<0>[410bae77d3]"(i64 %"tmp#0##0", i64 0)
+  call fastcc void @"generic_use#.print<0>"(i64 %"tmp#3##0")
   call ccc void @putchar(i8 10)
-  %"tmp#4##0" = call fastcc i64 @"generic_use.nrev<0>[410bae77d3]"(i64 %"tmp#1##0")
-  call fastcc void @"generic_use.print<0>"(i64 %"tmp#4##0")
+  %"tmp#4##0" = call fastcc i64 @"generic_use#.nrev<0>[410bae77d3]"(i64 %"tmp#1##0")
+  call fastcc void @"generic_use#.print<0>"(i64 %"tmp#4##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"generic_use.concat<0>"(i64 %"l1##0", i64 %"l2##0", ptr %"tmp#10##0") {
+define external fastcc void @"generic_use#.concat<0>"(i64 %"l1##0", i64 %"l2##0", ptr %"tmp#10##0") {
   %"tmp#5##0" = icmp ne i64 %"l1##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -623,14 +623,14 @@ if.then.0:
   store i64 %"tmp#8##0", ptr %"tmp#10##0"
   %"tmp#16##0" = add i64 %"tmp#8##0", 8
   %"tmp#17##0" = inttoptr i64 %"tmp#16##0" to ptr
-  musttail call fastcc void @"generic_use.concat<0>"(i64 %"t##0", i64 %"l2##0", ptr %"tmp#17##0")
+  musttail call fastcc void @"generic_use#.concat<0>"(i64 %"t##0", i64 %"l2##0", ptr %"tmp#17##0")
   ret void
 if.else.0:
   store i64 %"l2##0", ptr %"tmp#10##0"
   ret void
 }
 
-define external fastcc void @"generic_use.concat<0>[410bae77d3]"(i64 %"l1##0", i64 %"l2##0", ptr %"tmp#10##0") {
+define external fastcc void @"generic_use#.concat<0>[410bae77d3]"(i64 %"l1##0", i64 %"l2##0", ptr %"tmp#10##0") {
   %"tmp#5##0" = icmp ne i64 %"l1##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -640,19 +640,19 @@ if.then.0:
   store i64 %"l1##0", ptr %"tmp#10##0"
   %"tmp#13##0" = add i64 %"l1##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
-  musttail call fastcc void @"generic_use.concat<0>[410bae77d3]"(i64 %"t##0", i64 %"l2##0", ptr %"tmp#14##0")
+  musttail call fastcc void @"generic_use#.concat<0>[410bae77d3]"(i64 %"t##0", i64 %"l2##0", ptr %"tmp#14##0")
   ret void
 if.else.0:
   store i64 %"l2##0", ptr %"tmp#10##0"
   ret void
 }
 
-define external fastcc i64 @"generic_use.fromto<0>"(i64 %"lo##0", i64 %"hi##0") {
-  %"tmp#2##0" = tail call fastcc i64 @"generic_use.fromto1<0>"(i64 %"lo##0", i64 %"hi##0", i64 0)
+define external fastcc i64 @"generic_use#.fromto<0>"(i64 %"lo##0", i64 %"hi##0") {
+  %"tmp#2##0" = tail call fastcc i64 @"generic_use#.fromto1<0>"(i64 %"lo##0", i64 %"hi##0", i64 0)
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"generic_use.fromto1<0>"(i64 %"lo##0", i64 %"hi##0", i64 %"sofar##0") {
+define external fastcc i64 @"generic_use#.fromto1<0>"(i64 %"lo##0", i64 %"hi##0", i64 %"sofar##0") {
   %"tmp#4##0" = icmp sge i64 %"hi##0", %"lo##0"
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -664,18 +664,18 @@ if.then.0:
   %"tmp#15##0" = add i64 %"tmp#11##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 %"sofar##0", ptr %"tmp#16##0"
-  %"tmp#17##0" = tail call fastcc i64 @"generic_use.fromto1<0>"(i64 %"lo##0", i64 %"tmp#2##0", i64 %"tmp#11##0")
+  %"tmp#17##0" = tail call fastcc i64 @"generic_use#.fromto1<0>"(i64 %"lo##0", i64 %"tmp#2##0", i64 %"tmp#11##0")
   ret i64 %"tmp#17##0"
 if.else.0:
   ret i64 %"sofar##0"
 }
 
-define external fastcc i64 @"generic_use.iota<0>"(i64 %"n##0") {
-  %"tmp#3##0" = tail call fastcc i64 @"generic_use.fromto1<0>"(i64 1, i64 %"n##0", i64 0)
+define external fastcc i64 @"generic_use#.iota<0>"(i64 %"n##0") {
+  %"tmp#3##0" = tail call fastcc i64 @"generic_use#.fromto1<0>"(i64 1, i64 %"n##0", i64 0)
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc i64 @"generic_use.nrev<0>"(i64 %"lst##0") {
+define external fastcc i64 @"generic_use#.nrev<0>"(i64 %"lst##0") {
   %"tmp#8##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -684,7 +684,7 @@ if.then.0:
   %"tmp#14##0" = add i64 %"lst##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   %"t##0" = load i64, ptr %"tmp#15##0"
-  %"tmp#2##0" = tail call fastcc i64 @"generic_use.nrev<0>"(i64 %"t##0")
+  %"tmp#2##0" = tail call fastcc i64 @"generic_use#.nrev<0>"(i64 %"t##0")
   %"tmp#16##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#11##0" = ptrtoint ptr %"tmp#16##0" to i64
   %"tmp#17##0" = inttoptr i64 %"tmp#11##0" to ptr
@@ -693,33 +693,33 @@ if.then.0:
   %"tmp#19##0" = inttoptr i64 %"tmp#18##0" to ptr
   store i64 0, ptr %"tmp#19##0"
   %"tmp#20##0" = alloca i8, i64 8, align 8
-  call fastcc void @"generic_use.concat<0>[410bae77d3]"(i64 %"tmp#2##0", i64 %"tmp#11##0", ptr %"tmp#20##0")
+  call fastcc void @"generic_use#.concat<0>[410bae77d3]"(i64 %"tmp#2##0", i64 %"tmp#11##0", ptr %"tmp#20##0")
   %"tmp#21##0" = load i64, ptr %"tmp#20##0"
   ret i64 %"tmp#21##0"
 if.else.0:
   ret i64 0
 }
 
-define external fastcc i64 @"generic_use.nrev<0>[410bae77d3]"(i64 %"lst##0") {
+define external fastcc i64 @"generic_use#.nrev<0>[410bae77d3]"(i64 %"lst##0") {
   %"tmp#8##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#13##0" = add i64 %"lst##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   %"t##0" = load i64, ptr %"tmp#14##0"
-  %"tmp#2##0" = tail call fastcc i64 @"generic_use.nrev<0>[410bae77d3]"(i64 %"t##0")
+  %"tmp#2##0" = tail call fastcc i64 @"generic_use#.nrev<0>[410bae77d3]"(i64 %"t##0")
   %"tmp#15##0" = add i64 %"lst##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 0, ptr %"tmp#16##0"
   %"tmp#17##0" = alloca i8, i64 8, align 8
-  call fastcc void @"generic_use.concat<0>[410bae77d3]"(i64 %"tmp#2##0", i64 %"lst##0", ptr %"tmp#17##0")
+  call fastcc void @"generic_use#.concat<0>[410bae77d3]"(i64 %"tmp#2##0", i64 %"lst##0", ptr %"tmp#17##0")
   %"tmp#18##0" = load i64, ptr %"tmp#17##0"
   ret i64 %"tmp#18##0"
 if.else.0:
   ret i64 0
 }
 
-define external fastcc void @"generic_use.print<0>"(i64 %"lst##0") {
+define external fastcc void @"generic_use#.print<0>"(i64 %"lst##0") {
   call ccc void @putchar(i8 91)
   %"tmp#5##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
@@ -730,7 +730,7 @@ if.then.0:
   %"tmp#17##0" = inttoptr i64 %"tmp#16##0" to ptr
   %"t##0" = load i64, ptr %"tmp#17##0"
   call ccc void @print_int(i64 %"h##0")
-  tail call fastcc void @"generic_use.print_tail<0>"(i64 %"t##0")
+  tail call fastcc void @"generic_use#.print_tail<0>"(i64 %"t##0")
   call ccc void @putchar(i8 93)
   ret void
 if.else.0:
@@ -738,7 +738,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"generic_use.print_tail<0>"(i64 %"lst##0") {
+define external fastcc void @"generic_use#.print_tail<0>"(i64 %"lst##0") {
   %"tmp#2##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -747,26 +747,26 @@ if.then.0:
   %"tmp#7##0" = add i64 %"lst##0", 8
   %"tmp#8##0" = inttoptr i64 %"tmp#7##0" to ptr
   %"t##0" = load i64, ptr %"tmp#8##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @print_int(i64 %"h##0")
-  tail call fastcc void @"generic_use.print_tail<0>"(i64 %"t##0")
+  tail call fastcc void @"generic_use#.print_tail<0>"(i64 %"t##0")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"generic_use.println<0>"(i64 %"lst##0") {
-  tail call fastcc void @"generic_use.print<0>"(i64 %"lst##0")
+define external fastcc void @"generic_use#.println<0>"(i64 %"lst##0") {
+  tail call fastcc void @"generic_use#.print<0>"(i64 %"lst##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"generic_use.reverse<0>"(i64 %"lst##0") {
-  %"tmp#2##0" = tail call fastcc i64 @"generic_use.reverse1<0>"(i64 %"lst##0", i64 0)
+define external fastcc i64 @"generic_use#.reverse<0>"(i64 %"lst##0") {
+  %"tmp#2##0" = tail call fastcc i64 @"generic_use#.reverse1<0>"(i64 %"lst##0", i64 0)
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"generic_use.reverse1<0>"(i64 %"lst##0", i64 %"suffix##0") {
+define external fastcc i64 @"generic_use#.reverse1<0>"(i64 %"lst##0", i64 %"suffix##0") {
   %"tmp#5##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -782,13 +782,13 @@ if.then.0:
   %"tmp#15##0" = add i64 %"tmp#8##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 %"suffix##0", ptr %"tmp#16##0"
-  %"tmp#17##0" = tail call fastcc i64 @"generic_use.reverse1<0>"(i64 %"t##0", i64 %"tmp#8##0")
+  %"tmp#17##0" = tail call fastcc i64 @"generic_use#.reverse1<0>"(i64 %"t##0", i64 %"tmp#8##0")
   ret i64 %"tmp#17##0"
 if.else.0:
   ret i64 %"suffix##0"
 }
 
-define external fastcc i64 @"generic_use.reverse1<0>[410bae77d3]"(i64 %"lst##0", i64 %"suffix##0") {
+define external fastcc i64 @"generic_use#.reverse1<0>[410bae77d3]"(i64 %"lst##0", i64 %"suffix##0") {
   %"tmp#5##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -798,7 +798,7 @@ if.then.0:
   %"tmp#12##0" = add i64 %"lst##0", 8
   %"tmp#13##0" = inttoptr i64 %"tmp#12##0" to ptr
   store i64 %"suffix##0", ptr %"tmp#13##0"
-  %"tmp#14##0" = tail call fastcc i64 @"generic_use.reverse1<0>[410bae77d3]"(i64 %"t##0", i64 %"lst##0")
+  %"tmp#14##0" = tail call fastcc i64 @"generic_use#.reverse1<0>[410bae77d3]"(i64 %"t##0", i64 %"lst##0")
   ret i64 %"tmp#14##0"
 if.else.0:
   ret i64 %"suffix##0"
diff --git a/test-cases/final-dump/global_flow_inference.exp b/test-cases/final-dump/global_flow_inference.exp
index 8316b22b..51f664d4 100644
--- a/test-cases/final-dump/global_flow_inference.exp
+++ b/test-cases/final-dump/global_flow_inference.exp
@@ -171,14 +171,14 @@ still_only_in(b##0:wybe.bool, ?x##0:wybe.int)<{<<global_flow_inference.res>>}; {
 ; ModuleID = 'global_flow_inference'
 
 source_filename = "!ROOT!/final-dump/global_flow_inference.wybe"
-target triple    ????
+target triple   = ????
 
 @"array#0" = private unnamed_addr constant [ 2 x i64 ] [i64 3, i64 2]
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#global_flow_inference.res" = global i64 undef
 
-define external fastcc void @"global_flow_inference.higher_order_branch<0>"(i1 %"b##0", ptr %"f##0") {
+define external fastcc void @"global_flow_inference#.higher_order_branch<0>"(i1 %"b##0", ptr %"f##0") {
   br i1 %"b##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#0##0" = load ptr, ptr %"f##0"
@@ -188,7 +188,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"global_flow_inference.higher_order_branch_no_use<0>"(i1 %"b##0", ptr %"f##0") {
+define external fastcc void @"global_flow_inference#.higher_order_branch_no_use<0>"(i1 %"b##0", ptr %"f##0") {
   br i1 %"b##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#0##0" = load ptr, ptr %"f##0"
@@ -198,7 +198,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"global_flow_inference.higher_order_branch_use<0>"(i1 %"b##0", ptr %"f##0") {
+define external fastcc void @"global_flow_inference#.higher_order_branch_use<0>"(i1 %"b##0", ptr %"f##0") {
   br i1 %"b##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#0##0" = load ptr, ptr %"f##0"
@@ -209,14 +209,14 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"global_flow_inference.higher_order_in<0>"(ptr %"f##0") {
+define external fastcc void @"global_flow_inference#.higher_order_in<0>"(ptr %"f##0") {
   %"res##0" = load i64, ptr @"resource#global_flow_inference.res"
   %"tmp#0##0" = load ptr, ptr %"f##0"
   tail call fastcc void %"tmp#0##0"(ptr %"f##0", i64 %"res##0")
   ret void
 }
 
-define external fastcc void @"global_flow_inference.higher_order_inout<0>"(ptr %"f##0") {
+define external fastcc void @"global_flow_inference#.higher_order_inout<0>"(ptr %"f##0") {
   %"res##0" = load i64, ptr @"resource#global_flow_inference.res"
   %"tmp#0##0" = load ptr, ptr %"f##0"
   tail call fastcc void %"tmp#0##0"(ptr %"f##0", i64 %"res##0")
@@ -224,35 +224,35 @@ define external fastcc void @"global_flow_inference.higher_order_inout<0>"(ptr %
   ret void
 }
 
-define external fastcc void @"global_flow_inference.higher_order_only_out<0>"(ptr %"f##0") {
+define external fastcc void @"global_flow_inference#.higher_order_only_out<0>"(ptr %"f##0") {
   store i64 1, ptr @"resource#global_flow_inference.res"
   %"tmp#0##0" = load ptr, ptr %"f##0"
   tail call fastcc void %"tmp#0##0"(ptr %"f##0", i64 1)
   ret void
 }
 
-define external fastcc void @"global_flow_inference.higher_order_out<0>"(ptr %"f##0") {
+define external fastcc void @"global_flow_inference#.higher_order_out<0>"(ptr %"f##0") {
   %"tmp#0##0" = load ptr, ptr %"f##0"
   %"res##0" = tail call fastcc i64 %"tmp#0##0"(ptr %"f##0")
   store i64 %"res##0", ptr @"resource#global_flow_inference.res"
   ret void
 }
 
-define external fastcc void @"global_flow_inference.inout<0>"(i1 %"b##0") {
+define external fastcc void @"global_flow_inference#.inout<0>"(i1 %"b##0") {
   br i1 %"b##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"global_flow_inference.only_out<0>"(i1 1)
+  tail call fastcc void @"global_flow_inference#.only_out<0>"(i1 1)
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc i64 @"global_flow_inference.only_in<0>"() {
+define external fastcc i64 @"global_flow_inference#.only_in<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#global_flow_inference.res"
   ret i64 %"tmp#0##0"
 }
 
-define external fastcc void @"global_flow_inference.only_out<0>"(i1 %"b##0") {
+define external fastcc void @"global_flow_inference#.only_out<0>"(i1 %"b##0") {
   %"tmp#3##0" = zext i1 %"b##0" to i64
   %"tmp#2##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#0", i64 0, i64 %"tmp#3##0"
   %"tmp#1##0" = load i64, ptr %"tmp#2##0"
@@ -260,27 +260,27 @@ define external fastcc void @"global_flow_inference.only_out<0>"(i1 %"b##0") {
   ret void
 }
 
-define external fastcc void @"global_flow_inference.rec_out_only1<0>"() {
-  tail call fastcc void @"global_flow_inference.rec_out_only2<0>"()
+define external fastcc void @"global_flow_inference#.rec_out_only1<0>"() {
+  tail call fastcc void @"global_flow_inference#.rec_out_only2<0>"()
   ret void
 }
 
-define external fastcc void @"global_flow_inference.rec_out_only2<0>"() {
-  tail call fastcc void @"global_flow_inference.rec_out_only1<0>"()
+define external fastcc void @"global_flow_inference#.rec_out_only2<0>"() {
+  tail call fastcc void @"global_flow_inference#.rec_out_only1<0>"()
   ret void
 }
 
-define external fastcc void @"global_flow_inference.rec_out_only_notail1<0>"() {
+define external fastcc void @"global_flow_inference#.rec_out_only_notail1<0>"() {
   store i64 1, ptr @"resource#global_flow_inference.res"
   ret void
 }
 
-define external fastcc void @"global_flow_inference.rec_out_only_notail2<0>"() {
+define external fastcc void @"global_flow_inference#.rec_out_only_notail2<0>"() {
   store i64 1, ptr @"resource#global_flow_inference.res"
   ret void
 }
 
-define external fastcc i64 @"global_flow_inference.still_only_in<0>"(i1 %"b##0") {
+define external fastcc i64 @"global_flow_inference#.still_only_in<0>"(i1 %"b##0") {
   br i1 %"b##0", label %if.then.0, label %if.else.0
 if.then.0:
   ret i64 0
diff --git a/test-cases/final-dump/higher_order_anon.exp b/test-cases/final-dump/higher_order_anon.exp
index b0b27208..220fab62 100644
--- a/test-cases/final-dump/higher_order_anon.exp
+++ b/test-cases/final-dump/higher_order_anon.exp
@@ -164,79 +164,79 @@ proc #anon#9 > {inline} (1 calls)
 ; ModuleID = 'higher_order_anon'
 
 source_filename = "!ROOT!/final-dump/higher_order_anon.wybe"
-target triple    ????
+target triple   = ????
 
-@"closure#0" = private unnamed_addr constant {ptr} { ptr @"higher_order_anon.#anon#7#anon#1<1>" }, align 8
+@"closure#0" = private unnamed_addr constant {ptr} { ptr @"higher_order_anon#.#anon#7#anon#1<1>" }, align 8
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"higher_order_anon.<0>"() {
+define external fastcc void @"higher_order_anon#.<0>"() {
   ret void
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#1<0>"(i64 %"anon#1#1##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#1<0>"(i64 %"anon#1#1##0") {
   %"tmp#8##0" = add i64 %"anon#1#1##0", 1
   ret i64 %"tmp#8##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
   %"anon#1#2##0" = add i64 %"generic#anon#1#1##0", 1
   ret i64 %"anon#1#2##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#2<0>"(i64 %"anon#2#1##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#2<0>"(i64 %"anon#2#1##0") {
   %"tmp#8##0" = add i64 %"anon#2#1##0", 1
   ret i64 %"tmp#8##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#2<1>"(ptr %"#env##0", i64 %"generic#anon#2#1##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#2<1>"(ptr %"#env##0", i64 %"generic#anon#2#1##0") {
   %"anon#2#2##0" = add i64 %"generic#anon#2#1##0", 1
   ret i64 %"anon#2#2##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#3<0>"(i64 %"anon#3#2##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#3<0>"(i64 %"anon#3#2##0") {
   ret i64 %"anon#3#2##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#3<1>"(ptr %"#env##0", i64 %"generic#anon#3#1##0", i64 %"generic#anon#3#2##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#3<1>"(ptr %"#env##0", i64 %"generic#anon#3#1##0", i64 %"generic#anon#3#2##0") {
   ret i64 %"generic#anon#3#2##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#4<0>"(i64 %"anon#4#2##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#4<0>"(i64 %"anon#4#2##0") {
   ret i64 %"anon#4#2##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#4<1>"(ptr %"#env##0", i64 %"generic#anon#4#1##0", i64 %"generic#anon#4#2##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#4<1>"(ptr %"#env##0", i64 %"generic#anon#4#1##0", i64 %"generic#anon#4#2##0") {
   ret i64 %"generic#anon#4#2##0"
 }
 
-define external fastcc ptr @"higher_order_anon.#anon#5<0>"(ptr %"anon#5#1##0") {
+define external fastcc ptr @"higher_order_anon#.#anon#5<0>"(ptr %"anon#5#1##0") {
   ret ptr %"anon#5#1##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#5<1>"(ptr %"#env##0", i64 %"generic#anon#5#1##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#5<1>"(ptr %"#env##0", i64 %"generic#anon#5#1##0") {
   %"anon#5#1##0" = inttoptr i64 %"generic#anon#5#1##0" to ptr
   %"tmp#1##0" = ptrtoint ptr %"anon#5#1##0" to i64
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc ptr @"higher_order_anon.#anon#6<0>"(ptr %"anon#6#1##0") {
+define external fastcc ptr @"higher_order_anon#.#anon#6<0>"(ptr %"anon#6#1##0") {
   ret ptr %"anon#6#1##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#6<1>"(ptr %"#env##0", i64 %"generic#anon#6#1##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#6<1>"(ptr %"#env##0", i64 %"generic#anon#6#1##0") {
   %"anon#6#1##0" = inttoptr i64 %"generic#anon#6#1##0" to ptr
   %"tmp#1##0" = ptrtoint ptr %"anon#6#1##0" to i64
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc ptr @"higher_order_anon.#anon#7<0>"(ptr %"id##0") {
+define external fastcc ptr @"higher_order_anon#.#anon#7<0>"(ptr %"id##0") {
   %"tmp#6##0" = load ptr, ptr %"id##0"
   %"tmp#7##0" = tail call fastcc ptr %"tmp#6##0"(ptr %"id##0", ptr @"closure#0")
   ret ptr %"tmp#7##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#7<1>"(ptr %"#env##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#7<1>"(ptr %"#env##0") {
   %"tmp#1##0" = getelementptr inbounds {ptr, ptr}, ptr %"#env##0", i64 0, i32 1
   %"id##0" = load ptr, ptr %"tmp#1##0"
   %"tmp#2##0" = load ptr, ptr %"id##0"
@@ -245,22 +245,22 @@ define external fastcc i64 @"higher_order_anon.#anon#7<1>"(ptr %"#env##0") {
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#7#anon#1<0>"(i64 %"anon#8#1##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#7#anon#1<0>"(i64 %"anon#8#1##0") {
   %"tmp#8##0" = add i64 %"anon#8#1##0", 1
   ret i64 %"tmp#8##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#7#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#8#1##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#7#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#8#1##0") {
   %"anon#8#2##0" = add i64 %"generic#anon#8#1##0", 1
   ret i64 %"anon#8#2##0"
 }
 
-define external fastcc double @"higher_order_anon.#anon#8<0>"(double %"anon#9#1##0", double %"anon#9#3##0") {
+define external fastcc double @"higher_order_anon#.#anon#8<0>"(double %"anon#9#1##0", double %"anon#9#3##0") {
   %"tmp#8##0" = fadd double %"anon#9#1##0", %"anon#9#3##0"
   ret double %"tmp#8##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#8<1>"(ptr %"#env##0", i64 %"generic#anon#9#1##0", i64 %"generic#anon#9#2##0", i64 %"generic#anon#9#3##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#8<1>"(ptr %"#env##0", i64 %"generic#anon#9#1##0", i64 %"generic#anon#9#2##0", i64 %"generic#anon#9#3##0") {
   %"anon#9#1##0" = bitcast i64 %"generic#anon#9#1##0" to double
   %"anon#9#3##0" = bitcast i64 %"generic#anon#9#3##0" to double
   %"anon#9#4##0" = fadd double %"anon#9#1##0", %"anon#9#3##0"
@@ -268,12 +268,12 @@ define external fastcc i64 @"higher_order_anon.#anon#8<1>"(ptr %"#env##0", i64 %
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc double @"higher_order_anon.#anon#9<0>"(double %"anon#10#1##0", double %"anon#10#3##0") {
+define external fastcc double @"higher_order_anon#.#anon#9<0>"(double %"anon#10#1##0", double %"anon#10#3##0") {
   %"tmp#8##0" = fadd double %"anon#10#1##0", %"anon#10#3##0"
   ret double %"tmp#8##0"
 }
 
-define external fastcc i64 @"higher_order_anon.#anon#9<1>"(ptr %"#env##0", i64 %"generic#anon#10#1##0", i64 %"generic#anon#10#2##0", i64 %"generic#anon#10#3##0") {
+define external fastcc i64 @"higher_order_anon#.#anon#9<1>"(ptr %"#env##0", i64 %"generic#anon#10#1##0", i64 %"generic#anon#10#2##0", i64 %"generic#anon#10#3##0") {
   %"anon#10#1##0" = bitcast i64 %"generic#anon#10#1##0" to double
   %"anon#10#3##0" = bitcast i64 %"generic#anon#10#3##0" to double
   %"anon#10#4##0" = fadd double %"anon#10#1##0", %"anon#10#3##0"
diff --git a/test-cases/final-dump/higher_order_append.exp b/test-cases/final-dump/higher_order_append.exp
index 19c58e04..49d68a8f 100644
--- a/test-cases/final-dump/higher_order_append.exp
+++ b/test-cases/final-dump/higher_order_append.exp
@@ -118,19 +118,19 @@ print_list_of_ints#closure#1(x##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>};
 ; ModuleID = 'higher_order_append'
 
 source_filename = "!ROOT!/final-dump/higher_order_append.wybe"
-target triple    ????
+target triple   = ????
 
-@"closure#0" = private unnamed_addr constant {ptr} { ptr @"higher_order_append.#closure#1<0>" }, align 8
-@"closure#1" = private unnamed_addr constant {ptr} { ptr @"higher_order_append.print_list_of_ints#closure#1<0>" }, align 8
+@"closure#0" = private unnamed_addr constant {ptr} { ptr @"higher_order_append#.#closure#1<0>" }, align 8
+@"closure#1" = private unnamed_addr constant {ptr} { ptr @"higher_order_append#.print_list_of_ints#closure#1<0>" }, align 8
 
-declare external fastcc void @"wybe.list.map<1>"(ptr, i64, ptr)
-declare external fastcc void @"wybe.list.print<0>"(ptr, i64)
+declare external fastcc void @"wybe#.list#.map<1>"(ptr, i64, ptr)
+declare external fastcc void @"wybe#.list#.print<0>"(ptr, i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"higher_order_append.<0>"() {
+define external fastcc void @"higher_order_append#.<0>"() {
   %"tmp#55##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#17##0" = ptrtoint ptr %"tmp#55##0" to i64
   %"tmp#56##0" = inttoptr i64 %"tmp#17##0" to ptr
@@ -191,40 +191,40 @@ define external fastcc void @"higher_order_append.<0>"() {
   %"tmp#89##0" = getelementptr inbounds {ptr, i64}, ptr null, i64 1
   %"tmp#90##0" = ptrtoint ptr %"tmp#89##0" to i32
   %"tmp#88##0" = call ccc ptr @wybe_malloc(i32 %"tmp#90##0")
-  store ptr @"higher_order_append.#anon#1<1>", ptr %"tmp#88##0"
+  store ptr @"higher_order_append#.#anon#1<1>", ptr %"tmp#88##0"
   %"tmp#91##0" = getelementptr inbounds {ptr, i64}, ptr %"tmp#88##0", i64 0, i32 1
   store i64 %"tmp#45##0", ptr %"tmp#91##0"
-  call fastcc void @"wybe.list.map<1>"(ptr %"tmp#88##0", i64 %"tmp#37##0", ptr %"tmp#87##0")
+  call fastcc void @"wybe#.list#.map<1>"(ptr %"tmp#88##0", i64 %"tmp#37##0", ptr %"tmp#87##0")
   %"y##0" = load i64, ptr %"tmp#87##0"
-  call fastcc void @"wybe.list.print<0>"(ptr @"closure#0", i64 %"tmp#37##0")
+  call fastcc void @"wybe#.list#.print<0>"(ptr @"closure#0", i64 %"tmp#37##0")
   call ccc void @putchar(i8 10)
-  call fastcc void @"wybe.list.print<0>"(ptr @"closure#0", i64 %"y##0")
+  call fastcc void @"wybe#.list#.print<0>"(ptr @"closure#0", i64 %"y##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"higher_order_append.#anon#1<0>"(i64 %"cons##0", i64 %"anon#1#1##0") {
+define external fastcc i64 @"higher_order_append#.#anon#1<0>"(i64 %"cons##0", i64 %"anon#1#1##0") {
   %"tmp#15##0" = alloca i8, i64 8, align 8
-  call fastcc void @"higher_order_append.append<0>"(i64 %"anon#1#1##0", i64 %"cons##0", ptr %"tmp#15##0")
+  call fastcc void @"higher_order_append#.append<0>"(i64 %"anon#1#1##0", i64 %"cons##0", ptr %"tmp#15##0")
   %"tmp#16##0" = load i64, ptr %"tmp#15##0"
   ret i64 %"tmp#16##0"
 }
 
-define external fastcc i64 @"higher_order_append.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
+define external fastcc i64 @"higher_order_append#.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
   %"tmp#2##0" = getelementptr inbounds {ptr, i64}, ptr %"#env##0", i64 0, i32 1
   %"cons##0" = load i64, ptr %"tmp#2##0"
   %"tmp#3##0" = alloca i8, i64 8, align 8
-  call fastcc void @"higher_order_append.append<0>"(i64 %"generic#anon#1#1##0", i64 %"cons##0", ptr %"tmp#3##0")
+  call fastcc void @"higher_order_append#.append<0>"(i64 %"generic#anon#1#1##0", i64 %"cons##0", ptr %"tmp#3##0")
   %"anon#1#2##0" = load i64, ptr %"tmp#3##0"
   ret i64 %"anon#1#2##0"
 }
 
-define external fastcc void @"higher_order_append.#closure#1<0>"(ptr %"#env##0", i64 %"generic#l##0") {
-  tail call fastcc void @"wybe.list.print<0>"(ptr @"closure#1", i64 %"generic#l##0")
+define external fastcc void @"higher_order_append#.#closure#1<0>"(ptr %"#env##0", i64 %"generic#l##0") {
+  tail call fastcc void @"wybe#.list#.print<0>"(ptr @"closure#1", i64 %"generic#l##0")
   ret void
 }
 
-define external fastcc void @"higher_order_append.append<0>"(i64 %"front##0", i64 %"back##0", ptr %"tmp#8##0") {
+define external fastcc void @"higher_order_append#.append<0>"(i64 %"front##0", i64 %"back##0", ptr %"tmp#8##0") {
   %"tmp#3##0" = icmp ne i64 %"front##0", 0
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -240,19 +240,19 @@ if.then.0:
   store i64 %"tmp#6##0", ptr %"tmp#8##0"
   %"tmp#14##0" = add i64 %"tmp#6##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
-  musttail call fastcc void @"higher_order_append.append<0>"(i64 %"t##0", i64 %"back##0", ptr %"tmp#15##0")
+  musttail call fastcc void @"higher_order_append#.append<0>"(i64 %"t##0", i64 %"back##0", ptr %"tmp#15##0")
   ret void
 if.else.0:
   store i64 %"back##0", ptr %"tmp#8##0"
   ret void
 }
 
-define external fastcc void @"higher_order_append.print_list_of_ints<0>"(i64 %"l##0") {
-  tail call fastcc void @"wybe.list.print<0>"(ptr @"closure#1", i64 %"l##0")
+define external fastcc void @"higher_order_append#.print_list_of_ints<0>"(i64 %"l##0") {
+  tail call fastcc void @"wybe#.list#.print<0>"(ptr @"closure#1", i64 %"l##0")
   ret void
 }
 
-define external fastcc void @"higher_order_append.print_list_of_ints#closure#1<0>"(ptr %"#env##0", i64 %"generic#x##0") {
+define external fastcc void @"higher_order_append#.print_list_of_ints#closure#1<0>"(ptr %"#env##0", i64 %"generic#x##0") {
   call ccc void @print_int(i64 %"generic#x##0")
   ret void
 }
diff --git a/test-cases/final-dump/higher_order_impure.exp b/test-cases/final-dump/higher_order_impure.exp
index 936454af..536bb800 100644
--- a/test-cases/final-dump/higher_order_impure.exp
+++ b/test-cases/final-dump/higher_order_impure.exp
@@ -51,29 +51,29 @@ measure(func##0:{impure}(), ?seconds_elapsed##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'higher_order_impure'
 
 source_filename = "!ROOT!/final-dump/higher_order_impure.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_float(double)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"higher_order_impure.<0>"() {
-  tail call fastcc void @"higher_order_impure.#anon#1<0>"()
+define external fastcc void @"higher_order_impure#.<0>"() {
+  tail call fastcc void @"higher_order_impure#.#anon#1<0>"()
   call ccc void @print_float(double 3.0)
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"higher_order_impure.#anon#1<0>"() {
+define external fastcc void @"higher_order_impure#.#anon#1<0>"() {
   ret void
 }
 
-define external fastcc void @"higher_order_impure.#anon#1<1>"(ptr %"#env##0") {
+define external fastcc void @"higher_order_impure#.#anon#1<1>"(ptr %"#env##0") {
   ret void
 }
 
-define external fastcc double @"higher_order_impure.measure<0>"(ptr %"func##0") {
+define external fastcc double @"higher_order_impure#.measure<0>"(ptr %"func##0") {
   %"tmp#0##0" = load ptr, ptr %"func##0"
   tail call fastcc void %"tmp#0##0"(ptr %"func##0")
   ret double 3.0
diff --git a/test-cases/final-dump/higher_order_inline.exp b/test-cases/final-dump/higher_order_inline.exp
index a53aa98c..be04b094 100644
--- a/test-cases/final-dump/higher_order_inline.exp
+++ b/test-cases/final-dump/higher_order_inline.exp
@@ -36,19 +36,19 @@ proc #closure#1 > {inline} (1 calls)
 ; ModuleID = 'higher_order_inline'
 
 source_filename = "!ROOT!/final-dump/higher_order_inline.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"higher_order_inline.<0>"() {
+define external fastcc void @"higher_order_inline#.<0>"() {
   call ccc void @print_int(i64 1)
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"higher_order_inline.#closure#1<0>"(ptr %"#env##0", i64 %"generic#a##0") {
+define external fastcc i64 @"higher_order_inline#.#closure#1<0>"(ptr %"#env##0", i64 %"generic#a##0") {
   ret i64 %"generic#a##0"
 }
diff --git a/test-cases/final-dump/higher_order_loop.exp b/test-cases/final-dump/higher_order_loop.exp
index afdc5085..6213ed3c 100644
--- a/test-cases/final-dump/higher_order_loop.exp
+++ b/test-cases/final-dump/higher_order_loop.exp
@@ -69,17 +69,17 @@ proc #cont#1 > {semipure} (2 calls)
 ; ModuleID = 'higher_order_loop'
 
 source_filename = "!ROOT!/final-dump/higher_order_loop.wybe"
-target triple    ????
+target triple   = ????
 
-@"closure#0" = private unnamed_addr constant {ptr} { ptr @"higher_order_loop.#closure#1<0>" }, align 8
-@"closure#1" = private unnamed_addr constant {ptr} { ptr @"higher_order_loop.#closure#2<0>" }, align 8
+@"closure#0" = private unnamed_addr constant {ptr} { ptr @"higher_order_loop#.#closure#1<0>" }, align 8
+@"closure#1" = private unnamed_addr constant {ptr} { ptr @"higher_order_loop#.#closure#2<0>" }, align 8
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"higher_order_loop.<0>"() {
+define external fastcc void @"higher_order_loop#.<0>"() {
   %"tmp#16##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#10##0" = ptrtoint ptr %"tmp#16##0" to i64
   %"tmp#17##0" = inttoptr i64 %"tmp#10##0" to ptr
@@ -94,22 +94,22 @@ define external fastcc void @"higher_order_loop.<0>"() {
   %"tmp#22##0" = add i64 %"tmp#14##0", 8
   %"tmp#23##0" = inttoptr i64 %"tmp#22##0" to ptr
   store i64 %"tmp#10##0", ptr %"tmp#23##0"
-  tail call fastcc void @"higher_order_loop.#cont#1<0>"(i64 %"tmp#14##0")
+  tail call fastcc void @"higher_order_loop#.#cont#1<0>"(i64 %"tmp#14##0")
   ret void
 }
 
-define external fastcc void @"higher_order_loop.#closure#1<0>"(ptr %"#env##0", i64 %"generic#x##0") {
+define external fastcc void @"higher_order_loop#.#closure#1<0>"(ptr %"#env##0", i64 %"generic#x##0") {
   call ccc void @print_int(i64 %"generic#x##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"higher_order_loop.#closure#2<0>"(ptr %"#env##0", i64 %"generic#x##0") {
+define external fastcc void @"higher_order_loop#.#closure#2<0>"(ptr %"#env##0", i64 %"generic#x##0") {
   call ccc void @print_int(i64 %"generic#x##0")
   ret void
 }
 
-define external fastcc void @"higher_order_loop.#cont#1<0>"(i64 %"tmp#5##0") {
+define external fastcc void @"higher_order_loop#.#cont#1<0>"(i64 %"tmp#5##0") {
   %"tmp#9##0" = icmp ne i64 %"tmp#5##0", 0
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -120,7 +120,7 @@ if.then.0:
   %"tmp#5##1" = load i64, ptr %"tmp#12##0"
   %"tmp#13##0" = load ptr, ptr %"f##0"
   tail call fastcc void %"tmp#13##0"(ptr %"f##0", i64 10)
-  tail call fastcc void @"higher_order_loop.#cont#1<0>"(i64 %"tmp#5##1")
+  tail call fastcc void @"higher_order_loop#.#cont#1<0>"(i64 %"tmp#5##1")
   ret void
 if.else.0:
   ret void
diff --git a/test-cases/final-dump/higher_order_phantom.exp b/test-cases/final-dump/higher_order_phantom.exp
index b0435e8e..9161aae6 100644
--- a/test-cases/final-dump/higher_order_phantom.exp
+++ b/test-cases/final-dump/higher_order_phantom.exp
@@ -41,22 +41,22 @@ c(f##0:(wybe.phantom, ?X) <{}; {}; {0}>, x##0:wybe.phantom, ?#result##0:X <{}; {
 ; ModuleID = 'higher_order_phantom'
 
 source_filename = "!ROOT!/final-dump/higher_order_phantom.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"higher_order_phantom.a<0>"(ptr %"f##0") {
+define external fastcc void @"higher_order_phantom#.a<0>"(ptr %"f##0") {
   ret void
 }
 
-define external fastcc void @"higher_order_phantom.b<0>"(ptr %"f##0") {
+define external fastcc void @"higher_order_phantom#.b<0>"(ptr %"f##0") {
   %"tmp#0##0" = load ptr, ptr %"f##0"
   tail call fastcc void %"tmp#0##0"(ptr %"f##0")
   ret void
 }
 
-define external fastcc i64 @"higher_order_phantom.c<0>"(ptr %"f##0") {
+define external fastcc i64 @"higher_order_phantom#.c<0>"(ptr %"f##0") {
   %"tmp#1##0" = load ptr, ptr %"f##0"
   %"tmp#2##0" = tail call fastcc i64 %"tmp#1##0"(ptr %"f##0")
   ret i64 %"tmp#2##0"
diff --git a/test-cases/final-dump/higher_order_refs.exp b/test-cases/final-dump/higher_order_refs.exp
index 4eb04960..c7521a1d 100644
--- a/test-cases/final-dump/higher_order_refs.exp
+++ b/test-cases/final-dump/higher_order_refs.exp
@@ -170,16 +170,16 @@ foo#anon#1(^w##0:wybe.char, ^x##0:wybe.bool, ^y##0:wybe.char, ^z##0:wybe.int, an
 ; ModuleID = 'higher_order_refs'
 
 source_filename = "!ROOT!/final-dump/higher_order_refs.wybe"
-target triple    ????
+target triple   = ????
 
-@"closure#0" = private unnamed_addr constant {ptr} { ptr @"higher_order_refs.#anon#1<1>" }, align 8
-@"closure#1" = private unnamed_addr constant {ptr} { ptr @"higher_order_refs.#anon#2<1>" }, align 8
-@"closure#2" = private unnamed_addr constant {ptr, double} { ptr @"higher_order_refs.#anon#3<1>", double 0.5 }, align 8
-@"closure#3" = private unnamed_addr constant {ptr} { ptr @"higher_order_refs.#closure#1<0>" }, align 8
-@"closure#4" = private unnamed_addr constant {ptr} { ptr @"higher_order_refs.#closure#2<0>" }, align 8
-@"closure#5" = private unnamed_addr constant {ptr} { ptr @"higher_order_refs.#closure#3<0>" }, align 8
+@"closure#0" = private unnamed_addr constant {ptr} { ptr @"higher_order_refs#.#anon#1<1>" }, align 8
+@"closure#1" = private unnamed_addr constant {ptr} { ptr @"higher_order_refs#.#anon#2<1>" }, align 8
+@"closure#2" = private unnamed_addr constant {ptr, double} { ptr @"higher_order_refs#.#anon#3<1>", double 0.5 }, align 8
+@"closure#3" = private unnamed_addr constant {ptr} { ptr @"higher_order_refs#.#closure#1<0>" }, align 8
+@"closure#4" = private unnamed_addr constant {ptr} { ptr @"higher_order_refs#.#closure#2<0>" }, align 8
+@"closure#5" = private unnamed_addr constant {ptr} { ptr @"higher_order_refs#.#closure#3<0>" }, align 8
 
-declare external fastcc void @"logging.logmsg<6>"(i1)
+declare external fastcc void @"logging#.logmsg<6>"(i1)
 declare external ccc void @log_char(i8)
 declare external ccc void @log_int(i64)
 declare external ccc void @print_float(double)
@@ -188,59 +188,59 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"higher_order_refs.<0>"() {
-  %"tmp#35##0" = tail call fastcc i64 @"higher_order_refs.app<0>"(ptr @"closure#0", i64 bitcast( double 1.0 to i64 ))
+define external fastcc void @"higher_order_refs#.<0>"() {
+  %"tmp#35##0" = tail call fastcc i64 @"higher_order_refs#.app<0>"(ptr @"closure#0", i64 bitcast( double 1.0 to i64 ))
   %"tmp#0##0" = bitcast i64 %"tmp#35##0" to double
   call ccc void @print_float(double %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  %"tmp#36##0" = tail call fastcc i64 @"higher_order_refs.app<0>"(ptr @"closure#1", i64 bitcast( double 1.0 to i64 ))
+  %"tmp#36##0" = tail call fastcc i64 @"higher_order_refs#.app<0>"(ptr @"closure#1", i64 bitcast( double 1.0 to i64 ))
   %"tmp#1##0" = bitcast i64 %"tmp#36##0" to double
   call ccc void @print_float(double %"tmp#1##0")
   call ccc void @putchar(i8 10)
-  %"tmp#37##0" = tail call fastcc i64 @"higher_order_refs.app<0>"(ptr @"closure#2", i64 bitcast( double 1.0 to i64 ))
+  %"tmp#37##0" = tail call fastcc i64 @"higher_order_refs#.app<0>"(ptr @"closure#2", i64 bitcast( double 1.0 to i64 ))
   %"tmp#3##0" = bitcast i64 %"tmp#37##0" to double
   call ccc void @print_float(double %"tmp#3##0")
   call ccc void @putchar(i8 10)
-  %"tmp#38##0" = tail call fastcc i64 @"higher_order_refs.app<0>"(ptr @"closure#3", i64 bitcast( double 1.0 to i64 ))
+  %"tmp#38##0" = tail call fastcc i64 @"higher_order_refs#.app<0>"(ptr @"closure#3", i64 bitcast( double 1.0 to i64 ))
   %"tmp#5##0" = bitcast i64 %"tmp#38##0" to double
   call ccc void @print_float(double %"tmp#5##0")
   call ccc void @putchar(i8 10)
-  %"tmp#6##0" = tail call fastcc i64 @"higher_order_refs.app<0>"(ptr @"closure#4", i64 1)
+  %"tmp#6##0" = tail call fastcc i64 @"higher_order_refs#.app<0>"(ptr @"closure#4", i64 1)
   call ccc void @print_int(i64 %"tmp#6##0")
   call ccc void @putchar(i8 10)
-  %"tmp#8##0" = tail call fastcc i64 @"higher_order_refs.app<0>"(ptr @"closure#5", i64 1)
+  %"tmp#8##0" = tail call fastcc i64 @"higher_order_refs#.app<0>"(ptr @"closure#5", i64 1)
   call ccc void @print_int(i64 %"tmp#8##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"higher_order_refs.foo<0>"(i8 97, i1 1, i8 98, i64 3)
+  tail call fastcc void @"higher_order_refs#.foo<0>"(i8 97, i1 1, i8 98, i64 3)
   ret void
 }
 
-define external fastcc double @"higher_order_refs.#anon#1<0>"(double %"anon#1#1##0") {
+define external fastcc double @"higher_order_refs#.#anon#1<0>"(double %"anon#1#1##0") {
   ret double %"anon#1#1##0"
 }
 
-define external fastcc i64 @"higher_order_refs.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
+define external fastcc i64 @"higher_order_refs#.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
   %"anon#1#1##0" = bitcast i64 %"generic#anon#1#1##0" to double
   %"tmp#1##0" = bitcast double %"anon#1#1##0" to i64
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc double @"higher_order_refs.#anon#2<0>"(double %"anon#2#1##0") {
+define external fastcc double @"higher_order_refs#.#anon#2<0>"(double %"anon#2#1##0") {
   ret double %"anon#2#1##0"
 }
 
-define external fastcc i64 @"higher_order_refs.#anon#2<1>"(ptr %"#env##0", i64 %"generic#anon#2#1##0") {
+define external fastcc i64 @"higher_order_refs#.#anon#2<1>"(ptr %"#env##0", i64 %"generic#anon#2#1##0") {
   %"anon#2#1##0" = bitcast i64 %"generic#anon#2#1##0" to double
   %"tmp#1##0" = bitcast double %"anon#2#1##0" to i64
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc double @"higher_order_refs.#anon#3<0>"(double %"y##0", double %"anon#3#1##0") {
+define external fastcc double @"higher_order_refs#.#anon#3<0>"(double %"y##0", double %"anon#3#1##0") {
   %"tmp#13##0" = fsub double %"anon#3#1##0", %"y##0"
   ret double %"tmp#13##0"
 }
 
-define external fastcc i64 @"higher_order_refs.#anon#3<1>"(ptr %"#env##0", i64 %"generic#anon#3#1##0") {
+define external fastcc i64 @"higher_order_refs#.#anon#3<1>"(ptr %"#env##0", i64 %"generic#anon#3#1##0") {
   %"tmp#2##0" = getelementptr inbounds {ptr, double}, ptr %"#env##0", i64 0, i32 1
   %"y##0" = load double, ptr %"tmp#2##0"
   %"anon#3#1##0" = bitcast i64 %"generic#anon#3#1##0" to double
@@ -249,41 +249,41 @@ define external fastcc i64 @"higher_order_refs.#anon#3<1>"(ptr %"#env##0", i64 %
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc i64 @"higher_order_refs.#closure#1<0>"(ptr %"#env##0", i64 %"generic#a##0") {
+define external fastcc i64 @"higher_order_refs#.#closure#1<0>"(ptr %"#env##0", i64 %"generic#a##0") {
   ret i64 %"generic#a##0"
 }
 
-define external fastcc i64 @"higher_order_refs.#closure#2<0>"(ptr %"#env##0", i64 %"generic#i##0") {
+define external fastcc i64 @"higher_order_refs#.#closure#2<0>"(ptr %"#env##0", i64 %"generic#i##0") {
   %"#result##0" = add i64 %"generic#i##0", 1
   ret i64 %"#result##0"
 }
 
-define external fastcc i64 @"higher_order_refs.#closure#3<0>"(ptr %"#env##0", i64 %"generic#y##0") {
+define external fastcc i64 @"higher_order_refs#.#closure#3<0>"(ptr %"#env##0", i64 %"generic#y##0") {
   %"#result##0" = add i64 %"generic#y##0", 10
   ret i64 %"#result##0"
 }
 
-define external fastcc i64 @"higher_order_refs.add_one<0>"(i64 %"i##0") {
+define external fastcc i64 @"higher_order_refs#.add_one<0>"(i64 %"i##0") {
   %"tmp#3##0" = add i64 %"i##0", 1
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc double @"higher_order_refs.add_one<1>"(double %"f##0") {
+define external fastcc double @"higher_order_refs#.add_one<1>"(double %"f##0") {
   %"tmp#3##0" = fadd double %"f##0", 1.0
   ret double %"tmp#3##0"
 }
 
-define external fastcc i64 @"higher_order_refs.app<0>"(ptr %"f##0", i64 %"i##0") {
+define external fastcc i64 @"higher_order_refs#.app<0>"(ptr %"f##0", i64 %"i##0") {
   %"tmp#1##0" = load ptr, ptr %"f##0"
   %"tmp#2##0" = tail call fastcc i64 %"tmp#1##0"(ptr %"f##0", i64 %"i##0")
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc void @"higher_order_refs.foo<0>"(i8 %"w##0", i1 %"x##0", i8 %"y##0", i64 %"z##0") {
+define external fastcc void @"higher_order_refs#.foo<0>"(i8 %"w##0", i1 %"x##0", i8 %"y##0", i64 %"z##0") {
   %"tmp#7##0" = getelementptr inbounds {ptr, i8, i1, i8, i64}, ptr null, i64 1
   %"tmp#8##0" = ptrtoint ptr %"tmp#7##0" to i32
   %"tmp#6##0" = call ccc ptr @wybe_malloc(i32 %"tmp#8##0")
-  store ptr @"higher_order_refs.foo#anon#1<1>", ptr %"tmp#6##0"
+  store ptr @"higher_order_refs#.foo#anon#1<1>", ptr %"tmp#6##0"
   %"tmp#9##0" = getelementptr inbounds {ptr, i8, i1, i8, i64}, ptr %"tmp#6##0", i64 0, i32 1
   store i8 %"w##0", ptr %"tmp#9##0"
   %"tmp#10##0" = getelementptr inbounds {ptr, i8, i1, i8, i64}, ptr %"tmp#6##0", i64 0, i32 2
@@ -292,15 +292,15 @@ define external fastcc void @"higher_order_refs.foo<0>"(i8 %"w##0", i1 %"x##0",
   store i8 %"y##0", ptr %"tmp#11##0"
   %"tmp#12##0" = getelementptr inbounds {ptr, i8, i1, i8, i64}, ptr %"tmp#6##0", i64 0, i32 4
   store i64 %"z##0", ptr %"tmp#12##0"
-  %"tmp#0##0" = tail call fastcc i64 @"higher_order_refs.app<0>"(ptr %"tmp#6##0", i64 100)
+  %"tmp#0##0" = tail call fastcc i64 @"higher_order_refs#.app<0>"(ptr %"tmp#6##0", i64 100)
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"higher_order_refs.foo#anon#1<0>"(i8 %"w##0", i1 %"x##0", i8 %"y##0", i64 %"z##0", i64 %"anon#1#1##0") {
+define external fastcc i64 @"higher_order_refs#.foo#anon#1<0>"(i8 %"w##0", i1 %"x##0", i8 %"y##0", i64 %"z##0", i64 %"anon#1#1##0") {
   call ccc void @log_char(i8 %"w##0")
-  tail call fastcc void @"logging.logmsg<6>"(i1 %"x##0")
+  tail call fastcc void @"logging#.logmsg<6>"(i1 %"x##0")
   call ccc void @log_char(i8 %"y##0")
   call ccc void @log_int(i64 %"z##0")
   call ccc void @log_char(i8 10)
@@ -308,7 +308,7 @@ define external fastcc i64 @"higher_order_refs.foo#anon#1<0>"(i8 %"w##0", i1 %"x
   ret i64 %"tmp#7##0"
 }
 
-define external fastcc i64 @"higher_order_refs.foo#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
+define external fastcc i64 @"higher_order_refs#.foo#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
   %"tmp#5##0" = getelementptr inbounds {ptr, i8, i1, i8, i64}, ptr %"#env##0", i64 0, i32 1
   %"w##0" = load i8, ptr %"tmp#5##0"
   %"tmp#6##0" = getelementptr inbounds {ptr, i8, i1, i8, i64}, ptr %"#env##0", i64 0, i32 2
@@ -318,7 +318,7 @@ define external fastcc i64 @"higher_order_refs.foo#anon#1<1>"(ptr %"#env##0", i6
   %"tmp#8##0" = getelementptr inbounds {ptr, i8, i1, i8, i64}, ptr %"#env##0", i64 0, i32 4
   %"z##0" = load i64, ptr %"tmp#8##0"
   call ccc void @log_char(i8 %"w##0")
-  tail call fastcc void @"logging.logmsg<6>"(i1 %"x##0")
+  tail call fastcc void @"logging#.logmsg<6>"(i1 %"x##0")
   call ccc void @log_char(i8 %"y##0")
   call ccc void @log_int(i64 %"z##0")
   call ccc void @log_char(i8 10)
@@ -403,13 +403,13 @@ lognl()<{}; {}; {}>:
 ; ModuleID = 'logging'
 
 source_filename = "!ROOT!/../wybelibs/logging.o"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"false\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"true\00", align 8
 @"array#2" = private unnamed_addr constant [ 2 x i64 ] [i64 ptrtoint( ptr @"cstring#0" to i64 ), i64 ptrtoint( ptr @"cstring#1" to i64 )]
 
-declare external fastcc i64 @"wybe.string.c_string<0>"(i64)
+declare external fastcc i64 @"wybe#.string#.c_string<0>"(i64)
 declare external ccc void @log_char(i8)
 declare external ccc void @log_count(i64)
 declare external ccc void @log_float(double)
@@ -417,38 +417,38 @@ declare external ccc void @log_int(i64)
 declare external ccc void @log_string(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"logging.logmsg<0>"(i64 %"x##0") {
+define external fastcc void @"logging#.logmsg<0>"(i64 %"x##0") {
   call ccc void @log_int(i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<1>"(i64 %"x##0") {
+define external fastcc void @"logging#.logmsg<1>"(i64 %"x##0") {
   call ccc void @log_count(i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<2>"(double %"x##0") {
+define external fastcc void @"logging#.logmsg<2>"(double %"x##0") {
   call ccc void @log_float(double %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<3>"(i8 %"x##0") {
+define external fastcc void @"logging#.logmsg<3>"(i8 %"x##0") {
   call ccc void @log_char(i8 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<4>"(i64 %"x##0") {
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 %"x##0")
+define external fastcc void @"logging#.logmsg<4>"(i64 %"x##0") {
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 %"x##0")
   call ccc void @log_string(i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<5>"(i64 %"x##0") {
+define external fastcc void @"logging#.logmsg<5>"(i64 %"x##0") {
   call ccc void @log_string(i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<6>"(i1 %"x##0") {
+define external fastcc void @"logging#.logmsg<6>"(i1 %"x##0") {
   %"tmp#6##0" = zext i1 %"x##0" to i64
   %"tmp#5##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#2", i64 0, i64 %"tmp#6##0"
   %"tmp#4##0" = load i64, ptr %"tmp#5##0"
@@ -456,7 +456,7 @@ define external fastcc void @"logging.logmsg<6>"(i1 %"x##0") {
   ret void
 }
 
-define external fastcc void @"logging.lognl<0>"() {
+define external fastcc void @"logging#.lognl<0>"() {
   call ccc void @log_char(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/higher_order_resources.exp b/test-cases/final-dump/higher_order_resources.exp
index ef2f0fd5..75d95901 100644
--- a/test-cases/final-dump/higher_order_resources.exp
+++ b/test-cases/final-dump/higher_order_resources.exp
@@ -171,27 +171,27 @@ take_max(i##0:wybe.int)<{<<higher_order_resources.maximum>>}; {<<higher_order_re
 ; ModuleID = 'higher_order_resources'
 
 source_filename = "!ROOT!/final-dump/higher_order_resources.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"*****\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"> \00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 5, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
-@"closure#4" = private unnamed_addr constant {ptr} { ptr @"higher_order_resources.#anon#1<1>" }, align 8
-@"closure#5" = private unnamed_addr constant {ptr} { ptr @"higher_order_resources.#anon#2<1>" }, align 8
-@"closure#6" = private unnamed_addr constant {ptr} { ptr @"higher_order_resources.#anon#2#closure#1<0>" }, align 8
+@"closure#4" = private unnamed_addr constant {ptr} { ptr @"higher_order_resources#.#anon#1<1>" }, align 8
+@"closure#5" = private unnamed_addr constant {ptr} { ptr @"higher_order_resources#.#anon#2<1>" }, align 8
+@"closure#6" = private unnamed_addr constant {ptr} { ptr @"higher_order_resources#.#anon#2#closure#1<0>" }, align 8
 
-declare external fastcc i64 @"wybe.int.max<0>"(i64, i64)
-declare external fastcc i64 @"wybe.list.length1<0>"(i64, i64)
-declare external fastcc void @"wybe.list.map#cont#1<0>"(ptr, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc i64 @"wybe#.int#.max<0>"(i64, i64)
+declare external fastcc i64 @"wybe#.list#.length1<0>"(i64, i64)
+declare external fastcc void @"wybe#.list#.map#cont#1<0>"(ptr, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#higher_order_resources.maximum" = global i64 undef
 
-define external fastcc void @"higher_order_resources.<0>"() {
+define external fastcc void @"higher_order_resources#.<0>"() {
   %"tmp#124##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#35##0" = ptrtoint ptr %"tmp#124##0" to i64
   %"tmp#125##0" = inttoptr i64 %"tmp#35##0" to ptr
@@ -243,11 +243,11 @@ define external fastcc void @"higher_order_resources.<0>"() {
   store i64 %"tmp#55##0", ptr %"tmp#151##0"
   %"tmp#29##0" = load i64, ptr @"resource#higher_order_resources.maximum"
   store i64 -1000, ptr @"resource#higher_order_resources.maximum"
-  tail call fastcc void @"wybe.list.map#cont#1<0>"(ptr @"closure#4", i64 %"tmp#59##0")
+  tail call fastcc void @"wybe#.list#.map#cont#1<0>"(ptr @"closure#4", i64 %"tmp#59##0")
   %"maximum##1" = load i64, ptr @"resource#higher_order_resources.maximum"
   call ccc void @print_int(i64 %"maximum##1")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @putchar(i8 10)
   %"tmp#152##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#72##0" = ptrtoint ptr %"tmp#152##0" to i64
@@ -334,7 +334,7 @@ define external fastcc void @"higher_order_resources.<0>"() {
   %"tmp#199##0" = inttoptr i64 %"tmp#198##0" to ptr
   store i64 %"tmp#112##0", ptr %"tmp#199##0"
   store i64 -1000, ptr @"resource#higher_order_resources.maximum"
-  tail call fastcc void @"wybe.list.map#cont#1<0>"(ptr @"closure#5", i64 %"tmp#116##0")
+  tail call fastcc void @"wybe#.list#.map#cont#1<0>"(ptr @"closure#5", i64 %"tmp#116##0")
   %"maximum##3" = load i64, ptr @"resource#higher_order_resources.maximum"
   call ccc void @print_int(i64 %"maximum##3")
   call ccc void @putchar(i8 10)
@@ -342,54 +342,54 @@ define external fastcc void @"higher_order_resources.<0>"() {
   ret void
 }
 
-define external fastcc void @"higher_order_resources.#anon#1<0>"(i64 %"anon#1#1##0") {
-  %"tmp#10##0" = tail call fastcc i64 @"wybe.list.length1<0>"(i64 %"anon#1#1##0", i64 0)
-  tail call fastcc void @"higher_order_resources.take_max<0>"(i64 %"tmp#10##0")
+define external fastcc void @"higher_order_resources#.#anon#1<0>"(i64 %"anon#1#1##0") {
+  %"tmp#10##0" = tail call fastcc i64 @"wybe#.list#.length1<0>"(i64 %"anon#1#1##0", i64 0)
+  tail call fastcc void @"higher_order_resources#.take_max<0>"(i64 %"tmp#10##0")
   ret void
 }
 
-define external fastcc void @"higher_order_resources.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.list.length1<0>"(i64 %"generic#anon#1#1##0", i64 0)
-  tail call fastcc void @"higher_order_resources.take_max<0>"(i64 %"tmp#1##0")
+define external fastcc void @"higher_order_resources#.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.list#.length1<0>"(i64 %"generic#anon#1#1##0", i64 0)
+  tail call fastcc void @"higher_order_resources#.take_max<0>"(i64 %"tmp#1##0")
   ret void
 }
 
-define external fastcc void @"higher_order_resources.#anon#2<0>"(i64 %"anon#2#1##0") {
+define external fastcc void @"higher_order_resources#.#anon#2<0>"(i64 %"anon#2#1##0") {
   %"tmp#32##0" = load i64, ptr @"resource#higher_order_resources.maximum"
   store i64 -1000, ptr @"resource#higher_order_resources.maximum"
-  tail call fastcc void @"wybe.list.map#cont#1<0>"(ptr @"closure#6", i64 %"anon#2#1##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.list#.map#cont#1<0>"(ptr @"closure#6", i64 %"anon#2#1##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   %"maximum##2" = load i64, ptr @"resource#higher_order_resources.maximum"
   call ccc void @print_int(i64 %"maximum##2")
   call ccc void @putchar(i8 10)
   store i64 %"tmp#32##0", ptr @"resource#higher_order_resources.maximum"
-  %"tmp#28##0" = tail call fastcc i64 @"wybe.list.length1<0>"(i64 %"anon#2#1##0", i64 0)
-  tail call fastcc void @"higher_order_resources.take_max<0>"(i64 %"tmp#28##0")
+  %"tmp#28##0" = tail call fastcc i64 @"wybe#.list#.length1<0>"(i64 %"anon#2#1##0", i64 0)
+  tail call fastcc void @"higher_order_resources#.take_max<0>"(i64 %"tmp#28##0")
   ret void
 }
 
-define external fastcc void @"higher_order_resources.#anon#2<1>"(ptr %"#env##0", i64 %"generic#anon#2#1##0") {
+define external fastcc void @"higher_order_resources#.#anon#2<1>"(ptr %"#env##0", i64 %"generic#anon#2#1##0") {
   %"tmp#1##0" = load i64, ptr @"resource#higher_order_resources.maximum"
   store i64 -1000, ptr @"resource#higher_order_resources.maximum"
-  tail call fastcc void @"wybe.list.map#cont#1<0>"(ptr @"closure#6", i64 %"generic#anon#2#1##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.list#.map#cont#1<0>"(ptr @"closure#6", i64 %"generic#anon#2#1##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   %"tmp#2##0" = load i64, ptr @"resource#higher_order_resources.maximum"
   call ccc void @print_int(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
   store i64 %"tmp#1##0", ptr @"resource#higher_order_resources.maximum"
-  %"tmp#6##0" = tail call fastcc i64 @"wybe.list.length1<0>"(i64 %"generic#anon#2#1##0", i64 0)
-  tail call fastcc void @"higher_order_resources.take_max<0>"(i64 %"tmp#6##0")
+  %"tmp#6##0" = tail call fastcc i64 @"wybe#.list#.length1<0>"(i64 %"generic#anon#2#1##0", i64 0)
+  tail call fastcc void @"higher_order_resources#.take_max<0>"(i64 %"tmp#6##0")
   ret void
 }
 
-define external fastcc void @"higher_order_resources.#anon#2#closure#1<0>"(ptr %"#env##0", i64 %"generic#i##0") {
-  tail call fastcc void @"higher_order_resources.take_max<0>"(i64 %"generic#i##0")
+define external fastcc void @"higher_order_resources#.#anon#2#closure#1<0>"(ptr %"#env##0", i64 %"generic#i##0") {
+  tail call fastcc void @"higher_order_resources#.take_max<0>"(i64 %"generic#i##0")
   ret void
 }
 
-define external fastcc void @"higher_order_resources.take_max<0>"(i64 %"i##0") {
+define external fastcc void @"higher_order_resources#.take_max<0>"(i64 %"i##0") {
   %"maximum##0" = load i64, ptr @"resource#higher_order_resources.maximum"
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.int.max<0>"(i64 %"i##0", i64 %"maximum##0")
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.int#.max<0>"(i64 %"i##0", i64 %"maximum##0")
   store i64 %"tmp#0##0", ptr @"resource#higher_order_resources.maximum"
   ret void
 }
diff --git a/test-cases/final-dump/higher_order_sort.exp b/test-cases/final-dump/higher_order_sort.exp
index cd932554..8b410cb6 100644
--- a/test-cases/final-dump/higher_order_sort.exp
+++ b/test-cases/final-dump/higher_order_sort.exp
@@ -74,13 +74,13 @@ sort#cont#1(<=##0:(X, X, ?wybe.bool) <{}; {}; {0}>, sorted##0:wybe.list(X) <{};
 ; ModuleID = 'higher_order_sort'
 
 source_filename = "!ROOT!/final-dump/higher_order_sort.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"higher_order_sort.insert<0>"(ptr %"<=##0", i64 %"x##0", i64 %"xs##0", ptr %"tmp#25##0") {
+define external fastcc void @"higher_order_sort#.insert<0>"(ptr %"<=##0", i64 %"x##0", i64 %"xs##0", ptr %"tmp#25##0") {
   %"tmp#7##0" = icmp ne i64 %"xs##0", 0
   br i1 %"tmp#7##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -110,7 +110,7 @@ if.else.1:
   store i64 %"tmp#17##0", ptr %"tmp#25##0"
   %"tmp#36##0" = add i64 %"tmp#17##0", 8
   %"tmp#37##0" = inttoptr i64 %"tmp#36##0" to ptr
-  musttail call fastcc void @"higher_order_sort.insert<0>"(ptr %"<=##0", i64 %"x##0", i64 %"rest##0", ptr %"tmp#37##0")
+  musttail call fastcc void @"higher_order_sort#.insert<0>"(ptr %"<=##0", i64 %"x##0", i64 %"rest##0", ptr %"tmp#37##0")
   ret void
 if.else.0:
   %"tmp#38##0" = call ccc ptr @wybe_malloc(i32 16)
@@ -124,12 +124,12 @@ if.else.0:
   ret void
 }
 
-define external fastcc i64 @"higher_order_sort.sort<0>"(ptr %"<=##0", i64 %"xs##0") {
-  %"tmp#5##0" = tail call fastcc i64 @"higher_order_sort.sort#cont#1<0>"(ptr %"<=##0", i64 0, i64 %"xs##0")
+define external fastcc i64 @"higher_order_sort#.sort<0>"(ptr %"<=##0", i64 %"xs##0") {
+  %"tmp#5##0" = tail call fastcc i64 @"higher_order_sort#.sort#cont#1<0>"(ptr %"<=##0", i64 0, i64 %"xs##0")
   ret i64 %"tmp#5##0"
 }
 
-define external fastcc i64 @"higher_order_sort.sort#cont#1<0>"(ptr %"<=##0", i64 %"sorted##0", i64 %"tmp#1##0") {
+define external fastcc i64 @"higher_order_sort#.sort#cont#1<0>"(ptr %"<=##0", i64 %"sorted##0", i64 %"tmp#1##0") {
   %"tmp#5##0" = icmp ne i64 %"tmp#1##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -139,9 +139,9 @@ if.then.0:
   %"tmp#9##0" = inttoptr i64 %"tmp#8##0" to ptr
   %"tmp#1##1" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = alloca i8, i64 8, align 8
-  call fastcc void @"higher_order_sort.insert<0>"(ptr %"<=##0", i64 %"x##0", i64 %"sorted##0", ptr %"tmp#10##0")
+  call fastcc void @"higher_order_sort#.insert<0>"(ptr %"<=##0", i64 %"x##0", i64 %"sorted##0", ptr %"tmp#10##0")
   %"sorted##1" = load i64, ptr %"tmp#10##0"
-  %"tmp#11##0" = call fastcc i64 @"higher_order_sort.sort#cont#1<0>"(ptr %"<=##0", i64 %"sorted##1", i64 %"tmp#1##1")
+  %"tmp#11##0" = call fastcc i64 @"higher_order_sort#.sort#cont#1<0>"(ptr %"<=##0", i64 %"sorted##1", i64 %"tmp#1##1")
   ret i64 %"tmp#11##0"
 if.else.0:
   ret i64 %"sorted##0"
diff --git a/test-cases/final-dump/higher_order_tests.exp b/test-cases/final-dump/higher_order_tests.exp
index 789d25eb..e97453ef 100644
--- a/test-cases/final-dump/higher_order_tests.exp
+++ b/test-cases/final-dump/higher_order_tests.exp
@@ -219,7 +219,7 @@ do_test2(f##0:(I, ?wybe.bool) <{}; {}; {0}>, i##0:I <{}; {}; {1}>, ?#success##0:
 ; ModuleID = 'higher_order_tests'
 
 source_filename = "!ROOT!/final-dump/higher_order_tests.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"*1\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"*2\00", align 8
@@ -227,151 +227,151 @@ target triple    ????
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 6, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
-@"closure#6" = private unnamed_addr constant {ptr} { ptr @"higher_order_tests.#anon#1<1>" }, align 8
-@"closure#7" = private unnamed_addr constant {ptr} { ptr @"higher_order_tests.#anon#2<1>" }, align 8
+@"closure#6" = private unnamed_addr constant {ptr} { ptr @"higher_order_tests#.#anon#1<1>" }, align 8
+@"closure#7" = private unnamed_addr constant {ptr} { ptr @"higher_order_tests#.#anon#2<1>" }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"higher_order_tests.<0>"() {
-  %"tmp#8##0" = tail call fastcc i1 @"higher_order_tests.#anon#1<0>"()
+define external fastcc void @"higher_order_tests#.<0>"() {
+  %"tmp#8##0" = tail call fastcc i1 @"higher_order_tests#.#anon#1<0>"()
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"higher_order_tests.#cont#1<0>"(ptr @"closure#6")
+  tail call fastcc void @"higher_order_tests#.#cont#1<0>"(ptr @"closure#6")
   ret void
 if.else.0:
-  tail call fastcc void @"higher_order_tests.#cont#1<0>"(ptr @"closure#6")
+  tail call fastcc void @"higher_order_tests#.#cont#1<0>"(ptr @"closure#6")
   ret void
 }
 
-define external fastcc i1 @"higher_order_tests.#anon#1<0>"() {
+define external fastcc i1 @"higher_order_tests#.#anon#1<0>"() {
   ret i1 1
 }
 
-define external fastcc i64 @"higher_order_tests.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
+define external fastcc i64 @"higher_order_tests#.#anon#1<1>"(ptr %"#env##0", i64 %"generic#anon#1#1##0") {
   %"tmp#1##0" = zext i1 1 to i64
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i1 @"higher_order_tests.#anon#2<0>"(i64 %"anon#2#1##0") {
+define external fastcc i1 @"higher_order_tests#.#anon#2<0>"(i64 %"anon#2#1##0") {
   %"tmp#4##0" = icmp eq i64 %"anon#2#1##0", 1
   ret i1 %"tmp#4##0"
 }
 
-define external fastcc i64 @"higher_order_tests.#anon#2<1>"(ptr %"#env##0", i64 %"generic#anon#2#1##0") {
+define external fastcc i64 @"higher_order_tests#.#anon#2<1>"(ptr %"#env##0", i64 %"generic#anon#2#1##0") {
   %"#success##0" = icmp eq i64 %"generic#anon#2#1##0", 1
   %"tmp#1##0" = zext i1 %"#success##0" to i64
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc void @"higher_order_tests.#cont#1<0>"(ptr %"t##0") {
+define external fastcc void @"higher_order_tests#.#cont#1<0>"(ptr %"t##0") {
   %"tmp#18##0" = load ptr, ptr %"t##0"
   %"tmp#7##0" = tail call fastcc i1 %"tmp#18##0"(ptr %"t##0", i64 1)
   br i1 %"tmp#7##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1223)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1223)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"higher_order_tests.#cont#2<0>"(ptr %"t##0")
+  tail call fastcc void @"higher_order_tests#.#cont#2<0>"(ptr %"t##0")
   ret void
 if.else.0:
-  tail call fastcc void @"higher_order_tests.#cont#2<0>"(ptr %"t##0")
+  tail call fastcc void @"higher_order_tests#.#cont#2<0>"(ptr %"t##0")
   ret void
 }
 
-define external fastcc void @"higher_order_tests.#cont#2<0>"(ptr %"t##0") {
+define external fastcc void @"higher_order_tests#.#cont#2<0>"(ptr %"t##0") {
   %"tmp#12##0" = load ptr, ptr %"t##0"
   %"tmp#6##0" = tail call fastcc i1 %"tmp#12##0"(ptr %"t##0", i64 2)
   br i1 %"tmp#6##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"higher_order_tests.#cont#3<0>"(ptr %"t##0")
+  tail call fastcc void @"higher_order_tests#.#cont#3<0>"(ptr %"t##0")
   ret void
 if.else.0:
-  tail call fastcc void @"higher_order_tests.#cont#3<0>"(ptr %"t##0")
+  tail call fastcc void @"higher_order_tests#.#cont#3<0>"(ptr %"t##0")
   ret void
 }
 
-define external fastcc void @"higher_order_tests.#cont#3<0>"(ptr %"t##0") {
+define external fastcc void @"higher_order_tests#.#cont#3<0>"(ptr %"t##0") {
   %"tmp#16##0" = load ptr, ptr %"t##0"
   %"tmp#5##0" = tail call fastcc i1 %"tmp#16##0"(ptr %"t##0", i64 2)
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1227)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1227)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"higher_order_tests.#cont#4<0>"()
+  tail call fastcc void @"higher_order_tests#.#cont#4<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"higher_order_tests.#cont#4<0>"()
+  tail call fastcc void @"higher_order_tests#.#cont#4<0>"()
   ret void
 }
 
-define external fastcc void @"higher_order_tests.#cont#4<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+define external fastcc void @"higher_order_tests#.#cont#4<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#4##0" = tail call fastcc i1 @"higher_order_tests.#anon#2<0>"(i64 1)
+  %"tmp#4##0" = tail call fastcc i1 @"higher_order_tests#.#anon#2<0>"(i64 1)
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"higher_order_tests.#cont#5<0>"(ptr @"closure#7")
+  tail call fastcc void @"higher_order_tests#.#cont#5<0>"(ptr @"closure#7")
   ret void
 if.else.0:
-  tail call fastcc void @"higher_order_tests.#cont#5<0>"(ptr @"closure#7")
+  tail call fastcc void @"higher_order_tests#.#cont#5<0>"(ptr @"closure#7")
   ret void
 }
 
-define external fastcc void @"higher_order_tests.#cont#5<0>"(ptr %"t##0") {
+define external fastcc void @"higher_order_tests#.#cont#5<0>"(ptr %"t##0") {
   %"tmp#14##0" = load ptr, ptr %"t##0"
   %"tmp#3##0" = tail call fastcc i1 %"tmp#14##0"(ptr %"t##0", i64 1)
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1223)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1223)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"higher_order_tests.#cont#6<0>"(ptr %"t##0")
+  tail call fastcc void @"higher_order_tests#.#cont#6<0>"(ptr %"t##0")
   ret void
 if.else.0:
-  tail call fastcc void @"higher_order_tests.#cont#6<0>"(ptr %"t##0")
+  tail call fastcc void @"higher_order_tests#.#cont#6<0>"(ptr %"t##0")
   ret void
 }
 
-define external fastcc void @"higher_order_tests.#cont#6<0>"(ptr %"t##0") {
+define external fastcc void @"higher_order_tests#.#cont#6<0>"(ptr %"t##0") {
   %"tmp#8##0" = load ptr, ptr %"t##0"
   %"tmp#2##0" = tail call fastcc i1 %"tmp#8##0"(ptr %"t##0", i64 2)
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"higher_order_tests.#cont#7<0>"(ptr %"t##0")
+  tail call fastcc void @"higher_order_tests#.#cont#7<0>"(ptr %"t##0")
   ret void
 if.else.0:
-  tail call fastcc void @"higher_order_tests.#cont#7<0>"(ptr %"t##0")
+  tail call fastcc void @"higher_order_tests#.#cont#7<0>"(ptr %"t##0")
   ret void
 }
 
-define external fastcc void @"higher_order_tests.#cont#7<0>"(ptr %"t##0") {
+define external fastcc void @"higher_order_tests#.#cont#7<0>"(ptr %"t##0") {
   %"tmp#12##0" = load ptr, ptr %"t##0"
   %"tmp#1##0" = tail call fastcc i1 %"tmp#12##0"(ptr %"t##0", i64 2)
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1227)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1227)
   call ccc void @putchar(i8 10)
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc i1 @"higher_order_tests.do_test<0>"(ptr %"f##0", i64 %"i##0") {
+define external fastcc i1 @"higher_order_tests#.do_test<0>"(ptr %"f##0", i64 %"i##0") {
   %"tmp#1##0" = load ptr, ptr %"f##0"
   %"tmp#2##0" = tail call fastcc i1 %"tmp#1##0"(ptr %"f##0", i64 %"i##0")
   ret i1 %"tmp#2##0"
 }
 
-define external fastcc i1 @"higher_order_tests.do_test2<0>"(ptr %"f##0", i64 %"i##0") {
+define external fastcc i1 @"higher_order_tests#.do_test2<0>"(ptr %"f##0", i64 %"i##0") {
   %"tmp#1##0" = load ptr, ptr %"f##0"
   %"tmp#2##0" = tail call fastcc i1 %"tmp#1##0"(ptr %"f##0", i64 %"i##0")
   ret i1 %"tmp#2##0"
diff --git a/test-cases/final-dump/hypot.exp b/test-cases/final-dump/hypot.exp
index ec8996c2..6e17c75a 100644
--- a/test-cases/final-dump/hypot.exp
+++ b/test-cases/final-dump/hypot.exp
@@ -197,7 +197,7 @@ hypot(s1##0:wybe.float, s2##0:wybe.float, ?#result##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'hypot'
 
 source_filename = "!ROOT!/final-dump/hypot.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" = \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c" degrees\00", align 8
@@ -242,7 +242,7 @@ target triple    ????
 @"string#40" = private unnamed_addr constant {i64, i64} { i64 10, i64 ptrtoint( ptr @"cstring#19" to i64 ) }, align 8
 @"string#41" = private unnamed_addr constant {i64, i64} { i64 18, i64 ptrtoint( ptr @"cstring#20" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc double @acos(double)
 declare external ccc double @asin(double)
 declare external ccc double @atan(double)
@@ -262,114 +262,114 @@ declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"hypot.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#35" to i64 ))
+define external fastcc void @"hypot#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#35" to i64 ))
   %"tmp#0##0" = call ccc double @llvm.sqrt.f64(double 25.0)
   call ccc void @print_float(double %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
   call ccc void @print_float(double 78.53981633974483)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#33" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#33" to i64 ))
   call ccc void @print_float(double 2.7182818284590455)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
   %"tmp#3##0" = call ccc double @llvm.exp.f64(double 1.0)
   call ccc void @print_float(double %"tmp#3##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#40" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#40" to i64 ))
   %"tmp#4##0" = call ccc double @llvm.sin.f64(double 30.0)
   call ccc void @print_float(double %"tmp#4##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#32" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#32" to i64 ))
   %"tmp#5##0" = call ccc double @llvm.cos.f64(double 30.0)
   call ccc void @print_float(double %"tmp#5##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#39" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#39" to i64 ))
   %"tmp#6##0" = call ccc double @llvm.sin.f64(double 0.5235987755982988)
   call ccc void @print_float(double %"tmp#6##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#31" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#31" to i64 ))
   %"tmp#8##0" = call ccc double @llvm.cos.f64(double 0.5235987755982988)
   call ccc void @print_float(double %"tmp#8##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#41" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#41" to i64 ))
   %"tmp#10##0" = fdiv double %"tmp#6##0", %"tmp#8##0"
   call ccc void @print_float(double %"tmp#10##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#25" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#25" to i64 ))
   %"tmp#12##0" = call ccc double @asin(double 0.5)
   call ccc void @print_float(double %"tmp#12##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
   %"tmp#13##0" = fmul double %"tmp#12##0", 57.29577951308232
   call ccc void @print_float(double %"tmp#13##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#23" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#23" to i64 ))
   %"tmp#138##0" = call ccc double @llvm.sqrt.f64(double 3.0)
   %"tmp#122##0" = fdiv double %"tmp#138##0", 2.0
   %"tmp#15##0" = call ccc double @acos(double %"tmp#122##0")
   call ccc void @print_float(double %"tmp#15##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
   %"tmp#18##0" = fmul double %"tmp#15##0", 57.29577951308232
   call ccc void @print_float(double %"tmp#18##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#26" to i64 ))
   %"tmp#140##0" = fdiv double %"tmp#138##0", 3.0
   %"tmp#22##0" = call ccc double @atan(double %"tmp#140##0")
   call ccc void @print_float(double %"tmp#22##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
   %"tmp#25##0" = fmul double %"tmp#22##0", 57.29577951308232
   call ccc void @print_float(double %"tmp#25##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#27" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#27" to i64 ))
   %"tmp#30##0" = call ccc double @atan2(double -1.0, double -1.0)
   %"tmp#29##0" = call ccc double @atan(double %"tmp#30##0")
   call ccc void @print_float(double %"tmp#29##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
   %"tmp#31##0" = fmul double %"tmp#30##0", 57.29577951308232
   call ccc void @print_float(double %"tmp#31##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#37" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#37" to i64 ))
   %"tmp#33##0" = call ccc double @llvm.log.f64(double 2.7182818284590455)
   call ccc void @print_float(double %"tmp#33##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#30" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#30" to i64 ))
   %"tmp#35##0" = call ccc double @llvm.log10.f64(double 2.7182818284590455)
   call ccc void @print_float(double %"tmp#35##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#28" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#28" to i64 ))
   %"tmp#37##0" = call ccc double @llvm.log2.f64(double 2.7182818284590455)
   call ccc void @print_float(double %"tmp#37##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#34" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#34" to i64 ))
   %"tmp#39##0" = call ccc double @llvm.floor.f64(double 3.141592653589793)
   call ccc void @print_float(double %"tmp#39##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#29" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#29" to i64 ))
   %"tmp#41##0" = call ccc double @llvm.ceil.f64(double 3.141592653589793)
   call ccc void @print_float(double %"tmp#41##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#38" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#38" to i64 ))
   %"tmp#43##0" = call ccc double @llvm.round.f64(double 3.141592653589793)
   call ccc void @print_float(double %"tmp#43##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#36" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#36" to i64 ))
   %"tmp#45##0" = fptosi double %"tmp#43##0" to i64
   call ccc void @print_int(i64 %"tmp#45##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc double @"hypot.area<0>"(double %"r##0") {
+define external fastcc double @"hypot#.area<0>"(double %"r##0") {
   %"tmp#2##0" = fmul double %"r##0", %"r##0"
   %"tmp#6##0" = fmul double 3.141592653589793, %"tmp#2##0"
   ret double %"tmp#6##0"
 }
 
-define external fastcc double @"hypot.hypot<0>"(double %"s1##0", double %"s2##0") {
+define external fastcc double @"hypot#.hypot<0>"(double %"s1##0", double %"s2##0") {
   %"tmp#2##0" = fmul double %"s1##0", %"s1##0"
   %"tmp#3##0" = fmul double %"s2##0", %"s2##0"
   %"tmp#1##0" = fadd double %"tmp#2##0", %"tmp#3##0"
diff --git a/test-cases/final-dump/import.exp b/test-cases/final-dump/import.exp
index 0f33d33b..c3b28a9b 100644
--- a/test-cases/final-dump/import.exp
+++ b/test-cases/final-dump/import.exp
@@ -54,7 +54,7 @@ distance(p1##0:position.position, p2##0:position.position, ?#result##0:wybe.int)
 ; ModuleID = 'import'
 
 source_filename = "!ROOT!/final-dump/import.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc i64 @ipow(i64, i64)
@@ -64,7 +64,7 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"import.<0>"() {
+define external fastcc void @"import#.<0>"() {
   %"tmp#15##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#5##0" = ptrtoint ptr %"tmp#15##0" to i64
   %"tmp#16##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -79,13 +79,13 @@ define external fastcc void @"import.<0>"() {
   %"tmp#21##0" = add i64 %"tmp#9##0", 8
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   store i64 0, ptr %"tmp#22##0"
-  %"tmp#0##0" = tail call fastcc i64 @"import.distance<0>"(i64 %"tmp#5##0", i64 %"tmp#9##0")
+  %"tmp#0##0" = tail call fastcc i64 @"import#.distance<0>"(i64 %"tmp#5##0", i64 %"tmp#9##0")
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"import.distance<0>"(i64 %"p1##0", i64 %"p2##0") {
+define external fastcc i64 @"import#.distance<0>"(i64 %"p1##0", i64 %"p2##0") {
   %"tmp#25##0" = inttoptr i64 %"p2##0" to ptr
   %"tmp#4##0" = load i64, ptr %"tmp#25##0"
   %"tmp#26##0" = inttoptr i64 %"p1##0" to ptr
@@ -152,28 +152,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -286,13 +286,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -312,7 +312,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -323,7 +323,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -334,13 +334,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -350,14 +350,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -368,7 +368,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/import_in_sub_mod_lib.exp b/test-cases/final-dump/import_in_sub_mod_lib.exp
index ab6b0786..ebf14069 100644
--- a/test-cases/final-dump/import_in_sub_mod_lib.exp
+++ b/test-cases/final-dump/import_in_sub_mod_lib.exp
@@ -28,14 +28,14 @@ foo(v##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'import_in_sub_mod_lib'
 
 source_filename = "!ROOT!/final-dump/import_in_sub_mod_lib.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"import_in_sub_mod_lib.foo<0>"(i64 %"v##0") {
+define external fastcc void @"import_in_sub_mod_lib#.foo<0>"(i64 %"v##0") {
   call ccc void @print_int(i64 %"v##0")
   call ccc void @putchar(i8 10)
   ret void
diff --git a/test-cases/final-dump/import_in_sub_mod_main.exp b/test-cases/final-dump/import_in_sub_mod_main.exp
index a259260f..b08a6333 100644
--- a/test-cases/final-dump/import_in_sub_mod_main.exp
+++ b/test-cases/final-dump/import_in_sub_mod_main.exp
@@ -28,14 +28,14 @@ foo(v##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'import_in_sub_mod_lib'
 
 source_filename = "!ROOT!/final-dump/import_in_sub_mod_lib.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"import_in_sub_mod_lib.foo<0>"(i64 %"v##0") {
+define external fastcc void @"import_in_sub_mod_lib#.foo<0>"(i64 %"v##0") {
   call ccc void @print_int(i64 %"v##0")
   call ccc void @putchar(i8 10)
   ret void
@@ -69,14 +69,14 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'import_in_sub_mod_main'
 
 source_filename = "!ROOT!/final-dump/import_in_sub_mod_main.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"import_in_sub_mod_main.<0>"() {
+define external fastcc void @"import_in_sub_mod_main#.<0>"() {
   call ccc void @print_int(i64 10)
   call ccc void @putchar(i8 10)
   ret void
@@ -110,14 +110,14 @@ bar(v##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'import_in_sub_mod_main.sub'
 
 source_filename = "!ROOT!/final-dump/import_in_sub_mod_main.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"import_in_sub_mod_main.sub.bar<0>"(i64 %"v##0") {
+define external fastcc void @"import_in_sub_mod_main#.sub#.bar<0>"(i64 %"v##0") {
   call ccc void @print_int(i64 %"v##0")
   call ccc void @putchar(i8 10)
   ret void
diff --git a/test-cases/final-dump/importer.exp b/test-cases/final-dump/importer.exp
index a11f7380..056db7e6 100644
--- a/test-cases/final-dump/importer.exp
+++ b/test-cases/final-dump/importer.exp
@@ -34,19 +34,19 @@ three(?n##0:wybe.int)<{<<exporter.res>>}; {}; {}>:
 ; ModuleID = 'exporter'
 
 source_filename = "!ROOT!/final-dump/exporter.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc i64 @ipow(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#exporter.res" = global i64 undef
 
-define external fastcc i64 @"exporter.fn<0>"(i64 %"i##0") {
+define external fastcc i64 @"exporter#.fn<0>"(i64 %"i##0") {
   %"tmp#3##0" = call ccc i64 @ipow(i64 2, i64 %"i##0")
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc i64 @"exporter.three<0>"() {
+define external fastcc i64 @"exporter#.three<0>"() {
   %"tmp#1##0" = load i64, ptr @"resource#exporter.res"
   ret i64 %"tmp#1##0"
 }
@@ -101,7 +101,7 @@ my_three(?n##0:wybe.int)<{<<exporter.res>>}; {}; {}>:
 ; ModuleID = 'importer'
 
 source_filename = "!ROOT!/final-dump/importer.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" = \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"2^\00", align 8
@@ -109,33 +109,33 @@ target triple    ????
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
 @"resource#exporter.res" = external global i64
-declare external fastcc i64 @"wybe.int.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.int#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc i64 @ipow(i64, i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"importer.<0>"() {
+define external fastcc void @"importer#.<0>"() {
   %"tmp#19##0" = load i64, ptr @"resource#exporter.res"
   %"tmp#20##0" = call ccc i64 @ipow(i64 2, i64 %"tmp#19##0")
-  %"tmp#3##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"tmp#19##0", i64 0, i8 32)
-  %"tmp#5##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"tmp#20##0", i64 0, i8 32)
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#2" to i64 ), i64 %"tmp#5##0")
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#3##0", i64 %"tmp#4##0")
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#2##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#1##0")
+  %"tmp#3##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"tmp#19##0", i64 0, i8 32)
+  %"tmp#5##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"tmp#20##0", i64 0, i8 32)
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#2" to i64 ), i64 %"tmp#5##0")
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#3##0", i64 %"tmp#4##0")
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#2##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#1##0")
   call ccc void @putchar(i8 10)
-  %"tmp#10##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#2" to i64 ), i64 %"tmp#5##0")
-  %"tmp#8##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#3##0", i64 %"tmp#10##0")
-  %"tmp#7##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#8##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#7##0")
+  %"tmp#10##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#2" to i64 ), i64 %"tmp#5##0")
+  %"tmp#8##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#3##0", i64 %"tmp#10##0")
+  %"tmp#7##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#8##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#7##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"importer.my_three<0>"() {
+define external fastcc i64 @"importer#.my_three<0>"() {
   %"tmp#1##0" = load i64, ptr @"resource#exporter.res"
   ret i64 %"tmp#1##0"
 }
@@ -159,7 +159,7 @@ define external fastcc i64 @"importer.my_three<0>"() {
 ; ModuleID = 'pub_importer'
 
 source_filename = "!ROOT!/final-dump/pub_importer.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/imports.exp b/test-cases/final-dump/imports.exp
index eb0e908b..6b4efedf 100644
--- a/test-cases/final-dump/imports.exp
+++ b/test-cases/final-dump/imports.exp
@@ -28,7 +28,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'imports'
 
 source_filename = "!ROOT!/final-dump/imports.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -50,7 +50,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'mod1'
 
 source_filename = "!ROOT!/final-dump/mod1.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -72,7 +72,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'mod2'
 
 source_filename = "!ROOT!/final-dump/mod2.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -94,7 +94,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'mod3'
 
 source_filename = "!ROOT!/final-dump/mod3.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -116,7 +116,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'mod4'
 
 source_filename = "!ROOT!/final-dump/mod4.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -138,7 +138,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'mod5'
 
 source_filename = "!ROOT!/final-dump/mod5.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -160,7 +160,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'mod6'
 
 source_filename = "!ROOT!/final-dump/mod6.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -182,7 +182,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'mod7'
 
 source_filename = "!ROOT!/final-dump/mod7.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -204,7 +204,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'mod8'
 
 source_filename = "!ROOT!/final-dump/mod8.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/inequality.exp b/test-cases/final-dump/inequality.exp
index 362b9ad1..fb36a25c 100644
--- a/test-cases/final-dump/inequality.exp
+++ b/test-cases/final-dump/inequality.exp
@@ -32,17 +32,17 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'inequality'
 
 source_filename = "!ROOT!/final-dump/inequality.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"wybe.bool.print<0>"(i1)
+declare external fastcc void @"wybe#.bool#.print<0>"(i1)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"inequality.<0>"() {
-  tail call fastcc void @"wybe.bool.print<0>"(i1 1)
+define external fastcc void @"inequality#.<0>"() {
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 1)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.bool.print<0>"(i1 0)
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 0)
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/inline_decl.exp b/test-cases/final-dump/inline_decl.exp
index 764a9f4a..159670da 100644
--- a/test-cases/final-dump/inline_decl.exp
+++ b/test-cases/final-dump/inline_decl.exp
@@ -73,13 +73,13 @@ long()<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'inline_decl'
 
 source_filename = "!ROOT!/final-dump/inline_decl.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"inline_decl.<0>"() {
+define external fastcc void @"inline_decl#.<0>"() {
   call ccc void @putchar(i8 104)
   call ccc void @putchar(i8 101)
   call ccc void @putchar(i8 108)
@@ -92,16 +92,16 @@ define external fastcc void @"inline_decl.<0>"() {
   call ccc void @putchar(i8 108)
   call ccc void @putchar(i8 100)
   call ccc void @putchar(i8 33)
-  tail call fastcc void @"inline_decl.finish<0>"()
+  tail call fastcc void @"inline_decl#.finish<0>"()
   ret void
 }
 
-define external fastcc void @"inline_decl.finish<0>"() {
+define external fastcc void @"inline_decl#.finish<0>"() {
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"inline_decl.long<0>"() {
+define external fastcc void @"inline_decl#.long<0>"() {
   call ccc void @putchar(i8 104)
   call ccc void @putchar(i8 101)
   call ccc void @putchar(i8 108)
@@ -114,6 +114,6 @@ define external fastcc void @"inline_decl.long<0>"() {
   call ccc void @putchar(i8 108)
   call ccc void @putchar(i8 100)
   call ccc void @putchar(i8 33)
-  tail call fastcc void @"inline_decl.finish<0>"()
+  tail call fastcc void @"inline_decl#.finish<0>"()
   ret void
 }
diff --git a/test-cases/final-dump/inline_pos.exp b/test-cases/final-dump/inline_pos.exp
index d6544771..23a8d076 100644
--- a/test-cases/final-dump/inline_pos.exp
+++ b/test-cases/final-dump/inline_pos.exp
@@ -51,12 +51,12 @@ set_exit_code(code##0:wybe.int)<{}; {<<command_line.exit_code>>}; {}>:
 ; ModuleID = 'command_line'
 
 source_filename = "!ROOT!/../wybelibs/command_line.o"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Erroneous program argument vector\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"command_line:18:15\00", align 8
 
-declare external fastcc {i64, i64, i1} @"wybe.c_array.[|]<0>"(i64)
+declare external fastcc {i64, i64, i1} @"wybe#.c_array#.[|]<0>"(i64)
 declare external ccc void @error_exit(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#command_line.argc" = global i64 undef
@@ -65,9 +65,9 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#command_line.command" = global i64 undef
 @"resource#command_line.exit_code" = global i64 undef
 
-define external fastcc void @"command_line.<0>"() {
+define external fastcc void @"command_line#.<0>"() {
   %"arguments##0" = load i64, ptr @"resource#command_line.arguments"
-  %"tmp#11##0" = tail call fastcc {i64, i64, i1} @"wybe.c_array.[|]<0>"(i64 %"arguments##0")
+  %"tmp#11##0" = tail call fastcc {i64, i64, i1} @"wybe#.c_array#.[|]<0>"(i64 %"arguments##0")
   %"command##1" = extractvalue {i64, i64, i1}%"tmp#11##0", 0
   %"arguments##2" = extractvalue {i64, i64, i1}%"tmp#11##0", 1
   %"tmp#8##0" = extractvalue {i64, i64, i1}%"tmp#11##0", 2
@@ -81,7 +81,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"command_line.set_exit_code<0>"(i64 %"code##0") {
+define external fastcc void @"command_line#.set_exit_code<0>"(i64 %"code##0") {
   store i64 %"code##0", ptr @"resource#command_line.exit_code"
   ret void
 }
@@ -127,31 +127,31 @@ myincr(x##0:wybe.int, ?x##1:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'inline_pos'
 
 source_filename = "!ROOT!/final-dump/inline_pos.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"v = \00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 4, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
 @"resource#command_line.arguments" = external global i64
-declare external fastcc i64 @"wybe.int.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.int#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"inline_pos.<0>"() {
+define external fastcc void @"inline_pos#.<0>"() {
   %"arguments##0" = load i64, ptr @"resource#command_line.arguments"
   %"tmp#9##0" = inttoptr i64 %"arguments##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#9##0"
   %"v##1" = add i64 %"tmp#0##0", 1
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"v##1", i64 0, i8 32)
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#1" to i64 ), i64 %"tmp#2##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#1##0")
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"v##1", i64 0, i8 32)
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#1" to i64 ), i64 %"tmp#2##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#1##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"inline_pos.myincr<0>"(i64 %"x##0") {
+define external fastcc i64 @"inline_pos#.myincr<0>"(i64 %"x##0") {
   %"tmp#3##0" = add i64 %"x##0", 1
   ret i64 %"tmp#3##0"
 }
diff --git a/test-cases/final-dump/inline_rename.exp b/test-cases/final-dump/inline_rename.exp
index 94249187..6d77c71e 100644
--- a/test-cases/final-dump/inline_rename.exp
+++ b/test-cases/final-dump/inline_rename.exp
@@ -51,15 +51,15 @@ foo(?bar##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'inline_rename'
 
 source_filename = "!ROOT!/final-dump/inline_rename.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"inline_rename.<0>"() {
-  %"b##0" = tail call fastcc i64 @"inline_rename.eq<0>"(i64 0)
+define external fastcc void @"inline_rename#.<0>"() {
+  %"b##0" = tail call fastcc i64 @"inline_rename#.eq<0>"(i64 0)
   call ccc void @print_int(i64 %"b##0")
   call ccc void @putchar(i8 10)
   call ccc void @print_int(i64 %"b##0")
@@ -67,12 +67,12 @@ define external fastcc void @"inline_rename.<0>"() {
   ret void
 }
 
-define external fastcc i64 @"inline_rename.eq<0>"(i64 %"x##0") {
+define external fastcc i64 @"inline_rename#.eq<0>"(i64 %"x##0") {
   ret i64 %"x##0"
 }
 
-define external fastcc i64 @"inline_rename.foo<0>"() {
-  %"tmp#4##0" = tail call fastcc i64 @"inline_rename.eq<0>"(i64 0)
+define external fastcc i64 @"inline_rename#.foo<0>"() {
+  %"tmp#4##0" = tail call fastcc i64 @"inline_rename#.eq<0>"(i64 0)
   call ccc void @print_int(i64 %"tmp#4##0")
   call ccc void @putchar(i8 10)
   ret i64 %"tmp#4##0"
diff --git a/test-cases/final-dump/int_list.exp b/test-cases/final-dump/int_list.exp
index 6834a531..e8849e3d 100644
--- a/test-cases/final-dump/int_list.exp
+++ b/test-cases/final-dump/int_list.exp
@@ -81,7 +81,7 @@ println(x##0:int_list.int_list)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'int_list'
 
 source_filename = "!ROOT!/final-dump/int_list.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -89,7 +89,7 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"int_list.<0>"() {
+define external fastcc void @"int_list#.<0>"() {
   %"tmp#22##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#6##0" = ptrtoint ptr %"tmp#22##0" to i64
   %"tmp#23##0" = inttoptr i64 %"tmp#6##0" to ptr
@@ -111,12 +111,12 @@ define external fastcc void @"int_list.<0>"() {
   %"tmp#32##0" = add i64 %"tmp#16##0", 8
   %"tmp#33##0" = inttoptr i64 %"tmp#32##0" to ptr
   store i64 %"tmp#11##0", ptr %"tmp#33##0"
-  tail call fastcc void @"int_list.print<0>"(i64 %"tmp#16##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"tmp#16##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"int_list.print<0>"(i64 %"x##0") {
+define external fastcc void @"int_list#.print<0>"(i64 %"x##0") {
   %"tmp#2##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -127,14 +127,14 @@ if.then.0:
   %"t##0" = load i64, ptr %"tmp#11##0"
   call ccc void @print_int(i64 %"h##0")
   call ccc void @putchar(i8 32)
-  tail call fastcc void @"int_list.print<0>"(i64 %"t##0")
+  tail call fastcc void @"int_list#.print<0>"(i64 %"t##0")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"int_list.println<0>"(i64 %"x##0") {
-  tail call fastcc void @"int_list.print<0>"(i64 %"x##0")
+define external fastcc void @"int_list#.println<0>"(i64 %"x##0") {
+  tail call fastcc void @"int_list#.print<0>"(i64 %"x##0")
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -304,13 +304,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'int_list.int_list'
 
 source_filename = "!ROOT!/final-dump/int_list.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"int_list.int_list.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"int_list#.int_list#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -330,7 +330,7 @@ if.then.1:
   %"tmp#4##0" = icmp eq i64 %"#left#head##0", %"#right#head##0"
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#18##0" = tail call fastcc i1 @"int_list.int_list.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
+  %"tmp#18##0" = tail call fastcc i1 @"int_list#.int_list#.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
   ret i1 %"tmp#18##0"
 if.else.2:
   ret i1 0
@@ -341,7 +341,7 @@ if.else.0:
   ret i1 %"tmp#19##0"
 }
 
-define external fastcc i64 @"int_list.int_list.cons<0>"(i64 %"head##0", i64 %"tail##0") {
+define external fastcc i64 @"int_list#.int_list#.cons<0>"(i64 %"head##0", i64 %"tail##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -352,7 +352,7 @@ define external fastcc i64 @"int_list.int_list.cons<0>"(i64 %"head##0", i64 %"ta
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"int_list.int_list.cons<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"int_list#.int_list#.cons<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -372,7 +372,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"int_list.int_list.head<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"int_list#.int_list#.head<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -387,7 +387,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"int_list.int_list.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"int_list#.int_list#.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -406,11 +406,11 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"int_list.int_list.nil<0>"() {
+define external fastcc i64 @"int_list#.int_list#.nil<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"int_list.int_list.tail<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"int_list#.int_list#.tail<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -426,7 +426,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"int_list.int_list.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"int_list#.int_list#.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -446,8 +446,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"int_list.int_list.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"int_list.int_list.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"int_list#.int_list#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"int_list#.int_list#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/int_sequence.exp b/test-cases/final-dump/int_sequence.exp
index 91993656..62035a4b 100644
--- a/test-cases/final-dump/int_sequence.exp
+++ b/test-cases/final-dump/int_sequence.exp
@@ -195,7 +195,7 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'int_sequence'
 
 source_filename = "!ROOT!/final-dump/int_sequence.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -203,7 +203,7 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"int_sequence.<0>"() {
+define external fastcc void @"int_sequence#.<0>"() {
   %"tmp#8##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#6##0" = ptrtoint ptr %"tmp#8##0" to i64
   %"tmp#9##0" = inttoptr i64 %"tmp#6##0" to ptr
@@ -211,12 +211,12 @@ define external fastcc void @"int_sequence.<0>"() {
   %"tmp#10##0" = add i64 %"tmp#6##0", 8
   %"tmp#11##0" = inttoptr i64 %"tmp#10##0" to ptr
   store i64 10, ptr %"tmp#11##0"
-  tail call fastcc void @"int_sequence.#cont#1<0>[410bae77d3]"(i64 %"tmp#6##0")
+  tail call fastcc void @"int_sequence#.#cont#1<0>[410bae77d3]"(i64 %"tmp#6##0")
   ret void
 }
 
-define external fastcc void @"int_sequence.#cont#1<0>"(i64 %"tmp#0##0") {
-  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"int_sequence.[|]<0>"(i64 %"tmp#0##0")
+define external fastcc void @"int_sequence#.#cont#1<0>"(i64 %"tmp#0##0") {
+  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"int_sequence#.[|]<0>"(i64 %"tmp#0##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 0
   %"tmp#0##1" = extractvalue {i64, i64, i1}%"tmp#8##0", 1
   %"tmp#3##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 2
@@ -224,14 +224,14 @@ define external fastcc void @"int_sequence.#cont#1<0>"(i64 %"tmp#0##0") {
 if.then.0:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_sequence.#cont#1<0>[410bae77d3]"(i64 %"tmp#0##1")
+  tail call fastcc void @"int_sequence#.#cont#1<0>[410bae77d3]"(i64 %"tmp#0##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"int_sequence.#cont#1<0>[410bae77d3]"(i64 %"tmp#0##0") {
-  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"int_sequence.[|]<0>[785a827a1b]"(i64 %"tmp#0##0")
+define external fastcc void @"int_sequence#.#cont#1<0>[410bae77d3]"(i64 %"tmp#0##0") {
+  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"int_sequence#.[|]<0>[785a827a1b]"(i64 %"tmp#0##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 0
   %"tmp#0##1" = extractvalue {i64, i64, i1}%"tmp#8##0", 1
   %"tmp#3##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 2
@@ -239,13 +239,13 @@ define external fastcc void @"int_sequence.#cont#1<0>[410bae77d3]"(i64 %"tmp#0##
 if.then.0:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"int_sequence.#cont#1<0>[410bae77d3]"(i64 %"tmp#0##1")
+  tail call fastcc void @"int_sequence#.#cont#1<0>[410bae77d3]"(i64 %"tmp#0##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc i64 @"int_sequence...<0>"(i64 %"lower##0", i64 %"upper##0") {
+define external fastcc i64 @"int_sequence#...<0>"(i64 %"lower##0", i64 %"upper##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -256,7 +256,7 @@ define external fastcc i64 @"int_sequence...<0>"(i64 %"lower##0", i64 %"upper##0
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"int_sequence...<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"int_sequence#...<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -267,7 +267,7 @@ define external fastcc {i64, i64} @"int_sequence...<1>"(i64 %"#result##0") {
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"int_sequence.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"int_sequence#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#lower##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -287,7 +287,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc {i64, i64, i1} @"int_sequence.[|]<0>"(i64 %"seq##0") {
+define external fastcc {i64, i64, i1} @"int_sequence#.[|]<0>"(i64 %"seq##0") {
   %"tmp#21##0" = inttoptr i64 %"seq##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#21##0"
   %"tmp#22##0" = add i64 %"seq##0", 8
@@ -315,7 +315,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#33##0"
 }
 
-define external fastcc {i64, i64, i1} @"int_sequence.[|]<0>[785a827a1b]"(i64 %"seq##0") {
+define external fastcc {i64, i64, i1} @"int_sequence#.[|]<0>[785a827a1b]"(i64 %"seq##0") {
   %"tmp#21##0" = inttoptr i64 %"seq##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#21##0"
   %"tmp#22##0" = add i64 %"seq##0", 8
@@ -341,13 +341,13 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#32##0"
 }
 
-define external fastcc i64 @"int_sequence.lower<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"int_sequence#.lower<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"int_sequence.lower<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"int_sequence#.lower<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -357,14 +357,14 @@ define external fastcc i64 @"int_sequence.lower<1>"(i64 %"#rec##0", i64 %"#field
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"int_sequence.upper<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"int_sequence#.upper<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"int_sequence.upper<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"int_sequence#.upper<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -375,7 +375,7 @@ define external fastcc i64 @"int_sequence.upper<1>"(i64 %"#rec##0", i64 %"#field
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"int_sequence.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"int_sequence#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/io.exp b/test-cases/final-dump/io.exp
index ed23be1e..9f480b1a 100644
--- a/test-cases/final-dump/io.exp
+++ b/test-cases/final-dump/io.exp
@@ -55,14 +55,14 @@ myprint_b(x##0:wybe.int, ?y##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>
 ; ModuleID = 'io'
 
 source_filename = "!ROOT!/final-dump/io.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"io.<0>"() {
+define external fastcc void @"io#.<0>"() {
   call ccc void @print_int(i64 100)
   call ccc void @putchar(i8 10)
   call ccc void @print_int(i64 200)
@@ -70,13 +70,13 @@ define external fastcc void @"io.<0>"() {
   ret void
 }
 
-define external fastcc void @"io.myprint_a<0>"(i64 %"x##0") {
+define external fastcc void @"io#.myprint_a<0>"(i64 %"x##0") {
   call ccc void @print_int(i64 %"x##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"io.myprint_b<0>"(i64 %"x##0") {
+define external fastcc i64 @"io#.myprint_b<0>"(i64 %"x##0") {
   call ccc void @print_int(i64 %"x##0")
   call ccc void @putchar(i8 10)
   ret i64 200
diff --git a/test-cases/final-dump/io_flow_ok.exp b/test-cases/final-dump/io_flow_ok.exp
index 1b9849f6..799918a1 100644
--- a/test-cases/final-dump/io_flow_ok.exp
+++ b/test-cases/final-dump/io_flow_ok.exp
@@ -58,7 +58,7 @@ unknown(?#success##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'io_flow_ok'
 
 source_filename = "!ROOT!/final-dump/io_flow_ok.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"OK\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"That's odd!\00", align 8
@@ -68,30 +68,30 @@ target triple    ????
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 12, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 @"array#6" = private unnamed_addr constant [ 2 x i64 ] [i64 ptrtoint( ptr @"string#4" to i64 ), i64 ptrtoint( ptr @"string#3" to i64 )]
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"io_flow_ok.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+define external fastcc void @"io_flow_ok#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#0##0" = tail call fastcc i1 @"io_flow_ok.unknown<0>"()
+  %"tmp#0##0" = tail call fastcc i1 @"io_flow_ok#.unknown<0>"()
   %"tmp#16##0" = zext i1 %"tmp#0##0" to i64
   %"tmp#15##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#6", i64 0, i64 %"tmp#16##0"
   %"tmp#14##0" = load i64, ptr %"tmp#15##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#14##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#14##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"io_flow_ok.aok<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+define external fastcc void @"io_flow_ok#.aok<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i1 @"io_flow_ok.unknown<0>"() {
+define external fastcc i1 @"io_flow_ok#.unknown<0>"() {
   ret i1 1
 }
diff --git a/test-cases/final-dump/lazy.exp b/test-cases/final-dump/lazy.exp
index 54b1f572..89216866 100644
--- a/test-cases/final-dump/lazy.exp
+++ b/test-cases/final-dump/lazy.exp
@@ -60,7 +60,7 @@ proc #anon#1 > {inline} (1 calls)
 ; ModuleID = 'lazy'
 
 source_filename = "!ROOT!/final-dump/lazy.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"The answer is now...\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"The answer is...\00", align 8
@@ -68,42 +68,42 @@ target triple    ????
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 20, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 16, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 12, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
-@"closure#6" = private unnamed_addr constant {ptr} { ptr @"lazy.#anon#1<1>" }, align 8
+@"closure#6" = private unnamed_addr constant {ptr} { ptr @"lazy#.#anon#1<1>" }, align 8
 
-declare external fastcc i64 @"wybe.lazy.get<0>"(i64)
-declare external fastcc i64 @"wybe.lazy.lazy<0>"(ptr)
-declare external fastcc i64 @"wybe.string.c_string<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc i64 @"wybe#.lazy#.get<0>"(i64)
+declare external fastcc i64 @"wybe#.lazy#.lazy<0>"(ptr)
+declare external fastcc i64 @"wybe#.string#.c_string<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @log_string(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @sleep(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"lazy.<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.lazy.lazy<0>"(ptr @"closure#6")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+define external fastcc void @"lazy#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.lazy#.lazy<0>"(ptr @"closure#6")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.lazy.get<0>"(i64 %"tmp#0##0")
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.lazy#.get<0>"(i64 %"tmp#0##0")
   call ccc void @print_int(i64 %"tmp#1##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.lazy.get<0>"(i64 %"tmp#0##0")
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.lazy#.get<0>"(i64 %"tmp#0##0")
   call ccc void @print_int(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"lazy.#anon#1<0>"() {
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+define external fastcc i64 @"lazy#.#anon#1<0>"() {
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @log_string(i64 %"tmp#4##0")
   call ccc void @sleep(i64 1)
   ret i64 42
 }
 
-define external fastcc i64 @"lazy.#anon#1<1>"(ptr %"#env##0") {
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+define external fastcc i64 @"lazy#.#anon#1<1>"(ptr %"#env##0") {
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @log_string(i64 %"tmp#0##0")
   call ccc void @sleep(i64 1)
   ret i64 42
@@ -186,13 +186,13 @@ lognl()<{}; {}; {}>:
 ; ModuleID = 'logging'
 
 source_filename = "!ROOT!/../wybelibs/logging.o"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"false\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"true\00", align 8
 @"array#2" = private unnamed_addr constant [ 2 x i64 ] [i64 ptrtoint( ptr @"cstring#0" to i64 ), i64 ptrtoint( ptr @"cstring#1" to i64 )]
 
-declare external fastcc i64 @"wybe.string.c_string<0>"(i64)
+declare external fastcc i64 @"wybe#.string#.c_string<0>"(i64)
 declare external ccc void @log_char(i8)
 declare external ccc void @log_count(i64)
 declare external ccc void @log_float(double)
@@ -200,38 +200,38 @@ declare external ccc void @log_int(i64)
 declare external ccc void @log_string(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"logging.logmsg<0>"(i64 %"x##0") {
+define external fastcc void @"logging#.logmsg<0>"(i64 %"x##0") {
   call ccc void @log_int(i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<1>"(i64 %"x##0") {
+define external fastcc void @"logging#.logmsg<1>"(i64 %"x##0") {
   call ccc void @log_count(i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<2>"(double %"x##0") {
+define external fastcc void @"logging#.logmsg<2>"(double %"x##0") {
   call ccc void @log_float(double %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<3>"(i8 %"x##0") {
+define external fastcc void @"logging#.logmsg<3>"(i8 %"x##0") {
   call ccc void @log_char(i8 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<4>"(i64 %"x##0") {
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 %"x##0")
+define external fastcc void @"logging#.logmsg<4>"(i64 %"x##0") {
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 %"x##0")
   call ccc void @log_string(i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<5>"(i64 %"x##0") {
+define external fastcc void @"logging#.logmsg<5>"(i64 %"x##0") {
   call ccc void @log_string(i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"logging.logmsg<6>"(i1 %"x##0") {
+define external fastcc void @"logging#.logmsg<6>"(i1 %"x##0") {
   %"tmp#6##0" = zext i1 %"x##0" to i64
   %"tmp#5##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#2", i64 0, i64 %"tmp#6##0"
   %"tmp#4##0" = load i64, ptr %"tmp#5##0"
@@ -239,7 +239,7 @@ define external fastcc void @"logging.logmsg<6>"(i1 %"x##0") {
   ret void
 }
 
-define external fastcc void @"logging.lognl<0>"() {
+define external fastcc void @"logging#.lognl<0>"() {
   call ccc void @log_char(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/list_loop.exp b/test-cases/final-dump/list_loop.exp
index 9dd0866a..a6cbe5ec 100644
--- a/test-cases/final-dump/list_loop.exp
+++ b/test-cases/final-dump/list_loop.exp
@@ -121,19 +121,19 @@ proc #cont#4 > {inline,semipure} (1 calls)
 ; ModuleID = 'list_loop'
 
 source_filename = "!ROOT!/final-dump/list_loop.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"    \00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 4, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"list_loop.<0>"() {
+define external fastcc void @"list_loop#.<0>"() {
   %"tmp#23##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#10##0" = ptrtoint ptr %"tmp#23##0" to i64
   %"tmp#24##0" = inttoptr i64 %"tmp#10##0" to ptr
@@ -155,11 +155,11 @@ define external fastcc void @"list_loop.<0>"() {
   %"tmp#33##0" = add i64 %"tmp#20##0", 8
   %"tmp#34##0" = inttoptr i64 %"tmp#33##0" to ptr
   store i64 %"tmp#15##0", ptr %"tmp#34##0"
-  tail call fastcc void @"list_loop.#cont#1<0>"(i64 %"tmp#20##0", i64 %"tmp#20##0")
+  tail call fastcc void @"list_loop#.#cont#1<0>"(i64 %"tmp#20##0", i64 %"tmp#20##0")
   ret void
 }
 
-define external fastcc void @"list_loop.#cont#1<0>"(i64 %"l##0", i64 %"x##0") {
+define external fastcc void @"list_loop#.#cont#1<0>"(i64 %"l##0", i64 %"x##0") {
   %"tmp#9##0" = icmp ne i64 %"l##0", 0
   br i1 %"tmp#9##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -170,20 +170,20 @@ if.then.0:
   %"l##1" = load i64, ptr %"tmp#18##0"
   call ccc void @print_int(i64 %"h##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"list_loop.#cont#3<0>"(i64 %"h##0", i64 %"l##1", i64 %"x##0", i64 %"x##0")
+  tail call fastcc void @"list_loop#.#cont#3<0>"(i64 %"h##0", i64 %"l##1", i64 %"x##0", i64 %"x##0")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"list_loop.#cont#2<0>"(i64 %"h##0", i64 %"l##0", i64 %"x##0") {
+define external fastcc void @"list_loop#.#cont#2<0>"(i64 %"h##0", i64 %"l##0", i64 %"x##0") {
   call ccc void @print_int(i64 %"h##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"list_loop.#cont#3<0>"(i64 %"h##0", i64 %"l##0", i64 %"x##0", i64 %"x##0")
+  tail call fastcc void @"list_loop#.#cont#3<0>"(i64 %"h##0", i64 %"l##0", i64 %"x##0", i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"list_loop.#cont#3<0>"(i64 %"h##0", i64 %"l##0", i64 %"l2##0", i64 %"x##0") {
+define external fastcc void @"list_loop#.#cont#3<0>"(i64 %"h##0", i64 %"l##0", i64 %"l2##0", i64 %"x##0") {
   %"tmp#8##0" = icmp ne i64 %"l2##0", 0
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -192,25 +192,25 @@ if.then.0:
   %"tmp#20##0" = add i64 %"l2##0", 8
   %"tmp#21##0" = inttoptr i64 %"tmp#20##0" to ptr
   %"l2##1" = load i64, ptr %"tmp#21##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @print_int(i64 %"h##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1155)
   call ccc void @print_int(i64 %"h2##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"list_loop.#cont#3<0>"(i64 %"h##0", i64 %"l##0", i64 %"l2##1", i64 %"x##0")
+  tail call fastcc void @"list_loop#.#cont#3<0>"(i64 %"h##0", i64 %"l##0", i64 %"l2##1", i64 %"x##0")
   ret void
 if.else.0:
-  tail call fastcc void @"list_loop.#cont#1<0>"(i64 %"l##0", i64 %"x##0")
+  tail call fastcc void @"list_loop#.#cont#1<0>"(i64 %"l##0", i64 %"x##0")
   ret void
 }
 
-define external fastcc void @"list_loop.#cont#4<0>"(i64 %"h##0", i64 %"h2##0", i64 %"l##0", i64 %"l2##0", i64 %"x##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"list_loop#.#cont#4<0>"(i64 %"h##0", i64 %"h2##0", i64 %"l##0", i64 %"l2##0", i64 %"x##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @print_int(i64 %"h##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 1155)
   call ccc void @print_int(i64 %"h2##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"list_loop.#cont#3<0>"(i64 %"h##0", i64 %"l##0", i64 %"l2##0", i64 %"x##0")
+  tail call fastcc void @"list_loop#.#cont#3<0>"(i64 %"h##0", i64 %"l##0", i64 %"l2##0", i64 %"x##0")
   ret void
 }
 
@@ -379,13 +379,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'list_loop.intlist'
 
 source_filename = "!ROOT!/final-dump/list_loop.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"list_loop.intlist.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"list_loop#.intlist#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -405,7 +405,7 @@ if.then.1:
   %"tmp#4##0" = icmp eq i64 %"#left#head##0", %"#right#head##0"
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#18##0" = tail call fastcc i1 @"list_loop.intlist.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
+  %"tmp#18##0" = tail call fastcc i1 @"list_loop#.intlist#.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
   ret i1 %"tmp#18##0"
 if.else.2:
   ret i1 0
@@ -416,7 +416,7 @@ if.else.0:
   ret i1 %"tmp#19##0"
 }
 
-define external fastcc i64 @"list_loop.intlist.cons<0>"(i64 %"head##0", i64 %"tail##0") {
+define external fastcc i64 @"list_loop#.intlist#.cons<0>"(i64 %"head##0", i64 %"tail##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -427,7 +427,7 @@ define external fastcc i64 @"list_loop.intlist.cons<0>"(i64 %"head##0", i64 %"ta
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"list_loop.intlist.cons<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"list_loop#.intlist#.cons<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -447,7 +447,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"list_loop.intlist.head<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"list_loop#.intlist#.head<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -462,7 +462,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"list_loop.intlist.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"list_loop#.intlist#.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -481,11 +481,11 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"list_loop.intlist.nil<0>"() {
+define external fastcc i64 @"list_loop#.intlist#.nil<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"list_loop.intlist.tail<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"list_loop#.intlist#.tail<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -501,7 +501,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"list_loop.intlist.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"list_loop#.intlist#.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -521,8 +521,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"list_loop.intlist.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"list_loop.intlist.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"list_loop#.intlist#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"list_loop#.intlist#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/list_this.exp b/test-cases/final-dump/list_this.exp
index 5b5ce36e..476b3d1f 100644
--- a/test-cases/final-dump/list_this.exp
+++ b/test-cases/final-dump/list_this.exp
@@ -170,13 +170,13 @@ nil(?#result##0:list_this(T))<{}; {}; {}>:
 ; ModuleID = 'list_this'
 
 source_filename = "!ROOT!/final-dump/list_this.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"list_this.append<0>"(i64 %"x##0", i64 %"y##0", ptr %"tmp#10##0") {
+define external fastcc void @"list_this#.append<0>"(i64 %"x##0", i64 %"y##0", ptr %"tmp#10##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -192,14 +192,14 @@ if.then.0:
   store i64 %"tmp#8##0", ptr %"tmp#10##0"
   %"tmp#16##0" = add i64 %"tmp#8##0", 8
   %"tmp#17##0" = inttoptr i64 %"tmp#16##0" to ptr
-  musttail call fastcc void @"list_this.append<0>"(i64 %"t##0", i64 %"y##0", ptr %"tmp#17##0")
+  musttail call fastcc void @"list_this#.append<0>"(i64 %"t##0", i64 %"y##0", ptr %"tmp#17##0")
   ret void
 if.else.0:
   store i64 %"y##0", ptr %"tmp#10##0"
   ret void
 }
 
-define external fastcc {i64, i1} @"list_this.car<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"list_this#.car<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -214,7 +214,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"list_this.car<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"list_this#.car<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -233,7 +233,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc {i64, i1} @"list_this.cdr<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"list_this#.cdr<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -249,7 +249,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"list_this.cdr<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"list_this#.cdr<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -269,7 +269,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"list_this.cons<0>"(i64 %"car##0", i64 %"cdr##0") {
+define external fastcc i64 @"list_this#.cons<0>"(i64 %"car##0", i64 %"cdr##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -280,7 +280,7 @@ define external fastcc i64 @"list_this.cons<0>"(i64 %"car##0", i64 %"cdr##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"list_this.cons<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"list_this#.cons<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -300,12 +300,12 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc i64 @"list_this.length<0>"(i64 %"x##0") {
-  %"tmp#1##0" = tail call fastcc i64 @"list_this.length1<0>"(i64 %"x##0", i64 0)
+define external fastcc i64 @"list_this#.length<0>"(i64 %"x##0") {
+  %"tmp#1##0" = tail call fastcc i64 @"list_this#.length1<0>"(i64 %"x##0", i64 0)
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"list_this.length1<0>"(i64 %"x##0", i64 %"acc##0") {
+define external fastcc i64 @"list_this#.length1<0>"(i64 %"x##0", i64 %"acc##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -313,12 +313,12 @@ if.then.0:
   %"tmp#9##0" = inttoptr i64 %"tmp#8##0" to ptr
   %"t##0" = load i64, ptr %"tmp#9##0"
   %"tmp#2##0" = add i64 %"acc##0", 1
-  %"tmp#10##0" = tail call fastcc i64 @"list_this.length1<0>"(i64 %"t##0", i64 %"tmp#2##0")
+  %"tmp#10##0" = tail call fastcc i64 @"list_this#.length1<0>"(i64 %"t##0", i64 %"tmp#2##0")
   ret i64 %"tmp#10##0"
 if.else.0:
   ret i64 %"acc##0"
 }
 
-define external fastcc i64 @"list_this.nil<0>"() {
+define external fastcc i64 @"list_this#.nil<0>"() {
   ret i64 0
 }
diff --git a/test-cases/final-dump/loop_bug.exp b/test-cases/final-dump/loop_bug.exp
index 1afae337..162c84db 100644
--- a/test-cases/final-dump/loop_bug.exp
+++ b/test-cases/final-dump/loop_bug.exp
@@ -85,17 +85,17 @@ print#cont#2(h##0:wybe.int, t##0:loop_bug.int_list)<{<<wybe.io.io>>}; {<<wybe.io
 ; ModuleID = 'loop_bug'
 
 source_filename = "!ROOT!/final-dump/loop_bug.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c", \00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"loop_bug.print<0>"(i64 %"lst##0") {
+define external fastcc void @"loop_bug#.print<0>"(i64 %"lst##0") {
   call ccc void @putchar(i8 91)
   %"tmp#8##0" = icmp ne i64 %"lst##0", 0
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
@@ -106,14 +106,14 @@ if.then.0:
   %"tmp#17##0" = inttoptr i64 %"tmp#16##0" to ptr
   %"t##0" = load i64, ptr %"tmp#17##0"
   call ccc void @print_int(i64 %"h##0")
-  tail call fastcc void @"loop_bug.print#cont#1<0>"(i64 %"t##0")
+  tail call fastcc void @"loop_bug#.print#cont#1<0>"(i64 %"t##0")
   ret void
 if.else.0:
   call ccc void @putchar(i8 93)
   ret void
 }
 
-define external fastcc void @"loop_bug.print#cont#1<0>"(i64 %"t##0") {
+define external fastcc void @"loop_bug#.print#cont#1<0>"(i64 %"t##0") {
   %"tmp#4##0" = icmp ne i64 %"t##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -122,19 +122,19 @@ if.then.0:
   %"tmp#13##0" = add i64 %"t##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
   %"t##1" = load i64, ptr %"tmp#14##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @print_int(i64 %"h##1")
-  tail call fastcc void @"loop_bug.print#cont#1<0>"(i64 %"t##1")
+  tail call fastcc void @"loop_bug#.print#cont#1<0>"(i64 %"t##1")
   ret void
 if.else.0:
   call ccc void @putchar(i8 93)
   ret void
 }
 
-define external fastcc void @"loop_bug.print#cont#2<0>"(i64 %"h##0", i64 %"t##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"loop_bug#.print#cont#2<0>"(i64 %"h##0", i64 %"t##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @print_int(i64 %"h##0")
-  tail call fastcc void @"loop_bug.print#cont#1<0>"(i64 %"t##0")
+  tail call fastcc void @"loop_bug#.print#cont#1<0>"(i64 %"t##0")
   ret void
 }
 
@@ -303,13 +303,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'loop_bug.int_list'
 
 source_filename = "!ROOT!/final-dump/loop_bug.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"loop_bug.int_list.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"loop_bug#.int_list#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -329,7 +329,7 @@ if.then.1:
   %"tmp#4##0" = icmp eq i64 %"#left#head##0", %"#right#head##0"
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#18##0" = tail call fastcc i1 @"loop_bug.int_list.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
+  %"tmp#18##0" = tail call fastcc i1 @"loop_bug#.int_list#.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
   ret i1 %"tmp#18##0"
 if.else.2:
   ret i1 0
@@ -340,7 +340,7 @@ if.else.0:
   ret i1 %"tmp#19##0"
 }
 
-define external fastcc i64 @"loop_bug.int_list.cons<0>"(i64 %"head##0", i64 %"tail##0") {
+define external fastcc i64 @"loop_bug#.int_list#.cons<0>"(i64 %"head##0", i64 %"tail##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -351,7 +351,7 @@ define external fastcc i64 @"loop_bug.int_list.cons<0>"(i64 %"head##0", i64 %"ta
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"loop_bug.int_list.cons<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"loop_bug#.int_list#.cons<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -371,7 +371,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"loop_bug.int_list.head<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"loop_bug#.int_list#.head<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -386,7 +386,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"loop_bug.int_list.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"loop_bug#.int_list#.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -405,11 +405,11 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"loop_bug.int_list.nil<0>"() {
+define external fastcc i64 @"loop_bug#.int_list#.nil<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"loop_bug.int_list.tail<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"loop_bug#.int_list#.tail<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -425,7 +425,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"loop_bug.int_list.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"loop_bug#.int_list#.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -445,8 +445,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"loop_bug.int_list.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"loop_bug.int_list.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"loop_bug#.int_list#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"loop_bug#.int_list#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/loop_terminators.exp b/test-cases/final-dump/loop_terminators.exp
index 090d9b9f..ef9fe7ca 100644
--- a/test-cases/final-dump/loop_terminators.exp
+++ b/test-cases/final-dump/loop_terminators.exp
@@ -77,48 +77,48 @@ loop3#cont#1()<{}; {}; {}>:
 ; ModuleID = 'loop_terminators'
 
 source_filename = "!ROOT!/final-dump/loop_terminators.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"lol\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"loop_terminators:14:11\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc i64 @"wybe.string.c_string<0>"(i64)
+declare external fastcc i64 @"wybe#.string#.c_string<0>"(i64)
 declare external ccc void @error_exit(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"loop_terminators.loop0<0>"() {
+define external fastcc void @"loop_terminators#.loop0<0>"() {
   ret void
 }
 
-define external fastcc void @"loop_terminators.loop0#cont#1<0>"() {
+define external fastcc void @"loop_terminators#.loop0#cont#1<0>"() {
   ret void
 }
 
-define external fastcc void @"loop_terminators.loop1<0>"() {
+define external fastcc void @"loop_terminators#.loop1<0>"() {
   ret void
 }
 
-define external fastcc void @"loop_terminators.loop1#cont#1<0>"() {
+define external fastcc void @"loop_terminators#.loop1#cont#1<0>"() {
   ret void
 }
 
-define external fastcc void @"loop_terminators.loop2<0>"() {
+define external fastcc void @"loop_terminators#.loop2<0>"() {
   ret void
 }
 
-define external fastcc void @"loop_terminators.loop2#cont#1<0>"() {
+define external fastcc void @"loop_terminators#.loop2#cont#1<0>"() {
   ret void
 }
 
-define external fastcc void @"loop_terminators.loop3<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+define external fastcc void @"loop_terminators#.loop3<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#1" to i64 ), i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"loop_terminators.loop3#cont#1<0>"() {
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+define external fastcc void @"loop_terminators#.loop3#cont#1<0>"() {
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#1" to i64 ), i64 %"tmp#2##0")
   ret void
 }
diff --git a/test-cases/final-dump/main_hello.exp b/test-cases/final-dump/main_hello.exp
index 2bb4d716..e6af2901 100644
--- a/test-cases/final-dump/main_hello.exp
+++ b/test-cases/final-dump/main_hello.exp
@@ -51,12 +51,12 @@ set_exit_code(code##0:wybe.int)<{}; {<<command_line.exit_code>>}; {}>:
 ; ModuleID = 'command_line'
 
 source_filename = "!ROOT!/../wybelibs/command_line.o"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Erroneous program argument vector\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"command_line:18:15\00", align 8
 
-declare external fastcc {i64, i64, i1} @"wybe.c_array.[|]<0>"(i64)
+declare external fastcc {i64, i64, i1} @"wybe#.c_array#.[|]<0>"(i64)
 declare external ccc void @error_exit(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#command_line.argc" = global i64 undef
@@ -65,9 +65,9 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#command_line.command" = global i64 undef
 @"resource#command_line.exit_code" = global i64 undef
 
-define external fastcc void @"command_line.<0>"() {
+define external fastcc void @"command_line#.<0>"() {
   %"arguments##0" = load i64, ptr @"resource#command_line.arguments"
-  %"tmp#11##0" = tail call fastcc {i64, i64, i1} @"wybe.c_array.[|]<0>"(i64 %"arguments##0")
+  %"tmp#11##0" = tail call fastcc {i64, i64, i1} @"wybe#.c_array#.[|]<0>"(i64 %"arguments##0")
   %"command##1" = extractvalue {i64, i64, i1}%"tmp#11##0", 0
   %"arguments##2" = extractvalue {i64, i64, i1}%"tmp#11##0", 1
   %"tmp#8##0" = extractvalue {i64, i64, i1}%"tmp#11##0", 2
@@ -81,7 +81,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"command_line.set_exit_code<0>"(i64 %"code##0") {
+define external fastcc void @"command_line#.set_exit_code<0>"(i64 %"code##0") {
   store i64 %"code##0", ptr @"resource#command_line.exit_code"
   ret void
 }
@@ -121,7 +121,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'main_hello'
 
 source_filename = "!ROOT!/final-dump/main_hello.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" command line argument(s)\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"hello, world!\00", align 8
@@ -130,20 +130,20 @@ target triple    ????
 
 @"resource#command_line.arguments" = external global i64
 @"resource#command_line.exit_code" = external global i64
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"main_hello.<0>"() {
+define external fastcc void @"main_hello#.<0>"() {
   store i64 42, ptr @"resource#command_line.exit_code"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
   %"arguments##0" = load i64, ptr @"resource#command_line.arguments"
   %"tmp#12##0" = inttoptr i64 %"arguments##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#12##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/main_hello2.exp b/test-cases/final-dump/main_hello2.exp
index 781417e0..8ecafdc9 100644
--- a/test-cases/final-dump/main_hello2.exp
+++ b/test-cases/final-dump/main_hello2.exp
@@ -29,20 +29,20 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'main_hello2'
 
 source_filename = "!ROOT!/final-dump/main_hello2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"hello, \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"world!\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 7, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 6, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"main_hello2.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+define external fastcc void @"main_hello2#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/mainless.exp b/test-cases/final-dump/mainless.exp
index 9154b1bf..c9a920e8 100644
--- a/test-cases/final-dump/mainless.exp
+++ b/test-cases/final-dump/mainless.exp
@@ -25,11 +25,11 @@ nothing_interesting(?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'mainless'
 
 source_filename = "!ROOT!/final-dump/mainless.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"mainless.nothing_interesting<0>"() {
+define external fastcc i64 @"mainless#.nothing_interesting<0>"() {
   ret i64 7
 }
diff --git a/test-cases/final-dump/mangle_llvm_names.exp b/test-cases/final-dump/mangle_llvm_names.exp
new file mode 100644
index 00000000..d0e2c7a9
--- /dev/null
+++ b/test-cases/final-dump/mangle_llvm_names.exp
@@ -0,0 +1,83 @@
+======================================================================
+AFTER EVERYTHING:
+
+
+--------------------------------------------------
+ Module mangle_llvm_names
+  representation  : (not a type)
+  public submods  : 
+  public resources: 
+  public procs    : mangle_llvm_names.<0>
+  imports         : use mangle_llvm_names.foo
+                    use wybe
+  resources       : 
+  submodules      : mangle_llvm_names.foo
+  procs           : 
+
+module top-level code > public {inline,semipure} (0 calls)
+0: mangle_llvm_names.<0>
+()<{}; {}; {}>:
+  AliasPairs: []
+  InterestingCallProperties: []
+    mangle_llvm_names.foo.bar<0> #0 @mangle_llvm_names:nn:nn
+    mangle_llvm_names.foo.bar<0> #1 @mangle_llvm_names:nn:nn
+
+
+proc foo.bar > {noinline} (1 calls)
+0: mangle_llvm_names.foo.bar<0>
+foo.bar()<{}; {}; {}>:
+  AliasPairs: []
+  InterestingCallProperties: []
+
+  LLVM code       :
+
+;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
+; ModuleID = 'mangle_llvm_names'
+
+source_filename = "!ROOT!/final-dump/mangle_llvm_names.wybe"
+target triple   = ????
+
+
+declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
+
+define external fastcc void @"mangle_llvm_names#.<0>"() {
+  tail call fastcc void @"mangle_llvm_names#.foo.bar<0>"()
+  tail call fastcc void @"mangle_llvm_names#.foo#.bar<0>"()
+  ret void
+}
+
+define external fastcc void @"mangle_llvm_names#.foo.bar<0>"() {
+  ret void
+}
+
+--------------------------------------------------
+ Module mangle_llvm_names.foo
+  representation  : (not a type)
+  public submods  : 
+  public resources: 
+  public procs    : mangle_llvm_names.foo.bar<0>
+  imports         : use mangle_llvm_names
+                    use wybe
+  resources       : 
+  procs           : 
+
+proc bar > public {noinline} (0 calls)
+0: mangle_llvm_names.foo.bar<0>
+bar()<{}; {}; {}>:
+  AliasPairs: []
+  InterestingCallProperties: []
+
+  LLVM code       :
+
+;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
+; ModuleID = 'mangle_llvm_names.foo'
+
+source_filename = "!ROOT!/final-dump/mangle_llvm_names.wybe"
+target triple   = ????
+
+
+declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
+
+define external fastcc void @"mangle_llvm_names#.foo#.bar<0>"() {
+  ret void
+}
diff --git a/test-cases/final-dump/mangle_llvm_names.wybe b/test-cases/final-dump/mangle_llvm_names.wybe
new file mode 100644
index 00000000..ccd19b52
--- /dev/null
+++ b/test-cases/final-dump/mangle_llvm_names.wybe
@@ -0,0 +1,12 @@
+module foo {
+    pub def {noinline} bar {
+        pass
+    }
+}
+
+def {noinline} `foo.bar` {
+    pass
+}
+
+`foo.bar`
+foo.bar
\ No newline at end of file
diff --git a/test-cases/final-dump/merged_forks.exp b/test-cases/final-dump/merged_forks.exp
index 4189faa9..b5585c00 100644
--- a/test-cases/final-dump/merged_forks.exp
+++ b/test-cases/final-dump/merged_forks.exp
@@ -245,34 +245,34 @@ not_dense_but_similar(x##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'merged_forks'
 
 source_filename = "!ROOT!/final-dump/merged_forks.wybe"
-target triple    ????
+target triple   = ????
 
 @"array#0" = private unnamed_addr constant [ 2 x i64 ] [i64 2, i64 3]
 @"array#1" = private unnamed_addr constant [ 2 x i64 ] [i64 3, i64 2]
 @"array#2" = private unnamed_addr constant [ 2 x i64 ] [i64 8, i64 1]
 @"array#3" = private unnamed_addr constant [ 2 x i64 ] [i64 9, i64 1]
 
-declare external fastcc i64 @"wybe.bool.fmt<0>"(i1)
-declare external fastcc void @"wybe.bool.print<0>"(i1)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.bool#.fmt<0>"(i1)
+declare external fastcc void @"wybe#.bool#.print<0>"(i1)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"merged_forks.<0>"() {
-  tail call fastcc void @"merged_forks.nested_same_default<0>"(i1 1, i64 0)
-  tail call fastcc void @"merged_forks.nested_same_default<0>"(i1 1, i64 1)
-  tail call fastcc void @"merged_forks.nested_same_default<0>"(i1 1, i64 2)
-  tail call fastcc void @"merged_forks.nested_same_default<0>"(i1 1, i64 3)
-  tail call fastcc void @"merged_forks.nested_same_default<0>"(i1 0, i64 0)
-  tail call fastcc void @"merged_forks.nested_same_default<0>"(i1 0, i64 1)
-  tail call fastcc void @"merged_forks.nested_same_default<0>"(i1 0, i64 2)
-  tail call fastcc void @"merged_forks.nested_same_default<0>"(i1 0, i64 3)
+define external fastcc void @"merged_forks#.<0>"() {
+  tail call fastcc void @"merged_forks#.nested_same_default<0>"(i1 1, i64 0)
+  tail call fastcc void @"merged_forks#.nested_same_default<0>"(i1 1, i64 1)
+  tail call fastcc void @"merged_forks#.nested_same_default<0>"(i1 1, i64 2)
+  tail call fastcc void @"merged_forks#.nested_same_default<0>"(i1 1, i64 3)
+  tail call fastcc void @"merged_forks#.nested_same_default<0>"(i1 0, i64 0)
+  tail call fastcc void @"merged_forks#.nested_same_default<0>"(i1 0, i64 1)
+  tail call fastcc void @"merged_forks#.nested_same_default<0>"(i1 0, i64 2)
+  tail call fastcc void @"merged_forks#.nested_same_default<0>"(i1 0, i64 3)
   ret void
 }
 
-define external fastcc void @"merged_forks.defaulty<0>"(i64 %"x##0") {
+define external fastcc void @"merged_forks#.defaulty<0>"(i64 %"x##0") {
   %"tmp#29##0" = icmp ule i64 %"x##0", 2
   br i1 %"tmp#29##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -285,7 +285,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"merged_forks.leq_2<0>"(i64 %"x##0") {
+define external fastcc void @"merged_forks#.leq_2<0>"(i64 %"x##0") {
   %"tmp#27##0" = icmp ule i64 %"x##0", 2
   %"tmp#30##0" = zext i1 %"tmp#27##0" to i64
   %"tmp#29##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#3", i64 0, i64 %"tmp#30##0"
@@ -295,8 +295,8 @@ define external fastcc void @"merged_forks.leq_2<0>"(i64 %"x##0") {
   ret void
 }
 
-define external fastcc void @"merged_forks.nested<0>"(i1 %"b##0", i64 %"x##0") {
-  tail call fastcc void @"wybe.bool.print<0>"(i1 %"b##0")
+define external fastcc void @"merged_forks#.nested<0>"(i1 %"b##0", i64 %"x##0") {
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 %"b##0")
   %"tmp#55##0" = icmp ule i64 %"x##0", 2
   %"tmp#60##0" = zext i1 %"tmp#55##0" to i64
   %"tmp#59##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#3", i64 0, i64 %"tmp#60##0"
@@ -306,12 +306,12 @@ define external fastcc void @"merged_forks.nested<0>"(i1 %"b##0", i64 %"x##0") {
   ret void
 }
 
-define external fastcc void @"merged_forks.nested_different_default<0>"(i1 %"b##0", i64 %"x##0") {
+define external fastcc void @"merged_forks#.nested_different_default<0>"(i1 %"b##0", i64 %"x##0") {
   br i1 %"b##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.bool.fmt<0>"(i1 1)
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#1##0", i64 1155)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#0##0")
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.bool#.fmt<0>"(i1 1)
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#1##0", i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#0##0")
   %"tmp#7##0" = icmp eq i64 %"x##0", 0
   br i1 %"tmp#7##0", label %if.then.1, label %if.else.1
 if.then.1:
@@ -327,9 +327,9 @@ if.else.1:
   call ccc void @putchar(i8 10)
   ret void
 if.else.0:
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.bool.fmt<0>"(i1 0)
-  %"tmp#3##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#4##0", i64 1155)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#3##0")
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.bool#.fmt<0>"(i1 0)
+  %"tmp#3##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#4##0", i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#3##0")
   %"tmp#9##0" = icmp eq i64 %"x##0", 0
   br i1 %"tmp#9##0", label %if.then.2, label %if.else.2
 if.then.2:
@@ -346,13 +346,13 @@ if.else.2:
   ret void
 }
 
-define external fastcc void @"merged_forks.nested_disjoint_same_default<0>"(i1 %"b##0", i64 %"x##0") {
+define external fastcc void @"merged_forks#.nested_disjoint_same_default<0>"(i1 %"b##0", i64 %"x##0") {
   %"tmp#85##0" = zext i1 %"b##0" to i64
   %"tmp#84##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#0", i64 0, i64 %"tmp#85##0"
   %"tmp#83##0" = load i64, ptr %"tmp#84##0"
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.bool.fmt<0>"(i1 %"b##0")
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#1##0", i64 1155)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#0##0")
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.bool#.fmt<0>"(i1 %"b##0")
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#1##0", i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#0##0")
   switch i64 %"x##0", label %default.switch.0 [
     i64 0, label %case.0.switch.0
     i64 2, label %case.2.switch.0
@@ -380,13 +380,13 @@ default.switch.0:
   ret void
 }
 
-define external fastcc void @"merged_forks.nested_same_default<0>"(i1 %"b##0", i64 %"x##0") {
+define external fastcc void @"merged_forks#.nested_same_default<0>"(i1 %"b##0", i64 %"x##0") {
   %"tmp#61##0" = zext i1 %"b##0" to i64
   %"tmp#60##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#1", i64 0, i64 %"tmp#61##0"
   %"tmp#59##0" = load i64, ptr %"tmp#60##0"
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.bool.fmt<0>"(i1 %"b##0")
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#1##0", i64 1155)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#0##0")
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.bool#.fmt<0>"(i1 %"b##0")
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#1##0", i64 1155)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#0##0")
   %"tmp#7##0" = icmp eq i64 %"x##0", 0
   br i1 %"tmp#7##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -403,7 +403,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"merged_forks.not_dense<0>"(i64 %"x##0") {
+define external fastcc void @"merged_forks#.not_dense<0>"(i64 %"x##0") {
   %"tmp#2##0" = icmp eq i64 %"x##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -420,7 +420,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"merged_forks.not_dense_but_similar<0>"(i64 %"x##0") {
+define external fastcc void @"merged_forks#.not_dense_but_similar<0>"(i64 %"x##0") {
   %"tmp#2##0" = icmp eq i64 %"x##0", 0
   call ccc void @print_int(i64 0)
   call ccc void @putchar(i8 10)
diff --git a/test-cases/final-dump/mixed_fields.exp b/test-cases/final-dump/mixed_fields.exp
index 62f3a3f3..e11d9c52 100644
--- a/test-cases/final-dump/mixed_fields.exp
+++ b/test-cases/final-dump/mixed_fields.exp
@@ -251,16 +251,16 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'mixed_fields'
 
 source_filename = "!ROOT!/final-dump/mixed_fields.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"wybe.bool.print<0>"(i1)
+declare external fastcc void @"wybe#.bool#.print<0>"(i1)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"mixed_fields.<0>"() {
+define external fastcc void @"mixed_fields#.<0>"() {
   %"tmp#14##0" = call ccc ptr @wybe_malloc(i32 32)
   %"tmp#8##0" = ptrtoint ptr %"tmp#14##0" to i64
   %"tmp#15##0" = inttoptr i64 %"tmp#8##0" to ptr
@@ -280,11 +280,11 @@ define external fastcc void @"mixed_fields.<0>"() {
   %"tmp#24##0" = add i64 %"tmp#8##0", 24
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   store i64 17, ptr %"tmp#25##0"
-  tail call fastcc void @"mixed_fields.printit<0>"(i64 %"tmp#8##0")
+  tail call fastcc void @"mixed_fields#.printit<0>"(i64 %"tmp#8##0")
   ret void
 }
 
-define external fastcc i1 @"mixed_fields.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"mixed_fields#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#21##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#f2##0" = load i8, ptr %"tmp#21##0"
   %"tmp#22##0" = add i64 %"#left##0", 1
@@ -348,14 +348,14 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"mixed_fields.f1<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"mixed_fields#.f1<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"mixed_fields.f1<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"mixed_fields#.f1<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 32)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 32, i1 0)
@@ -366,13 +366,13 @@ define external fastcc i64 @"mixed_fields.f1<1>"(i64 %"#rec##0", i64 %"#field##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i8 @"mixed_fields.f2<0>"(i64 %"#rec##0") {
+define external fastcc i8 @"mixed_fields#.f2<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i8, ptr %"tmp#0##0"
   ret i8 %"tmp#1##0"
 }
 
-define external fastcc i64 @"mixed_fields.f2<1>"(i64 %"#rec##0", i8 %"#field##0") {
+define external fastcc i64 @"mixed_fields#.f2<1>"(i64 %"#rec##0", i8 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 32)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 32, i1 0)
@@ -382,14 +382,14 @@ define external fastcc i64 @"mixed_fields.f2<1>"(i64 %"#rec##0", i8 %"#field##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"mixed_fields.f3<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"mixed_fields#.f3<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 16
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"mixed_fields.f3<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"mixed_fields#.f3<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 32)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 32, i1 0)
@@ -400,14 +400,14 @@ define external fastcc i64 @"mixed_fields.f3<1>"(i64 %"#rec##0", i64 %"#field##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"mixed_fields.f4<0>"(i64 %"#rec##0") {
+define external fastcc i1 @"mixed_fields#.f4<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 1
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i1, ptr %"tmp#1##0"
   ret i1 %"tmp#2##0"
 }
 
-define external fastcc i64 @"mixed_fields.f4<1>"(i64 %"#rec##0", i1 %"#field##0") {
+define external fastcc i64 @"mixed_fields#.f4<1>"(i64 %"#rec##0", i1 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 32)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 32, i1 0)
@@ -418,14 +418,14 @@ define external fastcc i64 @"mixed_fields.f4<1>"(i64 %"#rec##0", i1 %"#field##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"mixed_fields.f5<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"mixed_fields#.f5<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 24
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"mixed_fields.f5<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"mixed_fields#.f5<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 32)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 32, i1 0)
@@ -436,14 +436,14 @@ define external fastcc i64 @"mixed_fields.f5<1>"(i64 %"#rec##0", i64 %"#field##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i8 @"mixed_fields.f6<0>"(i64 %"#rec##0") {
+define external fastcc i8 @"mixed_fields#.f6<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 2
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i8, ptr %"tmp#1##0"
   ret i8 %"tmp#2##0"
 }
 
-define external fastcc i64 @"mixed_fields.f6<1>"(i64 %"#rec##0", i8 %"#field##0") {
+define external fastcc i64 @"mixed_fields#.f6<1>"(i64 %"#rec##0", i8 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 32)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 32, i1 0)
@@ -454,7 +454,7 @@ define external fastcc i64 @"mixed_fields.f6<1>"(i64 %"#rec##0", i8 %"#field##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"mixed_fields.mixed<0>"(i64 %"f1##0", i8 %"f2##0", i64 %"f3##0", i1 %"f4##0", i64 %"f5##0", i8 %"f6##0") {
+define external fastcc i64 @"mixed_fields#.mixed<0>"(i64 %"f1##0", i8 %"f2##0", i64 %"f3##0", i1 %"f4##0", i64 %"f5##0", i8 %"f6##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 32)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -477,7 +477,7 @@ define external fastcc i64 @"mixed_fields.mixed<0>"(i64 %"f1##0", i8 %"f2##0", i
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i8, i64, i1, i64, i8} @"mixed_fields.mixed<1>"(i64 %"#result##0") {
+define external fastcc {i64, i8, i64, i1, i64, i8} @"mixed_fields#.mixed<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i8, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 1
@@ -504,7 +504,7 @@ define external fastcc {i64, i8, i64, i1, i64, i8} @"mixed_fields.mixed<1>"(i64
   ret {i64, i8, i64, i1, i64, i8} %"tmp#22##0"
 }
 
-define external fastcc void @"mixed_fields.printit<0>"(i64 %"ob##0") {
+define external fastcc void @"mixed_fields#.printit<0>"(i64 %"ob##0") {
   %"tmp#35##0" = add i64 %"ob##0", 8
   %"tmp#36##0" = inttoptr i64 %"tmp#35##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#36##0"
@@ -522,7 +522,7 @@ define external fastcc void @"mixed_fields.printit<0>"(i64 %"ob##0") {
   %"tmp#40##0" = add i64 %"ob##0", 1
   %"tmp#41##0" = inttoptr i64 %"tmp#40##0" to ptr
   %"tmp#3##0" = load i1, ptr %"tmp#41##0"
-  tail call fastcc void @"wybe.bool.print<0>"(i1 %"tmp#3##0")
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 %"tmp#3##0")
   call ccc void @putchar(i8 10)
   %"tmp#42##0" = add i64 %"ob##0", 24
   %"tmp#43##0" = inttoptr i64 %"tmp#42##0" to ptr
@@ -537,8 +537,8 @@ define external fastcc void @"mixed_fields.printit<0>"(i64 %"ob##0") {
   ret void
 }
 
-define external fastcc i1 @"mixed_fields.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"mixed_fields.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"mixed_fields#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"mixed_fields#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/mod1.exp b/test-cases/final-dump/mod1.exp
index 7310346d..b6d0051a 100644
--- a/test-cases/final-dump/mod1.exp
+++ b/test-cases/final-dump/mod1.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mod1'
 
 source_filename = "!ROOT!/final-dump/mod1.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/mod2.exp b/test-cases/final-dump/mod2.exp
index 07ec5807..0b3e897a 100644
--- a/test-cases/final-dump/mod2.exp
+++ b/test-cases/final-dump/mod2.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mod2'
 
 source_filename = "!ROOT!/final-dump/mod2.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/mod3.exp b/test-cases/final-dump/mod3.exp
index cff41fa7..1848103d 100644
--- a/test-cases/final-dump/mod3.exp
+++ b/test-cases/final-dump/mod3.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mod3'
 
 source_filename = "!ROOT!/final-dump/mod3.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/mod4.exp b/test-cases/final-dump/mod4.exp
index 7bc6fe03..ca52f540 100644
--- a/test-cases/final-dump/mod4.exp
+++ b/test-cases/final-dump/mod4.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mod4'
 
 source_filename = "!ROOT!/final-dump/mod4.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/mod5.exp b/test-cases/final-dump/mod5.exp
index cb3a2a68..801abf55 100644
--- a/test-cases/final-dump/mod5.exp
+++ b/test-cases/final-dump/mod5.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mod5'
 
 source_filename = "!ROOT!/final-dump/mod5.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/mod6.exp b/test-cases/final-dump/mod6.exp
index e31e996c..46dbd194 100644
--- a/test-cases/final-dump/mod6.exp
+++ b/test-cases/final-dump/mod6.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mod6'
 
 source_filename = "!ROOT!/final-dump/mod6.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/mod7.exp b/test-cases/final-dump/mod7.exp
index afead05d..2d9c93e0 100644
--- a/test-cases/final-dump/mod7.exp
+++ b/test-cases/final-dump/mod7.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mod7'
 
 source_filename = "!ROOT!/final-dump/mod7.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/mod8.exp b/test-cases/final-dump/mod8.exp
index ee7b9b3c..c30e3088 100644
--- a/test-cases/final-dump/mod8.exp
+++ b/test-cases/final-dump/mod8.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mod8'
 
 source_filename = "!ROOT!/final-dump/mod8.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/multi_out.exp b/test-cases/final-dump/multi_out.exp
index 0db11eb1..b6d17725 100644
--- a/test-cases/final-dump/multi_out.exp
+++ b/test-cases/final-dump/multi_out.exp
@@ -35,16 +35,16 @@ onetwothree(?x##0:wybe.int, ?y##0:wybe.int, ?z##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'multi_out'
 
 source_filename = "!ROOT!/final-dump/multi_out.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"multi_out.<0>"() {
+define external fastcc void @"multi_out#.<0>"() {
   ret void
 }
 
-define external fastcc {i64, i64, i64} @"multi_out.onetwothree<0>"() {
+define external fastcc {i64, i64, i64} @"multi_out#.onetwothree<0>"() {
   %"tmp#0##0" = insertvalue {i64, i64, i64} undef, i64 1, 0
   %"tmp#1##0" = insertvalue {i64, i64, i64} %"tmp#0##0", i64 2, 1
   %"tmp#2##0" = insertvalue {i64, i64, i64} %"tmp#1##0", i64 3, 2
diff --git a/test-cases/final-dump/multi_specz.exp b/test-cases/final-dump/multi_specz.exp
index 06216c4f..99a14638 100644
--- a/test-cases/final-dump/multi_specz.exp
+++ b/test-cases/final-dump/multi_specz.exp
@@ -131,26 +131,26 @@ modifyAndPrint(pos##0:position.position, v##0:wybe.int)<{<<wybe.io.io>>}; {<<wyb
 ; ModuleID = 'multi_specz'
 
 source_filename = "!ROOT!/final-dump/multi_specz.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"-------------\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"=============\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 13, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 13, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"multi_specz.<0>"() {
-  tail call fastcc void @"multi_specz.bar1<0>"()
-  tail call fastcc void @"multi_specz.bar2<0>"()
+define external fastcc void @"multi_specz#.<0>"() {
+  tail call fastcc void @"multi_specz#.bar1<0>"()
+  tail call fastcc void @"multi_specz#.bar2<0>"()
   ret void
 }
 
-define external fastcc void @"multi_specz.bar1<0>"() {
+define external fastcc void @"multi_specz#.bar1<0>"() {
   %"tmp#29##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#6##0" = ptrtoint ptr %"tmp#29##0" to i64
   %"tmp#30##0" = inttoptr i64 %"tmp#6##0" to ptr
@@ -179,19 +179,19 @@ define external fastcc void @"multi_specz.bar1<0>"() {
   %"tmp#43##0" = add i64 %"tmp#18##0", 8
   %"tmp#44##0" = inttoptr i64 %"tmp#43##0" to ptr
   store i64 4, ptr %"tmp#44##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"multi_specz.foo<0>[7477e50a09]"(i64 %"tmp#6##0", i64 %"tmp#10##0", i64 %"tmp#14##0", i64 %"tmp#18##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"multi_specz#.foo<0>[7477e50a09]"(i64 %"tmp#6##0", i64 %"tmp#10##0", i64 %"tmp#14##0", i64 %"tmp#18##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#14##0")
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#18##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#14##0")
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#18##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"multi_specz.bar2<0>"() {
+define external fastcc void @"multi_specz#.bar2<0>"() {
   %"tmp#29##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#6##0" = ptrtoint ptr %"tmp#29##0" to i64
   %"tmp#30##0" = inttoptr i64 %"tmp#6##0" to ptr
@@ -220,51 +220,51 @@ define external fastcc void @"multi_specz.bar2<0>"() {
   %"tmp#43##0" = add i64 %"tmp#18##0", 8
   %"tmp#44##0" = inttoptr i64 %"tmp#43##0" to ptr
   store i64 4, ptr %"tmp#44##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"multi_specz.foo<0>"(i64 %"tmp#6##0", i64 %"tmp#10##0", i64 %"tmp#14##0", i64 %"tmp#18##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"multi_specz#.foo<0>"(i64 %"tmp#6##0", i64 %"tmp#10##0", i64 %"tmp#14##0", i64 %"tmp#18##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#6##0")
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#10##0")
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#14##0")
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#18##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#6##0")
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#10##0")
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#14##0")
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#18##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"multi_specz.foo<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0") {
-  tail call fastcc void @"multi_specz.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
+define external fastcc void @"multi_specz#.foo<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0") {
+  tail call fastcc void @"multi_specz#.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz#.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz#.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz#.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
   ret void
 }
 
-define external fastcc void @"multi_specz.foo<0>[7477e50a09]"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0") {
-  tail call fastcc void @"multi_specz.modifyAndPrint<0>[410bae77d3]"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz.modifyAndPrint<0>[410bae77d3]"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
+define external fastcc void @"multi_specz#.foo<0>[7477e50a09]"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0") {
+  tail call fastcc void @"multi_specz#.modifyAndPrint<0>[410bae77d3]"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz#.modifyAndPrint<0>[410bae77d3]"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz#.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz#.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
   ret void
 }
 
-define external fastcc void @"multi_specz.modifyAndPrint<0>"(i64 %"pos##0", i64 %"v##0") {
+define external fastcc void @"multi_specz#.modifyAndPrint<0>"(i64 %"pos##0", i64 %"v##0") {
   %"tmp#2##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#3##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#3##0", ptr %"tmp#2##0", i64 16, i1 0)
   %"tmp#4##0" = ptrtoint ptr %"tmp#3##0" to i64
   %"tmp#5##0" = inttoptr i64 %"tmp#4##0" to ptr
   store i64 %"v##0", ptr %"tmp#5##0"
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#4##0")
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#4##0")
   ret void
 }
 
-define external fastcc void @"multi_specz.modifyAndPrint<0>[410bae77d3]"(i64 %"pos##0", i64 %"v##0") {
+define external fastcc void @"multi_specz#.modifyAndPrint<0>[410bae77d3]"(i64 %"pos##0", i64 %"v##0") {
   %"tmp#2##0" = inttoptr i64 %"pos##0" to ptr
   store i64 %"v##0", ptr %"tmp#2##0"
-  tail call fastcc void @"position.printPosition<0>"(i64 %"pos##0")
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"pos##0")
   ret void
 }
 
@@ -315,28 +315,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -449,13 +449,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -475,7 +475,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -486,7 +486,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -497,13 +497,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -513,14 +513,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -531,7 +531,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/multi_specz_cyclic_exe.exp b/test-cases/final-dump/multi_specz_cyclic_exe.exp
index 08d3ce16..a398eb19 100644
--- a/test-cases/final-dump/multi_specz_cyclic_exe.exp
+++ b/test-cases/final-dump/multi_specz_cyclic_exe.exp
@@ -62,26 +62,26 @@ main()<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'multi_specz_cyclic_exe'
 
 source_filename = "!ROOT!/final-dump/multi_specz_cyclic_exe.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"-------------\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"=============\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 13, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 13, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"multi_specz_cyclic_lib.foo1<0>[7477e50a09]"(i64, i64, i64, i64, i64)
-declare external fastcc void @"multi_specz_cyclic_lib.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.foo1<0>[7477e50a09]"(i64, i64, i64, i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"multi_specz_cyclic_exe.<0>"() {
-  tail call fastcc void @"multi_specz_cyclic_exe.main<0>"()
+define external fastcc void @"multi_specz_cyclic_exe#.<0>"() {
+  tail call fastcc void @"multi_specz_cyclic_exe#.main<0>"()
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_exe.main<0>"() {
+define external fastcc void @"multi_specz_cyclic_exe#.main<0>"() {
   %"tmp#29##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#6##0" = ptrtoint ptr %"tmp#29##0" to i64
   %"tmp#30##0" = inttoptr i64 %"tmp#6##0" to ptr
@@ -110,14 +110,14 @@ define external fastcc void @"multi_specz_cyclic_exe.main<0>"() {
   %"tmp#43##0" = add i64 %"tmp#18##0", 8
   %"tmp#44##0" = inttoptr i64 %"tmp#43##0" to ptr
   store i64 4, ptr %"tmp#44##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"multi_specz_cyclic_lib.foo1<0>[7477e50a09]"(i64 %"tmp#6##0", i64 %"tmp#10##0", i64 %"tmp#14##0", i64 %"tmp#18##0", i64 3)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"multi_specz_cyclic_lib#.foo1<0>[7477e50a09]"(i64 %"tmp#6##0", i64 %"tmp#10##0", i64 %"tmp#14##0", i64 %"tmp#18##0", i64 3)
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"multi_specz_cyclic_lib.printPosition<0>"(i64 %"tmp#14##0")
-  tail call fastcc void @"multi_specz_cyclic_lib.printPosition<0>"(i64 %"tmp#18##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"multi_specz_cyclic_lib#.printPosition<0>"(i64 %"tmp#14##0")
+  tail call fastcc void @"multi_specz_cyclic_lib#.printPosition<0>"(i64 %"tmp#18##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -231,95 +231,95 @@ printPosition(pos##0:multi_specz_cyclic_lib.position)<{<<wybe.io.io>>}; {<<wybe.
 ; ModuleID = 'multi_specz_cyclic_lib'
 
 source_filename = "!ROOT!/final-dump/multi_specz_cyclic_lib.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"multi_specz_cyclic_lib2.foo2<0>"(i64, i64, i64, i64, i64)
-declare external fastcc void @"multi_specz_cyclic_lib2.foo2<0>[d4b0b4930c]"(i64, i64, i64, i64, i64)
-declare external fastcc void @"multi_specz_cyclic_lib2.foo2<0>[ff3a297a4f]"(i64, i64, i64, i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"multi_specz_cyclic_lib2#.foo2<0>"(i64, i64, i64, i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib2#.foo2<0>[d4b0b4930c]"(i64, i64, i64, i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib2#.foo2<0>[ff3a297a4f]"(i64, i64, i64, i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"multi_specz_cyclic_lib.foo1<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
+define external fastcc void @"multi_specz_cyclic_lib#.foo1<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = icmp slt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
   ret void
 if.else.0:
-  tail call fastcc void @"multi_specz_cyclic_lib2.foo2<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
+  tail call fastcc void @"multi_specz_cyclic_lib2#.foo2<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib.foo1<0>[7477e50a09]"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
+define external fastcc void @"multi_specz_cyclic_lib#.foo1<0>[7477e50a09]"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = icmp slt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>[410bae77d3]"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>[410bae77d3]"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>[410bae77d3]"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>[410bae77d3]"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
   ret void
 if.else.0:
-  tail call fastcc void @"multi_specz_cyclic_lib2.foo2<0>[d4b0b4930c]"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
+  tail call fastcc void @"multi_specz_cyclic_lib2#.foo2<0>[d4b0b4930c]"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib.foo1<0>[29a1d4275b]"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
+define external fastcc void @"multi_specz_cyclic_lib#.foo1<0>[29a1d4275b]"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = icmp slt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>[410bae77d3]"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>[410bae77d3]"(i64 %"x4##0", i64 444)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>[410bae77d3]"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>[410bae77d3]"(i64 %"x4##0", i64 444)
   ret void
 if.else.0:
-  tail call fastcc void @"multi_specz_cyclic_lib2.foo2<0>[ff3a297a4f]"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
+  tail call fastcc void @"multi_specz_cyclic_lib2#.foo2<0>[ff3a297a4f]"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"pos##0", i64 %"v##0") {
+define external fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"pos##0", i64 %"v##0") {
   %"tmp#2##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#3##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#3##0", ptr %"tmp#2##0", i64 16, i1 0)
   %"tmp#4##0" = ptrtoint ptr %"tmp#3##0" to i64
   %"tmp#5##0" = inttoptr i64 %"tmp#4##0" to ptr
   store i64 %"v##0", ptr %"tmp#5##0"
-  tail call fastcc void @"multi_specz_cyclic_lib.printPosition<0>"(i64 %"tmp#4##0")
+  tail call fastcc void @"multi_specz_cyclic_lib#.printPosition<0>"(i64 %"tmp#4##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>[410bae77d3]"(i64 %"pos##0", i64 %"v##0") {
+define external fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>[410bae77d3]"(i64 %"pos##0", i64 %"v##0") {
   %"tmp#2##0" = inttoptr i64 %"pos##0" to ptr
   store i64 %"v##0", ptr %"tmp#2##0"
-  tail call fastcc void @"multi_specz_cyclic_lib.printPosition<0>"(i64 %"pos##0")
+  tail call fastcc void @"multi_specz_cyclic_lib#.printPosition<0>"(i64 %"pos##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"multi_specz_cyclic_lib#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -432,13 +432,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multi_specz_cyclic_lib.position'
 
 source_filename = "!ROOT!/final-dump/multi_specz_cyclic_lib.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multi_specz_cyclic_lib.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multi_specz_cyclic_lib#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -458,7 +458,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -469,7 +469,7 @@ define external fastcc i64 @"multi_specz_cyclic_lib.position.position<0>"(i64 %"
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"multi_specz_cyclic_lib.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"multi_specz_cyclic_lib#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -480,13 +480,13 @@ define external fastcc {i64, i64} @"multi_specz_cyclic_lib.position.position<1>"
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -496,14 +496,14 @@ define external fastcc i64 @"multi_specz_cyclic_lib.position.x<1>"(i64 %"#rec##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -514,7 +514,7 @@ define external fastcc i64 @"multi_specz_cyclic_lib.position.y<1>"(i64 %"#rec##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"multi_specz_cyclic_lib.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multi_specz_cyclic_lib#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
@@ -599,57 +599,57 @@ foo2(x1##0:multi_specz_cyclic_lib.position, x2##0:multi_specz_cyclic_lib.positio
 ; ModuleID = 'multi_specz_cyclic_lib2'
 
 source_filename = "!ROOT!/final-dump/multi_specz_cyclic_lib2.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"multi_specz_cyclic_lib.foo1<0>"(i64, i64, i64, i64, i64)
-declare external fastcc void @"multi_specz_cyclic_lib.foo1<0>[29a1d4275b]"(i64, i64, i64, i64, i64)
-declare external fastcc void @"multi_specz_cyclic_lib.foo1<0>[7477e50a09]"(i64, i64, i64, i64, i64)
-declare external fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64, i64)
-declare external fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>[410bae77d3]"(i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.foo1<0>"(i64, i64, i64, i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.foo1<0>[29a1d4275b]"(i64, i64, i64, i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.foo1<0>[7477e50a09]"(i64, i64, i64, i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>[410bae77d3]"(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"multi_specz_cyclic_lib2.foo2<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
+define external fastcc void @"multi_specz_cyclic_lib2#.foo2<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = icmp slt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
   ret void
 if.else.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.foo1<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
+  tail call fastcc void @"multi_specz_cyclic_lib#.foo1<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib2.foo2<0>[d4b0b4930c]"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
+define external fastcc void @"multi_specz_cyclic_lib2#.foo2<0>[d4b0b4930c]"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = icmp slt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>[410bae77d3]"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>[410bae77d3]"(i64 %"x4##0", i64 444)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>[410bae77d3]"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>[410bae77d3]"(i64 %"x4##0", i64 444)
   ret void
 if.else.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.foo1<0>[29a1d4275b]"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
+  tail call fastcc void @"multi_specz_cyclic_lib#.foo1<0>[29a1d4275b]"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib2.foo2<0>[ff3a297a4f]"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
+define external fastcc void @"multi_specz_cyclic_lib2#.foo2<0>[ff3a297a4f]"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = icmp slt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>[410bae77d3]"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>[410bae77d3]"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>[410bae77d3]"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>[410bae77d3]"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
   ret void
 if.else.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.foo1<0>[7477e50a09]"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
+  tail call fastcc void @"multi_specz_cyclic_lib#.foo1<0>[7477e50a09]"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
   ret void
 }
diff --git a/test-cases/final-dump/multi_specz_cyclic_lib.exp b/test-cases/final-dump/multi_specz_cyclic_lib.exp
index dad50359..452f779c 100644
--- a/test-cases/final-dump/multi_specz_cyclic_lib.exp
+++ b/test-cases/final-dump/multi_specz_cyclic_lib.exp
@@ -81,56 +81,56 @@ printPosition(pos##0:multi_specz_cyclic_lib.position)<{<<wybe.io.io>>}; {<<wybe.
 ; ModuleID = 'multi_specz_cyclic_lib'
 
 source_filename = "!ROOT!/final-dump/multi_specz_cyclic_lib.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"multi_specz_cyclic_lib2.foo2<0>"(i64, i64, i64, i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"multi_specz_cyclic_lib2#.foo2<0>"(i64, i64, i64, i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"multi_specz_cyclic_lib.foo1<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
+define external fastcc void @"multi_specz_cyclic_lib#.foo1<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = icmp slt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
   ret void
 if.else.0:
-  tail call fastcc void @"multi_specz_cyclic_lib2.foo2<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
+  tail call fastcc void @"multi_specz_cyclic_lib2#.foo2<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"pos##0", i64 %"v##0") {
+define external fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"pos##0", i64 %"v##0") {
   %"tmp#2##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#3##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#3##0", ptr %"tmp#2##0", i64 16, i1 0)
   %"tmp#4##0" = ptrtoint ptr %"tmp#3##0" to i64
   %"tmp#5##0" = inttoptr i64 %"tmp#4##0" to ptr
   store i64 %"v##0", ptr %"tmp#5##0"
-  tail call fastcc void @"multi_specz_cyclic_lib.printPosition<0>"(i64 %"tmp#4##0")
+  tail call fastcc void @"multi_specz_cyclic_lib#.printPosition<0>"(i64 %"tmp#4##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"multi_specz_cyclic_lib#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -243,13 +243,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multi_specz_cyclic_lib.position'
 
 source_filename = "!ROOT!/final-dump/multi_specz_cyclic_lib.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multi_specz_cyclic_lib.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multi_specz_cyclic_lib#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -269,7 +269,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -280,7 +280,7 @@ define external fastcc i64 @"multi_specz_cyclic_lib.position.position<0>"(i64 %"
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"multi_specz_cyclic_lib.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"multi_specz_cyclic_lib#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -291,13 +291,13 @@ define external fastcc {i64, i64} @"multi_specz_cyclic_lib.position.position<1>"
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -307,14 +307,14 @@ define external fastcc i64 @"multi_specz_cyclic_lib.position.x<1>"(i64 %"#rec##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -325,7 +325,7 @@ define external fastcc i64 @"multi_specz_cyclic_lib.position.y<1>"(i64 %"#rec##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"multi_specz_cyclic_lib.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multi_specz_cyclic_lib#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
@@ -383,24 +383,24 @@ foo2(x1##0:multi_specz_cyclic_lib.position, x2##0:multi_specz_cyclic_lib.positio
 ; ModuleID = 'multi_specz_cyclic_lib2'
 
 source_filename = "!ROOT!/final-dump/multi_specz_cyclic_lib2.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"multi_specz_cyclic_lib.foo1<0>"(i64, i64, i64, i64, i64)
-declare external fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.foo1<0>"(i64, i64, i64, i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"multi_specz_cyclic_lib2.foo2<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
+define external fastcc void @"multi_specz_cyclic_lib2#.foo2<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = icmp slt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
   ret void
 if.else.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.foo1<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
+  tail call fastcc void @"multi_specz_cyclic_lib#.foo1<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
   ret void
 }
diff --git a/test-cases/final-dump/multi_specz_cyclic_lib2.exp b/test-cases/final-dump/multi_specz_cyclic_lib2.exp
index dad50359..452f779c 100644
--- a/test-cases/final-dump/multi_specz_cyclic_lib2.exp
+++ b/test-cases/final-dump/multi_specz_cyclic_lib2.exp
@@ -81,56 +81,56 @@ printPosition(pos##0:multi_specz_cyclic_lib.position)<{<<wybe.io.io>>}; {<<wybe.
 ; ModuleID = 'multi_specz_cyclic_lib'
 
 source_filename = "!ROOT!/final-dump/multi_specz_cyclic_lib.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"multi_specz_cyclic_lib2.foo2<0>"(i64, i64, i64, i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"multi_specz_cyclic_lib2#.foo2<0>"(i64, i64, i64, i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"multi_specz_cyclic_lib.foo1<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
+define external fastcc void @"multi_specz_cyclic_lib#.foo1<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = icmp slt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
   ret void
 if.else.0:
-  tail call fastcc void @"multi_specz_cyclic_lib2.foo2<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
+  tail call fastcc void @"multi_specz_cyclic_lib2#.foo2<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"pos##0", i64 %"v##0") {
+define external fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"pos##0", i64 %"v##0") {
   %"tmp#2##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#3##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#3##0", ptr %"tmp#2##0", i64 16, i1 0)
   %"tmp#4##0" = ptrtoint ptr %"tmp#3##0" to i64
   %"tmp#5##0" = inttoptr i64 %"tmp#4##0" to ptr
   store i64 %"v##0", ptr %"tmp#5##0"
-  tail call fastcc void @"multi_specz_cyclic_lib.printPosition<0>"(i64 %"tmp#4##0")
+  tail call fastcc void @"multi_specz_cyclic_lib#.printPosition<0>"(i64 %"tmp#4##0")
   ret void
 }
 
-define external fastcc void @"multi_specz_cyclic_lib.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"multi_specz_cyclic_lib#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -243,13 +243,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multi_specz_cyclic_lib.position'
 
 source_filename = "!ROOT!/final-dump/multi_specz_cyclic_lib.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multi_specz_cyclic_lib.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multi_specz_cyclic_lib#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -269,7 +269,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -280,7 +280,7 @@ define external fastcc i64 @"multi_specz_cyclic_lib.position.position<0>"(i64 %"
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"multi_specz_cyclic_lib.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"multi_specz_cyclic_lib#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -291,13 +291,13 @@ define external fastcc {i64, i64} @"multi_specz_cyclic_lib.position.position<1>"
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -307,14 +307,14 @@ define external fastcc i64 @"multi_specz_cyclic_lib.position.x<1>"(i64 %"#rec##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"multi_specz_cyclic_lib.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"multi_specz_cyclic_lib#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -325,7 +325,7 @@ define external fastcc i64 @"multi_specz_cyclic_lib.position.y<1>"(i64 %"#rec##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"multi_specz_cyclic_lib.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multi_specz_cyclic_lib#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
@@ -383,24 +383,24 @@ foo2(x1##0:multi_specz_cyclic_lib.position, x2##0:multi_specz_cyclic_lib.positio
 ; ModuleID = 'multi_specz_cyclic_lib2'
 
 source_filename = "!ROOT!/final-dump/multi_specz_cyclic_lib2.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"multi_specz_cyclic_lib.foo1<0>"(i64, i64, i64, i64, i64)
-declare external fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.foo1<0>"(i64, i64, i64, i64, i64)
+declare external fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"multi_specz_cyclic_lib2.foo2<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
+define external fastcc void @"multi_specz_cyclic_lib2#.foo2<0>"(i64 %"x1##0", i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = icmp slt i64 %"tmp#0##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
-  tail call fastcc void @"multi_specz_cyclic_lib.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x1##0", i64 111)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x2##0", i64 222)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x3##0", i64 333)
+  tail call fastcc void @"multi_specz_cyclic_lib#.modifyAndPrint<0>"(i64 %"x4##0", i64 444)
   ret void
 if.else.0:
-  tail call fastcc void @"multi_specz_cyclic_lib.foo1<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
+  tail call fastcc void @"multi_specz_cyclic_lib#.foo1<0>"(i64 %"x2##0", i64 %"x3##0", i64 %"x4##0", i64 %"x1##0", i64 %"tmp#0##0")
   ret void
 }
diff --git a/test-cases/final-dump/multictr.exp b/test-cases/final-dump/multictr.exp
index d745574f..d23d43ad 100644
--- a/test-cases/final-dump/multictr.exp
+++ b/test-cases/final-dump/multictr.exp
@@ -186,7 +186,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'multictr'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -288,17 +288,17 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr.card'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr.card.=<0>"(i6 %"#left##0", i6 %"#right##0") {
+define external fastcc i1 @"multictr#.card#.=<0>"(i6 %"#left##0", i6 %"#right##0") {
   %"tmp#1##0" = icmp eq i6 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i6 @"multictr.card.card<0>"(i4 %"rank##0", i2 %"suit##0") {
+define external fastcc i6 @"multictr#.card#.card<0>"(i4 %"rank##0", i2 %"suit##0") {
   %"#temp##0" = zext i4 %"rank##0" to i6
   %"#temp##1" = shl i6 %"#temp##0", 2
   %"#temp##2" = zext i2 %"suit##0" to i6
@@ -306,7 +306,7 @@ define external fastcc i6 @"multictr.card.card<0>"(i4 %"rank##0", i2 %"suit##0")
   ret i6 %"tmp#0##0"
 }
 
-define external fastcc {i4, i2} @"multictr.card.card<1>"(i6 %"#result##0") {
+define external fastcc {i4, i2} @"multictr#.card#.card<1>"(i6 %"#result##0") {
   %"#temp##0" = lshr i6 %"#result##0", 2
   %"#temp2##0" = and i6 %"#temp##0", 15
   %"tmp#0##0" = trunc i6 %"#temp2##0" to i4
@@ -317,14 +317,14 @@ define external fastcc {i4, i2} @"multictr.card.card<1>"(i6 %"#result##0") {
   ret {i4, i2} %"tmp#3##0"
 }
 
-define external fastcc i4 @"multictr.card.rank<0>"(i6 %"#rec##0") {
+define external fastcc i4 @"multictr#.card#.rank<0>"(i6 %"#rec##0") {
   %"#rec##1" = lshr i6 %"#rec##0", 2
   %"#field##0" = and i6 %"#rec##1", 15
   %"tmp#0##0" = trunc i6 %"#field##0" to i4
   ret i4 %"tmp#0##0"
 }
 
-define external fastcc i6 @"multictr.card.rank<1>"(i6 %"#rec##0", i4 %"#field##0") {
+define external fastcc i6 @"multictr#.card#.rank<1>"(i6 %"#rec##0", i4 %"#field##0") {
   %"#rec##1" = and i6 %"#rec##0", -61
   %"#temp##0" = zext i4 %"#field##0" to i6
   %"#temp##1" = shl i6 %"#temp##0", 2
@@ -332,20 +332,20 @@ define external fastcc i6 @"multictr.card.rank<1>"(i6 %"#rec##0", i4 %"#field##0
   ret i6 %"tmp#0##0"
 }
 
-define external fastcc i2 @"multictr.card.suit<0>"(i6 %"#rec##0") {
+define external fastcc i2 @"multictr#.card#.suit<0>"(i6 %"#rec##0") {
   %"#field##0" = and i6 %"#rec##0", 3
   %"tmp#0##0" = trunc i6 %"#field##0" to i2
   ret i2 %"tmp#0##0"
 }
 
-define external fastcc i6 @"multictr.card.suit<1>"(i6 %"#rec##0", i2 %"#field##0") {
+define external fastcc i6 @"multictr#.card#.suit<1>"(i6 %"#rec##0", i2 %"#field##0") {
   %"#rec##1" = and i6 %"#rec##0", -4
   %"#temp##0" = zext i2 %"#field##0" to i6
   %"tmp#0##0" = or i6 %"#rec##1", %"#temp##0"
   ret i6 %"tmp#0##0"
 }
 
-define external fastcc i1 @"multictr.card.~=<0>"(i6 %"#left##0", i6 %"#right##0") {
+define external fastcc i1 @"multictr#.card#.~=<0>"(i6 %"#left##0", i6 %"#right##0") {
   %"tmp#0##0" = icmp eq i6 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -2646,13 +2646,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr.complicated'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr.complicated.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multictr#.complicated#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp uge i64 %"#left##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3133,11 +3133,11 @@ if.else.0:
   ret i1 %"tmp#393##0"
 }
 
-define external fastcc i64 @"multictr.complicated.autumn<0>"() {
+define external fastcc i64 @"multictr#.complicated#.autumn<0>"() {
   ret i64 3
 }
 
-define external fastcc i64 @"multictr.complicated.c01<0>"(i64 %"f01##0") {
+define external fastcc i64 @"multictr#.complicated#.c01<0>"(i64 %"f01##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3145,7 +3145,7 @@ define external fastcc i64 @"multictr.complicated.c01<0>"(i64 %"f01##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c01<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c01<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3169,7 +3169,7 @@ if.else.0:
   ret {i64, i1} %"tmp#11##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c02<0>"(i64 %"f02##0") {
+define external fastcc i64 @"multictr#.complicated#.c02<0>"(i64 %"f02##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3178,7 +3178,7 @@ define external fastcc i64 @"multictr.complicated.c02<0>"(i64 %"f02##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c02<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c02<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3203,7 +3203,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c03<0>"(i64 %"f03##0") {
+define external fastcc i64 @"multictr#.complicated#.c03<0>"(i64 %"f03##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3212,7 +3212,7 @@ define external fastcc i64 @"multictr.complicated.c03<0>"(i64 %"f03##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c03<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c03<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3237,7 +3237,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c04<0>"(i64 %"f04##0") {
+define external fastcc i64 @"multictr#.complicated#.c04<0>"(i64 %"f04##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3246,7 +3246,7 @@ define external fastcc i64 @"multictr.complicated.c04<0>"(i64 %"f04##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c04<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c04<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3271,7 +3271,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c05<0>"(i64 %"f05##0") {
+define external fastcc i64 @"multictr#.complicated#.c05<0>"(i64 %"f05##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3280,7 +3280,7 @@ define external fastcc i64 @"multictr.complicated.c05<0>"(i64 %"f05##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c05<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c05<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3305,7 +3305,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c06<0>"(i64 %"f06##0") {
+define external fastcc i64 @"multictr#.complicated#.c06<0>"(i64 %"f06##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3314,7 +3314,7 @@ define external fastcc i64 @"multictr.complicated.c06<0>"(i64 %"f06##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c06<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c06<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3339,7 +3339,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c07<0>"(i64 %"f07##0") {
+define external fastcc i64 @"multictr#.complicated#.c07<0>"(i64 %"f07##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3348,7 +3348,7 @@ define external fastcc i64 @"multictr.complicated.c07<0>"(i64 %"f07##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c07<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c07<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3373,7 +3373,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c08<0>"(i64 %"f08##0") {
+define external fastcc i64 @"multictr#.complicated#.c08<0>"(i64 %"f08##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3385,7 +3385,7 @@ define external fastcc i64 @"multictr.complicated.c08<0>"(i64 %"f08##0") {
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c08<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c08<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3420,7 +3420,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c09<0>"(i64 %"f09##0") {
+define external fastcc i64 @"multictr#.complicated#.c09<0>"(i64 %"f09##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3432,7 +3432,7 @@ define external fastcc i64 @"multictr.complicated.c09<0>"(i64 %"f09##0") {
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c09<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c09<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3467,7 +3467,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c10<0>"(i64 %"f10##0") {
+define external fastcc i64 @"multictr#.complicated#.c10<0>"(i64 %"f10##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3479,7 +3479,7 @@ define external fastcc i64 @"multictr.complicated.c10<0>"(i64 %"f10##0") {
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c10<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c10<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3514,7 +3514,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c11<0>"(i64 %"f11##0") {
+define external fastcc i64 @"multictr#.complicated#.c11<0>"(i64 %"f11##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3526,7 +3526,7 @@ define external fastcc i64 @"multictr.complicated.c11<0>"(i64 %"f11##0") {
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c11<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c11<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3561,7 +3561,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c12<0>"(i64 %"f12##0") {
+define external fastcc i64 @"multictr#.complicated#.c12<0>"(i64 %"f12##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3573,7 +3573,7 @@ define external fastcc i64 @"multictr.complicated.c12<0>"(i64 %"f12##0") {
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c12<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c12<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3608,7 +3608,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c13<0>"(i64 %"f13##0") {
+define external fastcc i64 @"multictr#.complicated#.c13<0>"(i64 %"f13##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3620,7 +3620,7 @@ define external fastcc i64 @"multictr.complicated.c13<0>"(i64 %"f13##0") {
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c13<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c13<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3655,7 +3655,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c14<0>"(i64 %"f14##0") {
+define external fastcc i64 @"multictr#.complicated#.c14<0>"(i64 %"f14##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3667,7 +3667,7 @@ define external fastcc i64 @"multictr.complicated.c14<0>"(i64 %"f14##0") {
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c14<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c14<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3702,7 +3702,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c15<0>"(i64 %"f15##0") {
+define external fastcc i64 @"multictr#.complicated#.c15<0>"(i64 %"f15##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3714,7 +3714,7 @@ define external fastcc i64 @"multictr.complicated.c15<0>"(i64 %"f15##0") {
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c15<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c15<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3749,7 +3749,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c16<0>"(i64 %"f16##0") {
+define external fastcc i64 @"multictr#.complicated#.c16<0>"(i64 %"f16##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3761,7 +3761,7 @@ define external fastcc i64 @"multictr.complicated.c16<0>"(i64 %"f16##0") {
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c16<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c16<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3796,7 +3796,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc i64 @"multictr.complicated.c17<0>"(i64 %"f17##0") {
+define external fastcc i64 @"multictr#.complicated#.c17<0>"(i64 %"f17##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -3808,7 +3808,7 @@ define external fastcc i64 @"multictr.complicated.c17<0>"(i64 %"f17##0") {
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.c17<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.c17<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp uge i64 %"#result##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3843,7 +3843,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f01<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f01<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3867,7 +3867,7 @@ if.else.0:
   ret {i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f01<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f01<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3895,7 +3895,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f02<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f02<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3920,7 +3920,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f02<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f02<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3951,7 +3951,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f03<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f03<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -3976,7 +3976,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f03<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f03<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4007,7 +4007,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f04<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f04<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4032,7 +4032,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f04<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f04<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4063,7 +4063,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f05<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f05<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4088,7 +4088,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f05<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f05<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4119,7 +4119,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f06<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f06<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4144,7 +4144,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f06<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f06<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4175,7 +4175,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f07<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f07<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4200,7 +4200,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f07<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f07<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4231,7 +4231,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f08<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f08<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4266,7 +4266,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f08<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f08<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4307,7 +4307,7 @@ if.else.0:
   ret {i64, i1} %"tmp#21##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f09<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f09<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4342,7 +4342,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f09<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f09<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4383,7 +4383,7 @@ if.else.0:
   ret {i64, i1} %"tmp#21##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f10<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f10<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4418,7 +4418,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f10<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f10<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4459,7 +4459,7 @@ if.else.0:
   ret {i64, i1} %"tmp#21##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f11<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f11<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4494,7 +4494,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f11<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f11<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4535,7 +4535,7 @@ if.else.0:
   ret {i64, i1} %"tmp#21##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f12<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f12<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4570,7 +4570,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f12<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f12<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4611,7 +4611,7 @@ if.else.0:
   ret {i64, i1} %"tmp#21##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f13<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f13<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4646,7 +4646,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f13<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f13<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4687,7 +4687,7 @@ if.else.0:
   ret {i64, i1} %"tmp#21##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f14<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f14<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4722,7 +4722,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f14<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f14<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4763,7 +4763,7 @@ if.else.0:
   ret {i64, i1} %"tmp#21##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f15<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f15<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4798,7 +4798,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f15<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f15<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4839,7 +4839,7 @@ if.else.0:
   ret {i64, i1} %"tmp#21##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f16<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f16<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4874,7 +4874,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f16<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f16<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4915,7 +4915,7 @@ if.else.0:
   ret {i64, i1} %"tmp#21##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f17<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f17<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4950,7 +4950,7 @@ if.else.0:
   ret {i64, i1} %"tmp#17##0"
 }
 
-define external fastcc {i64, i1} @"multictr.complicated.f17<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.complicated#.f17<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp uge i64 %"#rec##0", 4
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -4991,20 +4991,20 @@ if.else.0:
   ret {i64, i1} %"tmp#21##0"
 }
 
-define external fastcc i64 @"multictr.complicated.spring<0>"() {
+define external fastcc i64 @"multictr#.complicated#.spring<0>"() {
   ret i64 1
 }
 
-define external fastcc i64 @"multictr.complicated.summer<0>"() {
+define external fastcc i64 @"multictr#.complicated#.summer<0>"() {
   ret i64 2
 }
 
-define external fastcc i64 @"multictr.complicated.winter<0>"() {
+define external fastcc i64 @"multictr#.complicated#.winter<0>"() {
   ret i64 0
 }
 
-define external fastcc i1 @"multictr.complicated.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"multictr.complicated.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"multictr#.complicated#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"multictr#.complicated#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
@@ -5075,37 +5075,37 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr.length'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr.length.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multictr#.length#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#1##0" = icmp eq i64 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i64 @"multictr.length.metres<0>"(double %"value##0") {
+define external fastcc i64 @"multictr#.length#.metres<0>"(double %"value##0") {
   %"tmp#0##0" = bitcast double %"value##0" to i64
   ret i64 %"tmp#0##0"
 }
 
-define external fastcc double @"multictr.length.metres<1>"(i64 %"#result##0") {
+define external fastcc double @"multictr#.length#.metres<1>"(i64 %"#result##0") {
   %"tmp#0##0" = bitcast i64 %"#result##0" to double
   ret double %"tmp#0##0"
 }
 
-define external fastcc double @"multictr.length.value<0>"(i64 %"#rec##0") {
+define external fastcc double @"multictr#.length#.value<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = bitcast i64 %"#rec##0" to double
   ret double %"tmp#0##0"
 }
 
-define external fastcc i64 @"multictr.length.value<1>"(double %"#field##0") {
+define external fastcc i64 @"multictr#.length#.value<1>"(double %"#field##0") {
   %"tmp#0##0" = bitcast double %"#field##0" to i64
   ret i64 %"tmp#0##0"
 }
 
-define external fastcc i1 @"multictr.length.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multictr#.length#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp eq i64 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -5230,13 +5230,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr.maybe_int'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr.maybe_int.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multictr#.maybe_int#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -5256,7 +5256,7 @@ if.else.0:
   ret i1 %"tmp#14##0"
 }
 
-define external fastcc i64 @"multictr.maybe_int.just<0>"(i64 %"value##0") {
+define external fastcc i64 @"multictr#.maybe_int#.just<0>"(i64 %"value##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -5264,7 +5264,7 @@ define external fastcc i64 @"multictr.maybe_int.just<0>"(i64 %"value##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"multictr.maybe_int.just<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.maybe_int#.just<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -5279,11 +5279,11 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc i64 @"multictr.maybe_int.nothing<0>"() {
+define external fastcc i64 @"multictr#.maybe_int#.nothing<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"multictr.maybe_int.value<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.maybe_int#.value<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -5298,7 +5298,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"multictr.maybe_int.value<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.maybe_int#.value<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -5317,8 +5317,8 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i1 @"multictr.maybe_int.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"multictr.maybe_int.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"multictr#.maybe_int#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"multictr#.maybe_int#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
@@ -5519,13 +5519,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr.number'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr.number.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multictr#.number#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#23##0" = trunc i64 %"#left##0" to i1
   %"tmp#8##0" = and i1 %"tmp#23##0", 1
   %"tmp#9##0" = icmp eq i1 %"tmp#8##0", 0
@@ -5567,7 +5567,7 @@ if.else.2:
   ret i1 0
 }
 
-define external fastcc i64 @"multictr.number.float<0>"(double %"float_value##0") {
+define external fastcc i64 @"multictr#.number#.float<0>"(double %"float_value##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -5576,7 +5576,7 @@ define external fastcc i64 @"multictr.number.float<0>"(double %"float_value##0")
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {double, i1} @"multictr.number.float<1>"(i64 %"#result##0") {
+define external fastcc {double, i1} @"multictr#.number#.float<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -5594,7 +5594,7 @@ if.else.0:
   ret {double, i1} %"tmp#9##0"
 }
 
-define external fastcc {double, i1} @"multictr.number.float_value<0>"(i64 %"#rec##0") {
+define external fastcc {double, i1} @"multictr#.number#.float_value<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -5612,7 +5612,7 @@ if.else.0:
   ret {double, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"multictr.number.float_value<1>"(i64 %"#rec##0", double %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.number#.float_value<1>"(i64 %"#rec##0", double %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 1
@@ -5636,7 +5636,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc i64 @"multictr.number.int<0>"(i64 %"int_value##0") {
+define external fastcc i64 @"multictr#.number#.int<0>"(i64 %"int_value##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -5644,7 +5644,7 @@ define external fastcc i64 @"multictr.number.int<0>"(i64 %"int_value##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"multictr.number.int<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.number#.int<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 0
@@ -5661,7 +5661,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc {i64, i1} @"multictr.number.int_value<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.number#.int_value<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 0
@@ -5678,7 +5678,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc {i64, i1} @"multictr.number.int_value<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.number#.int_value<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i1
   %"tmp#1##0" = and i1 %"tmp#2##0", 1
   %"tmp#0##0" = icmp eq i1 %"tmp#1##0", 0
@@ -5699,8 +5699,8 @@ if.else.0:
   ret {i64, i1} %"tmp#10##0"
 }
 
-define external fastcc i1 @"multictr.number.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"multictr.number.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"multictr#.number#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"multictr#.number#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
@@ -5771,33 +5771,33 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr.perhaps'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr.perhaps.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multictr#.perhaps#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#1##0" = icmp eq i64 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i64 @"multictr.perhaps.content<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"multictr#.perhaps#.content<0>"(i64 %"#rec##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc i64 @"multictr.perhaps.content<1>"(i64 %"#field##0") {
+define external fastcc i64 @"multictr#.perhaps#.content<1>"(i64 %"#field##0") {
   ret i64 %"#field##0"
 }
 
-define external fastcc i64 @"multictr.perhaps.perhaps<0>"(i64 %"content##0") {
+define external fastcc i64 @"multictr#.perhaps#.perhaps<0>"(i64 %"content##0") {
   ret i64 %"content##0"
 }
 
-define external fastcc i64 @"multictr.perhaps.perhaps<1>"(i64 %"#result##0") {
+define external fastcc i64 @"multictr#.perhaps#.perhaps<1>"(i64 %"#result##0") {
   ret i64 %"#result##0"
 }
 
-define external fastcc i1 @"multictr.perhaps.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multictr#.perhaps#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp eq i64 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -5954,69 +5954,69 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr.rank'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr.rank.=<0>"(i4 %"#left##0", i4 %"#right##0") {
+define external fastcc i1 @"multictr#.rank#.=<0>"(i4 %"#left##0", i4 %"#right##0") {
   %"tmp#1##0" = icmp eq i4 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i4 @"multictr.rank.ace<0>"() {
+define external fastcc i4 @"multictr#.rank#.ace<0>"() {
   ret i4 12
 }
 
-define external fastcc i4 @"multictr.rank.jack<0>"() {
+define external fastcc i4 @"multictr#.rank#.jack<0>"() {
   ret i4 9
 }
 
-define external fastcc i4 @"multictr.rank.king<0>"() {
+define external fastcc i4 @"multictr#.rank#.king<0>"() {
   ret i4 11
 }
 
-define external fastcc i4 @"multictr.rank.queen<0>"() {
+define external fastcc i4 @"multictr#.rank#.queen<0>"() {
   ret i4 10
 }
 
-define external fastcc i4 @"multictr.rank.r10<0>"() {
+define external fastcc i4 @"multictr#.rank#.r10<0>"() {
   ret i4 8
 }
 
-define external fastcc i4 @"multictr.rank.r2<0>"() {
+define external fastcc i4 @"multictr#.rank#.r2<0>"() {
   ret i4 0
 }
 
-define external fastcc i4 @"multictr.rank.r3<0>"() {
+define external fastcc i4 @"multictr#.rank#.r3<0>"() {
   ret i4 1
 }
 
-define external fastcc i4 @"multictr.rank.r4<0>"() {
+define external fastcc i4 @"multictr#.rank#.r4<0>"() {
   ret i4 2
 }
 
-define external fastcc i4 @"multictr.rank.r5<0>"() {
+define external fastcc i4 @"multictr#.rank#.r5<0>"() {
   ret i4 3
 }
 
-define external fastcc i4 @"multictr.rank.r6<0>"() {
+define external fastcc i4 @"multictr#.rank#.r6<0>"() {
   ret i4 4
 }
 
-define external fastcc i4 @"multictr.rank.r7<0>"() {
+define external fastcc i4 @"multictr#.rank#.r7<0>"() {
   ret i4 5
 }
 
-define external fastcc i4 @"multictr.rank.r8<0>"() {
+define external fastcc i4 @"multictr#.rank#.r8<0>"() {
   ret i4 6
 }
 
-define external fastcc i4 @"multictr.rank.r9<0>"() {
+define external fastcc i4 @"multictr#.rank#.r9<0>"() {
   ret i4 7
 }
 
-define external fastcc i1 @"multictr.rank.~=<0>"(i4 %"#left##0", i4 %"#right##0") {
+define external fastcc i1 @"multictr#.rank#.~=<0>"(i4 %"#left##0", i4 %"#right##0") {
   %"tmp#0##0" = icmp eq i4 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -6361,13 +6361,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr.simple'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr.simple.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multictr#.simple#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -6436,7 +6436,7 @@ if.else.0:
   ret i1 %"tmp#46##0"
 }
 
-define external fastcc i64 @"multictr.simple.one<0>"(i64 %"one_field##0") {
+define external fastcc i64 @"multictr#.simple#.one<0>"(i64 %"one_field##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -6444,7 +6444,7 @@ define external fastcc i64 @"multictr.simple.one<0>"(i64 %"one_field##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"multictr.simple.one<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr#.simple#.one<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -6468,7 +6468,7 @@ if.else.0:
   ret {i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"multictr.simple.one_field<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.simple#.one_field<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -6492,7 +6492,7 @@ if.else.0:
   ret {i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"multictr.simple.one_field<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.simple#.one_field<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -6520,7 +6520,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc i64 @"multictr.simple.two<0>"(i64 %"two_field1##0", i64 %"two_field2##0") {
+define external fastcc i64 @"multictr#.simple#.two<0>"(i64 %"two_field1##0", i64 %"two_field2##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -6532,7 +6532,7 @@ define external fastcc i64 @"multictr.simple.two<0>"(i64 %"two_field1##0", i64 %
   ret i64 %"tmp#4##0"
 }
 
-define external fastcc {i64, i64, i1} @"multictr.simple.two<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"multictr#.simple#.two<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -6563,7 +6563,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#18##0"
 }
 
-define external fastcc {i64, i1} @"multictr.simple.two_field1<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.simple#.two_field1<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -6588,7 +6588,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"multictr.simple.two_field1<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.simple#.two_field1<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -6619,7 +6619,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"multictr.simple.two_field2<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr#.simple#.two_field2<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -6644,7 +6644,7 @@ if.else.0:
   ret {i64, i1} %"tmp#12##0"
 }
 
-define external fastcc {i64, i1} @"multictr.simple.two_field2<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr#.simple#.two_field2<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -6675,12 +6675,12 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc i64 @"multictr.simple.zero<0>"() {
+define external fastcc i64 @"multictr#.simple#.zero<0>"() {
   ret i64 0
 }
 
-define external fastcc i1 @"multictr.simple.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"multictr.simple.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"multictr#.simple#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"multictr#.simple#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
@@ -6755,33 +6755,33 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr.suit'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr.suit.=<0>"(i2 %"#left##0", i2 %"#right##0") {
+define external fastcc i1 @"multictr#.suit#.=<0>"(i2 %"#left##0", i2 %"#right##0") {
   %"tmp#1##0" = icmp eq i2 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i2 @"multictr.suit.clubs<0>"() {
+define external fastcc i2 @"multictr#.suit#.clubs<0>"() {
   ret i2 0
 }
 
-define external fastcc i2 @"multictr.suit.diamonds<0>"() {
+define external fastcc i2 @"multictr#.suit#.diamonds<0>"() {
   ret i2 1
 }
 
-define external fastcc i2 @"multictr.suit.hearts<0>"() {
+define external fastcc i2 @"multictr#.suit#.hearts<0>"() {
   ret i2 2
 }
 
-define external fastcc i2 @"multictr.suit.spades<0>"() {
+define external fastcc i2 @"multictr#.suit#.spades<0>"() {
   ret i2 3
 }
 
-define external fastcc i1 @"multictr.suit.~=<0>"(i2 %"#left##0", i2 %"#right##0") {
+define external fastcc i1 @"multictr#.suit#.~=<0>"(i2 %"#left##0", i2 %"#right##0") {
   %"tmp#0##0" = icmp eq i2 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -6829,19 +6829,19 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr.unit'
 
 source_filename = "!ROOT!/final-dump/multictr.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr.unit.=<0>"() {
+define external fastcc i1 @"multictr#.unit#.=<0>"() {
   ret i1 1
 }
 
-define external fastcc void @"multictr.unit.unit<0>"() {
+define external fastcc void @"multictr#.unit#.unit<0>"() {
   ret void
 }
 
-define external fastcc i1 @"multictr.unit.~=<0>"() {
+define external fastcc i1 @"multictr#.unit#.~=<0>"() {
   ret i1 0
 }
diff --git a/test-cases/final-dump/multictr2.exp b/test-cases/final-dump/multictr2.exp
index 802e1e32..cd27aaa3 100644
--- a/test-cases/final-dump/multictr2.exp
+++ b/test-cases/final-dump/multictr2.exp
@@ -165,7 +165,7 @@ print_t(x##0:multictr2.t)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'multictr2'
 
 source_filename = "!ROOT!/final-dump/multictr2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c", \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"c01(\00", align 8
@@ -184,14 +184,14 @@ target triple    ????
 @"string#14" = private unnamed_addr constant {i64, i64} { i64 4, i64 ptrtoint( ptr @"cstring#6" to i64 ) }, align 8
 @"string#15" = private unnamed_addr constant {i64, i64} { i64 4, i64 ptrtoint( ptr @"cstring#7" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_float(double)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"multictr2.print_t<0>"(i64 %"x##0") {
+define external fastcc void @"multictr2#.print_t<0>"(i64 %"x##0") {
   %"tmp#120##0" = trunc i64 %"x##0" to i3
   %"tmp#9##0" = and i3 %"tmp#120##0", 7
   switch i3 %"tmp#9##0", label %case.7.switch.0 [
@@ -206,63 +206,63 @@ define external fastcc void @"multictr2.print_t<0>"(i64 %"x##0") {
 case.0.switch.0:
   %"tmp#121##0" = inttoptr i64 %"x##0" to ptr
   %"a##0" = load i64, ptr %"tmp#121##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#9" to i64 ))
   call ccc void @print_int(i64 %"a##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 case.1.switch.0:
   %"tmp#122##0" = add i64 %"x##0", -1
   %"tmp#123##0" = inttoptr i64 %"tmp#122##0" to ptr
   %"a##1" = load i64, ptr %"tmp#123##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
   call ccc void @print_int(i64 %"a##1")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 case.2.switch.0:
   %"tmp#124##0" = add i64 %"x##0", -2
   %"tmp#125##0" = inttoptr i64 %"tmp#124##0" to ptr
   %"a##2" = load i64, ptr %"tmp#125##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#10" to i64 ))
   call ccc void @print_int(i64 %"a##2")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 case.3.switch.0:
   %"tmp#126##0" = add i64 %"x##0", -3
   %"tmp#127##0" = inttoptr i64 %"tmp#126##0" to ptr
   %"a##3" = load i64, ptr %"tmp#127##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#11" to i64 ))
   call ccc void @print_int(i64 %"a##3")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 case.4.switch.0:
   %"tmp#128##0" = add i64 %"x##0", -4
   %"tmp#129##0" = inttoptr i64 %"tmp#128##0" to ptr
   %"a##4" = load i64, ptr %"tmp#129##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#12" to i64 ))
   call ccc void @print_int(i64 %"a##4")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 case.5.switch.0:
   %"tmp#130##0" = add i64 %"x##0", -5
   %"tmp#131##0" = inttoptr i64 %"tmp#130##0" to ptr
   %"a##5" = load i64, ptr %"tmp#131##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
   call ccc void @print_int(i64 %"a##5")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 case.6.switch.0:
   %"tmp#132##0" = add i64 %"x##0", -6
   %"tmp#133##0" = inttoptr i64 %"tmp#132##0" to ptr
   %"a##6" = load i64, ptr %"tmp#133##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
   call ccc void @print_int(i64 %"a##6")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 case.7.switch.0:
@@ -275,13 +275,13 @@ case.7.switch.0:
   %"tmp#138##0" = add i64 %"x##0", 9
   %"tmp#139##0" = inttoptr i64 %"tmp#138##0" to ptr
   %"c##0" = load double, ptr %"tmp#139##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
   call ccc void @print_int(i64 %"a##7")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
   call ccc void @print_int(i64 %"b##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#8" to i64 ))
   call ccc void @print_float(double %"c##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -1032,13 +1032,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'multictr2.t'
 
 source_filename = "!ROOT!/final-dump/multictr2.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"multictr2.t.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"multictr2#.t#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#95##0" = trunc i64 %"#left##0" to i3
   %"tmp#28##0" = and i3 %"tmp#95##0", 7
   switch i3 %"tmp#28##0", label %case.7.switch.0 [
@@ -1200,7 +1200,7 @@ if.else.8:
   ret i1 0
 }
 
-define external fastcc i64 @"multictr2.t.c01<0>"(i64 %"f01##0") {
+define external fastcc i64 @"multictr2#.t#.c01<0>"(i64 %"f01##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1208,7 +1208,7 @@ define external fastcc i64 @"multictr2.t.c01<0>"(i64 %"f01##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.c01<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.c01<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 0
@@ -1225,7 +1225,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"multictr2.t.c02<0>"(i64 %"f02##0") {
+define external fastcc i64 @"multictr2#.t#.c02<0>"(i64 %"f02##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1234,7 +1234,7 @@ define external fastcc i64 @"multictr2.t.c02<0>"(i64 %"f02##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.c02<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.c02<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 1
@@ -1252,7 +1252,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"multictr2.t.c03<0>"(i64 %"f03##0") {
+define external fastcc i64 @"multictr2#.t#.c03<0>"(i64 %"f03##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1261,7 +1261,7 @@ define external fastcc i64 @"multictr2.t.c03<0>"(i64 %"f03##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.c03<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.c03<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 2
@@ -1279,7 +1279,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"multictr2.t.c04<0>"(i64 %"f04##0") {
+define external fastcc i64 @"multictr2#.t#.c04<0>"(i64 %"f04##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1288,7 +1288,7 @@ define external fastcc i64 @"multictr2.t.c04<0>"(i64 %"f04##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.c04<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.c04<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 3
@@ -1306,7 +1306,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"multictr2.t.c05<0>"(i64 %"f05##0") {
+define external fastcc i64 @"multictr2#.t#.c05<0>"(i64 %"f05##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1315,7 +1315,7 @@ define external fastcc i64 @"multictr2.t.c05<0>"(i64 %"f05##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.c05<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.c05<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 4
@@ -1333,7 +1333,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"multictr2.t.c06<0>"(i64 %"f06##0") {
+define external fastcc i64 @"multictr2#.t#.c06<0>"(i64 %"f06##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1342,7 +1342,7 @@ define external fastcc i64 @"multictr2.t.c06<0>"(i64 %"f06##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.c06<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.c06<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 5
@@ -1360,7 +1360,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"multictr2.t.c07<0>"(i64 %"f07##0") {
+define external fastcc i64 @"multictr2#.t#.c07<0>"(i64 %"f07##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1369,7 +1369,7 @@ define external fastcc i64 @"multictr2.t.c07<0>"(i64 %"f07##0") {
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.c07<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.c07<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 6
@@ -1387,7 +1387,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"multictr2.t.c08<0>"(i64 %"f08_a##0", i64 %"f08_b##0", double %"f08_c##0") {
+define external fastcc i64 @"multictr2#.t#.c08<0>"(i64 %"f08_a##0", i64 %"f08_b##0", double %"f08_c##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1402,7 +1402,7 @@ define external fastcc i64 @"multictr2.t.c08<0>"(i64 %"f08_a##0", i64 %"f08_b##0
   ret i64 %"tmp#6##0"
 }
 
-define external fastcc {i64, i64, double, i1} @"multictr2.t.c08<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, double, i1} @"multictr2#.t#.c08<1>"(i64 %"#result##0") {
   %"tmp#2##0" = trunc i64 %"#result##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 7
@@ -1430,7 +1430,7 @@ if.else.0:
   ret {i64, i64, double, i1} %"tmp#19##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f01<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f01<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 0
@@ -1447,7 +1447,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f01<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f01<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 0
@@ -1468,7 +1468,7 @@ if.else.0:
   ret {i64, i1} %"tmp#10##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f02<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f02<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 1
@@ -1486,7 +1486,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f02<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f02<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 1
@@ -1510,7 +1510,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f03<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f03<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 2
@@ -1528,7 +1528,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f03<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f03<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 2
@@ -1552,7 +1552,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f04<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f04<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 3
@@ -1570,7 +1570,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f04<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f04<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 3
@@ -1594,7 +1594,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f05<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f05<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 4
@@ -1612,7 +1612,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f05<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f05<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 4
@@ -1636,7 +1636,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f06<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f06<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 5
@@ -1654,7 +1654,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f06<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f06<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 5
@@ -1678,7 +1678,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f07<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f07<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 6
@@ -1696,7 +1696,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f07<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f07<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 6
@@ -1720,7 +1720,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f08_a<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f08_a<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 7
@@ -1738,7 +1738,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f08_a<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f08_a<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 7
@@ -1762,7 +1762,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f08_b<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f08_b<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 7
@@ -1780,7 +1780,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f08_b<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f08_b<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 7
@@ -1804,7 +1804,7 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc {double, i1} @"multictr2.t.f08_c<0>"(i64 %"#rec##0") {
+define external fastcc {double, i1} @"multictr2#.t#.f08_c<0>"(i64 %"#rec##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 7
@@ -1822,7 +1822,7 @@ if.else.0:
   ret {double, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"multictr2.t.f08_c<1>"(i64 %"#rec##0", double %"#field##0") {
+define external fastcc {i64, i1} @"multictr2#.t#.f08_c<1>"(i64 %"#rec##0", double %"#field##0") {
   %"tmp#2##0" = trunc i64 %"#rec##0" to i3
   %"tmp#1##0" = and i3 %"tmp#2##0", 7
   %"tmp#0##0" = icmp eq i3 %"tmp#1##0", 7
@@ -1846,8 +1846,8 @@ if.else.0:
   ret {i64, i1} %"tmp#13##0"
 }
 
-define external fastcc i1 @"multictr2.t.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"multictr2.t.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"multictr2#.t#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"multictr2#.t#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/mutual_res_a.exp b/test-cases/final-dump/mutual_res_a.exp
index de9c929b..090226a4 100644
--- a/test-cases/final-dump/mutual_res_a.exp
+++ b/test-cases/final-dump/mutual_res_a.exp
@@ -20,7 +20,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mutual_res_a'
 
 source_filename = "!ROOT!/final-dump/mutual_res_a.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -44,7 +44,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'mutual_res_b'
 
 source_filename = "!ROOT!/final-dump/mutual_res_b.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/mutual_res_b.exp b/test-cases/final-dump/mutual_res_b.exp
index de9c929b..090226a4 100644
--- a/test-cases/final-dump/mutual_res_b.exp
+++ b/test-cases/final-dump/mutual_res_b.exp
@@ -20,7 +20,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mutual_res_a'
 
 source_filename = "!ROOT!/final-dump/mutual_res_a.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -44,7 +44,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'mutual_res_b'
 
 source_filename = "!ROOT!/final-dump/mutual_res_b.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/mutual_type.exp b/test-cases/final-dump/mutual_type.exp
index 933cc7ad..25ed0320 100644
--- a/test-cases/final-dump/mutual_type.exp
+++ b/test-cases/final-dump/mutual_type.exp
@@ -22,7 +22,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'mutual_type'
 
 source_filename = "!ROOT!/final-dump/mutual_type.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -192,13 +192,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'mutual_type.a'
 
 source_filename = "!ROOT!/final-dump/mutual_type.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"mutual_type.a.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"mutual_type#.a#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -218,7 +218,7 @@ if.then.1:
   %"tmp#4##0" = icmp eq i64 %"#left#ahead##0", %"#right#ahead##0"
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#18##0" = tail call fastcc i1 @"mutual_type.b.=<0>"(i64 %"#left#atail##0", i64 %"#right#atail##0")
+  %"tmp#18##0" = tail call fastcc i1 @"mutual_type#.b#.=<0>"(i64 %"#left#atail##0", i64 %"#right#atail##0")
   ret i1 %"tmp#18##0"
 if.else.2:
   ret i1 0
@@ -229,7 +229,7 @@ if.else.0:
   ret i1 %"tmp#19##0"
 }
 
-define external fastcc i64 @"mutual_type.a.a<0>"(i64 %"ahead##0", i64 %"atail##0") {
+define external fastcc i64 @"mutual_type#.a#.a<0>"(i64 %"ahead##0", i64 %"atail##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -240,7 +240,7 @@ define external fastcc i64 @"mutual_type.a.a<0>"(i64 %"ahead##0", i64 %"atail##0
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"mutual_type.a.a<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"mutual_type#.a#.a<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -260,7 +260,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"mutual_type.a.ahead<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mutual_type#.a#.ahead<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -275,7 +275,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"mutual_type.a.ahead<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mutual_type#.a#.ahead<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -294,7 +294,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc {i64, i1} @"mutual_type.a.atail<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mutual_type#.a#.atail<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -310,7 +310,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"mutual_type.a.atail<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mutual_type#.a#.atail<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -330,12 +330,12 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"mutual_type.a.no_a<0>"() {
+define external fastcc i64 @"mutual_type#.a#.no_a<0>"() {
   ret i64 0
 }
 
-define external fastcc i1 @"mutual_type.a.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"mutual_type.a.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"mutual_type#.a#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"mutual_type#.a#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
@@ -505,13 +505,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'mutual_type.b'
 
 source_filename = "!ROOT!/final-dump/mutual_type.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"mutual_type.b.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"mutual_type#.b#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -531,7 +531,7 @@ if.then.1:
   %"tmp#4##0" = icmp eq i64 %"#left#bhead##0", %"#right#bhead##0"
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#18##0" = tail call fastcc i1 @"mutual_type.a.=<0>"(i64 %"#left#btail##0", i64 %"#right#btail##0")
+  %"tmp#18##0" = tail call fastcc i1 @"mutual_type#.a#.=<0>"(i64 %"#left#btail##0", i64 %"#right#btail##0")
   ret i1 %"tmp#18##0"
 if.else.2:
   ret i1 0
@@ -542,7 +542,7 @@ if.else.0:
   ret i1 %"tmp#19##0"
 }
 
-define external fastcc i64 @"mutual_type.b.b<0>"(i64 %"bhead##0", i64 %"btail##0") {
+define external fastcc i64 @"mutual_type#.b#.b<0>"(i64 %"bhead##0", i64 %"btail##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -553,7 +553,7 @@ define external fastcc i64 @"mutual_type.b.b<0>"(i64 %"bhead##0", i64 %"btail##0
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"mutual_type.b.b<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"mutual_type#.b#.b<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -573,7 +573,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"mutual_type.b.bhead<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mutual_type#.b#.bhead<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -588,7 +588,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"mutual_type.b.bhead<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mutual_type#.b#.bhead<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -607,7 +607,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc {i64, i1} @"mutual_type.b.btail<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mutual_type#.b#.btail<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -623,7 +623,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"mutual_type.b.btail<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mutual_type#.b#.btail<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -643,12 +643,12 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i64 @"mutual_type.b.no_b<0>"() {
+define external fastcc i64 @"mutual_type#.b#.no_b<0>"() {
   ret i64 0
 }
 
-define external fastcc i1 @"mutual_type.b.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"mutual_type.b.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"mutual_type#.b#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"mutual_type#.b#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/mytree.exp b/test-cases/final-dump/mytree.exp
index 1382d705..16dd5fdd 100644
--- a/test-cases/final-dump/mytree.exp
+++ b/test-cases/final-dump/mytree.exp
@@ -64,22 +64,22 @@ printTree1(t##0:mytree.tree, prefix##0:wybe.string, ?prefix##3:wybe.string)<{<<w
 ; ModuleID = 'mytree'
 
 source_filename = "!ROOT!/final-dump/mytree.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c", \00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"mytree.printTree<0>"(i64 %"t##0") {
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"t##0", i64 1519)
-  tail call fastcc void @"wybe.string.print<0>"(i64 1527)
+define external fastcc void @"mytree#.printTree<0>"(i64 %"t##0") {
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"t##0", i64 1519)
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 1527)
   ret void
 }
 
-define external fastcc i64 @"mytree.printTree1<0>"(i64 %"t##0", i64 %"prefix##0") {
+define external fastcc i64 @"mytree#.printTree1<0>"(i64 %"t##0", i64 %"prefix##0") {
   %"tmp#2##0" = icmp ne i64 %"t##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -91,10 +91,10 @@ if.then.0:
   %"tmp#9##0" = add i64 %"t##0", 16
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   %"r##0" = load i64, ptr %"tmp#10##0"
-  %"prefix##1" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"l##0", i64 %"prefix##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"prefix##1")
+  %"prefix##1" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"l##0", i64 %"prefix##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"prefix##1")
   call ccc void @print_int(i64 %"k##0")
-  %"tmp#11##0" = tail call fastcc i64 @"mytree.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
+  %"tmp#11##0" = tail call fastcc i64 @"mytree#.printTree1<0>"(i64 %"r##0", i64 ptrtoint( ptr @"string#1" to i64 ))
   ret i64 %"tmp#11##0"
 if.else.0:
   ret i64 %"prefix##0"
@@ -311,13 +311,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'mytree.tree'
 
 source_filename = "!ROOT!/final-dump/mytree.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"mytree.tree.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -340,13 +340,13 @@ if.then.1:
   %"tmp#21##0" = add i64 %"#right##0", 16
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   %"#right#right##0" = load i64, ptr %"tmp#22##0"
-  %"tmp#4##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
+  %"tmp#4##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
   %"tmp#5##0" = icmp eq i64 %"#left#key##0", %"#right#key##0"
   br i1 %"tmp#5##0", label %if.then.3, label %if.else.3
 if.then.3:
-  %"tmp#23##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
+  %"tmp#23##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
   ret i1 %"tmp#23##0"
 if.else.3:
   ret i1 0
@@ -359,11 +359,11 @@ if.else.0:
   ret i1 %"tmp#24##0"
 }
 
-define external fastcc i64 @"mytree.tree.empty<0>"() {
+define external fastcc i64 @"mytree#.tree#.empty<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"mytree.tree.key<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.key<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -379,7 +379,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -399,7 +399,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.left<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.left<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -414,7 +414,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -433,7 +433,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"mytree.tree.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
+define external fastcc i64 @"mytree#.tree#.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -447,7 +447,7 @@ define external fastcc i64 @"mytree.tree.node<0>"(i64 %"left##0", i64 %"key##0",
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64, i1} @"mytree.tree.node<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i1} @"mytree#.tree#.node<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -472,7 +472,7 @@ if.else.0:
   ret {i64, i64, i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.right<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.right<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -488,7 +488,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"mytree.tree.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"mytree#.tree#.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -508,8 +508,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"mytree.tree.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"mytree.tree.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"mytree#.tree#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"mytree#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/need.exp b/test-cases/final-dump/need.exp
index ba2675d6..c27ded69 100644
--- a/test-cases/final-dump/need.exp
+++ b/test-cases/final-dump/need.exp
@@ -68,32 +68,32 @@ need(stmt##0:{impure}())<{}; {}; {}>:
 ; ModuleID = 'need'
 
 source_filename = "!ROOT!/final-dump/need.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"need.<0>"() {
-  tail call fastcc void @"need.#anon#1<0>"()
+define external fastcc void @"need#.<0>"() {
+  tail call fastcc void @"need#.#anon#1<0>"()
   ret void
 }
 
-define external fastcc void @"need.#anon#1<0>"() {
+define external fastcc void @"need#.#anon#1<0>"() {
   %"tmp#1##0" = alloca i8, i64 8, align 8
-  call fastcc void @"need.iota<0>"(i64 1000, ptr %"tmp#1##0")
+  call fastcc void @"need#.iota<0>"(i64 1000, ptr %"tmp#1##0")
   %"l##0" = load i64, ptr %"tmp#1##0"
   ret void
 }
 
-define external fastcc void @"need.#anon#1<1>"(ptr %"#env##0") {
+define external fastcc void @"need#.#anon#1<1>"(ptr %"#env##0") {
   %"tmp#1##0" = alloca i8, i64 8, align 8
-  call fastcc void @"need.iota<0>"(i64 1000, ptr %"tmp#1##0")
+  call fastcc void @"need#.iota<0>"(i64 1000, ptr %"tmp#1##0")
   %"tmp#0##0" = load i64, ptr %"tmp#1##0"
   ret void
 }
 
-define external fastcc void @"need.iota<0>"(i64 %"n##0", ptr %"tmp#14##0") {
+define external fastcc void @"need#.iota<0>"(i64 %"n##0", ptr %"tmp#14##0") {
   %"tmp#5##0" = icmp sle i64 %"n##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -108,11 +108,11 @@ if.else.0:
   store i64 %"tmp#12##0", ptr %"tmp#14##0"
   %"tmp#17##0" = add i64 %"tmp#12##0", 8
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
-  musttail call fastcc void @"need.iota<0>"(i64 %"tmp#4##0", ptr %"tmp#18##0")
+  musttail call fastcc void @"need#.iota<0>"(i64 %"tmp#4##0", ptr %"tmp#18##0")
   ret void
 }
 
-define external fastcc void @"need.need<0>"(ptr %"stmt##0") {
+define external fastcc void @"need#.need<0>"(ptr %"stmt##0") {
   %"tmp#0##0" = load ptr, ptr %"stmt##0"
   tail call fastcc void %"tmp#0##0"(ptr %"stmt##0")
   ret void
diff --git a/test-cases/final-dump/nested_if.exp b/test-cases/final-dump/nested_if.exp
index 61afc362..6019ae61 100644
--- a/test-cases/final-dump/nested_if.exp
+++ b/test-cases/final-dump/nested_if.exp
@@ -49,7 +49,7 @@ nested_if(i##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'nested_if'
 
 source_filename = "!ROOT!/final-dump/nested_if.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"one thousand and one\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"other\00", align 8
@@ -60,29 +60,29 @@ target triple    ????
 @"string#6" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 @"string#7" = private unnamed_addr constant {i64, i64} { i64 4, i64 ptrtoint( ptr @"cstring#3" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"nested_if.nested_if<0>"(i64 %"i##0") {
+define external fastcc void @"nested_if#.nested_if<0>"(i64 %"i##0") {
   switch i64 %"i##0", label %default.switch.0 [
     i64 0, label %case.0.switch.0
     i64 2, label %case.2.switch.0
     i64 1001, label %case.1001.switch.0 ]
 case.0.switch.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 case.2.switch.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 case.1001.switch.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 default.switch.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/nested_loop.exp b/test-cases/final-dump/nested_loop.exp
index 3ff327cb..9a40074a 100644
--- a/test-cases/final-dump/nested_loop.exp
+++ b/test-cases/final-dump/nested_loop.exp
@@ -61,38 +61,38 @@ proc #cont#2 > {inline,semipure} (2 calls)
 ; ModuleID = 'nested_loop'
 
 source_filename = "!ROOT!/final-dump/nested_loop.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Inner\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"Outer\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 5, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 5, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"nested_loop.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+define external fastcc void @"nested_loop#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"nested_loop.#cont#2<0>"()
+  tail call fastcc void @"nested_loop#.#cont#2<0>"()
   ret void
 }
 
-define external fastcc void @"nested_loop.#cont#1<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+define external fastcc void @"nested_loop#.#cont#1<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"nested_loop.#cont#2<0>"()
+  tail call fastcc void @"nested_loop#.#cont#2<0>"()
   ret void
 }
 
-define external fastcc void @"nested_loop.#cont#2<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+define external fastcc void @"nested_loop#.#cont#2<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"nested_loop.#cont#2<0>"()
+  tail call fastcc void @"nested_loop#.#cont#2<0>"()
   ret void
 }
diff --git a/test-cases/final-dump/new_array_test.exp b/test-cases/final-dump/new_array_test.exp
index 8e5e3039..3dd09238 100644
--- a/test-cases/final-dump/new_array_test.exp
+++ b/test-cases/final-dump/new_array_test.exp
@@ -223,7 +223,7 @@ proc #cont#4 > {semipure} (2 calls)
 ; ModuleID = 'new_array_test'
 
 source_filename = "!ROOT!/final-dump/new_array_test.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Sum   : \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"new_array_test:8:19\00", align 8
@@ -231,30 +231,30 @@ target triple    ????
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 8, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 
-declare external fastcc i64 @"wybe.array.array<0>"(i64, i64)
-declare external fastcc i64 @"wybe.int.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.range...<0>"(i64, i64)
-declare external fastcc {i64, i64, i1} @"wybe.range.[|]<0>"(i64)
-declare external fastcc {i64, i64, i1} @"wybe.range.[|]<0>[785a827a1b]"(i64)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc i64 @"wybe.string.c_string<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.array#.array<0>"(i64, i64)
+declare external fastcc i64 @"wybe#.int#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.range#...<0>"(i64, i64)
+declare external fastcc {i64, i64, i1} @"wybe#.range#.[|]<0>"(i64)
+declare external fastcc {i64, i64, i1} @"wybe#.range#.[|]<0>[785a827a1b]"(i64)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc i64 @"wybe#.string#.c_string<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @error_exit(i64, i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"new_array_test.<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.array.array<0>"(i64 0, i64 1000000)
+define external fastcc void @"new_array_test#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.array#.array<0>"(i64 0, i64 1000000)
   %"tmp#15##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#15##0"
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.range...<0>"(i64 0, i64 %"tmp#3##0")
-  tail call fastcc void @"new_array_test.#cont#4<0>[7477e50a09]"(i64 %"tmp#0##0", i64 %"tmp#2##0")
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.range#...<0>"(i64 0, i64 %"tmp#3##0")
+  tail call fastcc void @"new_array_test#.#cont#4<0>[7477e50a09]"(i64 %"tmp#0##0", i64 %"tmp#2##0")
   ret void
 }
 
-define external fastcc void @"new_array_test.#cont#1<0>"(i64 %"ar##0") {
+define external fastcc void @"new_array_test#.#cont#1<0>"(i64 %"ar##0") {
   %"tmp#13##0" = add i64 %"ar##0", 8
   %"tmp#19##0" = inttoptr i64 %"ar##0" to ptr
   %"tmp#14##0" = load i64, ptr %"tmp#19##0"
@@ -267,19 +267,19 @@ define external fastcc void @"new_array_test.#cont#1<0>"(i64 %"ar##0") {
   %"tmp#22##0" = add i64 %"tmp#17##0", 8
   %"tmp#23##0" = inttoptr i64 %"tmp#22##0" to ptr
   store i64 %"tmp#16##0", ptr %"tmp#23##0"
-  tail call fastcc void @"new_array_test.#cont#3<0>"(i64 0, i64 %"tmp#17##0")
+  tail call fastcc void @"new_array_test#.#cont#3<0>"(i64 0, i64 %"tmp#17##0")
   ret void
 }
 
-define external fastcc void @"new_array_test.#cont#2<0>"(i64 %"sum##0") {
-  %"tmp#7##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"sum##0", i64 0, i8 32)
-  %"tmp#6##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#7##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#6##0")
+define external fastcc void @"new_array_test#.#cont#2<0>"(i64 %"sum##0") {
+  %"tmp#7##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"sum##0", i64 0, i8 32)
+  %"tmp#6##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#7##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#6##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"new_array_test.#cont#3<0>"(i64 %"sum##0", i64 %"tmp#4##0") {
+define external fastcc void @"new_array_test#.#cont#3<0>"(i64 %"sum##0", i64 %"tmp#4##0") {
   %"tmp#24##0" = inttoptr i64 %"tmp#4##0" to ptr
   %"tmp#13##0" = load i64, ptr %"tmp#24##0"
   %"tmp#25##0" = add i64 %"tmp#4##0", 8
@@ -298,17 +298,17 @@ if.then.0:
   %"tmp#31##0" = inttoptr i64 %"tmp#30##0" to ptr
   store i64 %"tmp#16##0", ptr %"tmp#31##0"
   %"sum##1" = add i64 %"i##0", %"sum##0"
-  tail call fastcc void @"new_array_test.#cont#3<0>"(i64 %"sum##1", i64 %"tmp#30##0")
+  tail call fastcc void @"new_array_test#.#cont#3<0>"(i64 %"sum##1", i64 %"tmp#30##0")
   ret void
 if.else.0:
-  %"tmp#18##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"sum##0", i64 0, i8 32)
-  %"tmp#19##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#18##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#19##0")
+  %"tmp#18##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"sum##0", i64 0, i8 32)
+  %"tmp#19##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#18##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#19##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"new_array_test.#cont#3<0>[6dacb8fd25]"(i64 %"sum##0", i64 %"tmp#4##0") {
+define external fastcc void @"new_array_test#.#cont#3<0>[6dacb8fd25]"(i64 %"sum##0", i64 %"tmp#4##0") {
   %"tmp#24##0" = inttoptr i64 %"tmp#4##0" to ptr
   %"tmp#13##0" = load i64, ptr %"tmp#24##0"
   %"tmp#25##0" = add i64 %"tmp#4##0", 8
@@ -323,18 +323,18 @@ if.then.0:
   %"tmp#28##0" = inttoptr i64 %"tmp#4##0" to ptr
   store i64 %"tmp#16##0", ptr %"tmp#28##0"
   %"sum##1" = add i64 %"i##0", %"sum##0"
-  tail call fastcc void @"new_array_test.#cont#3<0>[6dacb8fd25]"(i64 %"sum##1", i64 %"tmp#4##0")
+  tail call fastcc void @"new_array_test#.#cont#3<0>[6dacb8fd25]"(i64 %"sum##1", i64 %"tmp#4##0")
   ret void
 if.else.0:
-  %"tmp#18##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"sum##0", i64 0, i8 32)
-  %"tmp#19##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#18##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#19##0")
+  %"tmp#18##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"sum##0", i64 0, i8 32)
+  %"tmp#19##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#18##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#19##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"new_array_test.#cont#4<0>"(i64 %"ar##0", i64 %"tmp#1##0") {
-  %"tmp#34##0" = tail call fastcc {i64, i64, i1} @"wybe.range.[|]<0>"(i64 %"tmp#1##0")
+define external fastcc void @"new_array_test#.#cont#4<0>"(i64 %"ar##0", i64 %"tmp#1##0") {
+  %"tmp#34##0" = tail call fastcc {i64, i64, i1} @"wybe#.range#.[|]<0>"(i64 %"tmp#1##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#34##0", 0
   %"tmp#1##1" = extractvalue {i64, i64, i1}%"tmp#34##0", 1
   %"tmp#13##0" = extractvalue {i64, i64, i1}%"tmp#34##0", 2
@@ -359,14 +359,14 @@ if.then.2:
   %"tmp#40##0" = add i64 %"tmp#39##0", %"tmp#29##0"
   %"tmp#41##0" = inttoptr i64 %"tmp#40##0" to ptr
   store i64 %"i##0", ptr %"tmp#41##0"
-  tail call fastcc void @"new_array_test.#cont#4<0>[6dacb8fd25]"(i64 %"tmp#39##0", i64 %"tmp#1##1")
+  tail call fastcc void @"new_array_test#.#cont#4<0>[6dacb8fd25]"(i64 %"tmp#39##0", i64 %"tmp#1##1")
   ret void
 if.else.2:
-  %"tmp#33##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  %"tmp#33##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#1" to i64 ), i64 %"tmp#33##0")
   ret void
 if.else.1:
-  %"tmp#42##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  %"tmp#42##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#1" to i64 ), i64 %"tmp#42##0")
   ret void
 if.else.0:
@@ -382,12 +382,12 @@ if.else.0:
   %"tmp#46##0" = add i64 %"tmp#19##0", 8
   %"tmp#47##0" = inttoptr i64 %"tmp#46##0" to ptr
   store i64 %"tmp#18##0", ptr %"tmp#47##0"
-  tail call fastcc void @"new_array_test.#cont#3<0>[6dacb8fd25]"(i64 0, i64 %"tmp#19##0")
+  tail call fastcc void @"new_array_test#.#cont#3<0>[6dacb8fd25]"(i64 0, i64 %"tmp#19##0")
   ret void
 }
 
-define external fastcc void @"new_array_test.#cont#4<0>[7477e50a09]"(i64 %"ar##0", i64 %"tmp#1##0") {
-  %"tmp#34##0" = tail call fastcc {i64, i64, i1} @"wybe.range.[|]<0>[785a827a1b]"(i64 %"tmp#1##0")
+define external fastcc void @"new_array_test#.#cont#4<0>[7477e50a09]"(i64 %"ar##0", i64 %"tmp#1##0") {
+  %"tmp#34##0" = tail call fastcc {i64, i64, i1} @"wybe#.range#.[|]<0>[785a827a1b]"(i64 %"tmp#1##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#34##0", 0
   %"tmp#1##1" = extractvalue {i64, i64, i1}%"tmp#34##0", 1
   %"tmp#13##0" = extractvalue {i64, i64, i1}%"tmp#34##0", 2
@@ -407,14 +407,14 @@ if.then.2:
   %"tmp#36##0" = add i64 %"ar##0", %"tmp#29##0"
   %"tmp#37##0" = inttoptr i64 %"tmp#36##0" to ptr
   store i64 %"i##0", ptr %"tmp#37##0"
-  tail call fastcc void @"new_array_test.#cont#4<0>[7477e50a09]"(i64 %"ar##0", i64 %"tmp#1##1")
+  tail call fastcc void @"new_array_test#.#cont#4<0>[7477e50a09]"(i64 %"ar##0", i64 %"tmp#1##1")
   ret void
 if.else.2:
-  %"tmp#33##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  %"tmp#33##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#1" to i64 ), i64 %"tmp#33##0")
   ret void
 if.else.1:
-  %"tmp#38##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  %"tmp#38##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#1" to i64 ), i64 %"tmp#38##0")
   ret void
 if.else.0:
@@ -430,12 +430,12 @@ if.else.0:
   %"tmp#42##0" = add i64 %"tmp#19##0", 8
   %"tmp#43##0" = inttoptr i64 %"tmp#42##0" to ptr
   store i64 %"tmp#18##0", ptr %"tmp#43##0"
-  tail call fastcc void @"new_array_test.#cont#3<0>[6dacb8fd25]"(i64 0, i64 %"tmp#19##0")
+  tail call fastcc void @"new_array_test#.#cont#3<0>[6dacb8fd25]"(i64 0, i64 %"tmp#19##0")
   ret void
 }
 
-define external fastcc void @"new_array_test.#cont#4<0>[6dacb8fd25]"(i64 %"ar##0", i64 %"tmp#1##0") {
-  %"tmp#34##0" = tail call fastcc {i64, i64, i1} @"wybe.range.[|]<0>[785a827a1b]"(i64 %"tmp#1##0")
+define external fastcc void @"new_array_test#.#cont#4<0>[6dacb8fd25]"(i64 %"ar##0", i64 %"tmp#1##0") {
+  %"tmp#34##0" = tail call fastcc {i64, i64, i1} @"wybe#.range#.[|]<0>[785a827a1b]"(i64 %"tmp#1##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#34##0", 0
   %"tmp#1##1" = extractvalue {i64, i64, i1}%"tmp#34##0", 1
   %"tmp#13##0" = extractvalue {i64, i64, i1}%"tmp#34##0", 2
@@ -460,14 +460,14 @@ if.then.2:
   %"tmp#40##0" = add i64 %"tmp#39##0", %"tmp#29##0"
   %"tmp#41##0" = inttoptr i64 %"tmp#40##0" to ptr
   store i64 %"i##0", ptr %"tmp#41##0"
-  tail call fastcc void @"new_array_test.#cont#4<0>[6dacb8fd25]"(i64 %"tmp#39##0", i64 %"tmp#1##1")
+  tail call fastcc void @"new_array_test#.#cont#4<0>[6dacb8fd25]"(i64 %"tmp#39##0", i64 %"tmp#1##1")
   ret void
 if.else.2:
-  %"tmp#33##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  %"tmp#33##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#1" to i64 ), i64 %"tmp#33##0")
   ret void
 if.else.1:
-  %"tmp#42##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  %"tmp#42##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#1" to i64 ), i64 %"tmp#42##0")
   ret void
 if.else.0:
@@ -483,6 +483,6 @@ if.else.0:
   %"tmp#46##0" = add i64 %"tmp#19##0", 8
   %"tmp#47##0" = inttoptr i64 %"tmp#46##0" to ptr
   store i64 %"tmp#18##0", ptr %"tmp#47##0"
-  tail call fastcc void @"new_array_test.#cont#3<0>[6dacb8fd25]"(i64 0, i64 %"tmp#19##0")
+  tail call fastcc void @"new_array_test#.#cont#3<0>[6dacb8fd25]"(i64 0, i64 %"tmp#19##0")
   ret void
 }
diff --git a/test-cases/final-dump/numbers.exp b/test-cases/final-dump/numbers.exp
index aef26bbc..49d99d0d 100644
--- a/test-cases/final-dump/numbers.exp
+++ b/test-cases/final-dump/numbers.exp
@@ -56,34 +56,34 @@ toCelsius(f##0:wybe.float, ?#result##0:wybe.float)<{}; {}; {}>:
 ; ModuleID = 'numbers'
 
 source_filename = "!ROOT!/final-dump/numbers.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Numbers has been initialised.\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 29, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"numbers.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"numbers#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"numbers.factorial<0>"(i64 %"n##0") {
+define external fastcc i64 @"numbers#.factorial<0>"(i64 %"n##0") {
   %"tmp#4##0" = icmp sle i64 %"n##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
   ret i64 1
 if.else.0:
   %"tmp#3##0" = sub i64 %"n##0", 1
-  %"tmp#2##0" = tail call fastcc i64 @"numbers.factorial<0>"(i64 %"tmp#3##0")
+  %"tmp#2##0" = tail call fastcc i64 @"numbers#.factorial<0>"(i64 %"tmp#3##0")
   %"tmp#11##0" = mul i64 %"n##0", %"tmp#2##0"
   ret i64 %"tmp#11##0"
 }
 
-define external fastcc double @"numbers.toCelsius<0>"(double %"f##0") {
+define external fastcc double @"numbers#.toCelsius<0>"(double %"f##0") {
   %"tmp#1##0" = fsub double %"f##0", 32.0
   %"tmp#6##0" = fdiv double %"tmp#1##0", 1.8
   ret double %"tmp#6##0"
diff --git a/test-cases/final-dump/out_global_overwritten.exp b/test-cases/final-dump/out_global_overwritten.exp
index 1774ae7b..ac39e946 100644
--- a/test-cases/final-dump/out_global_overwritten.exp
+++ b/test-cases/final-dump/out_global_overwritten.exp
@@ -39,7 +39,7 @@ out()<{}; {<<out_global_overwritten.res>>}; {}>:
 ; ModuleID = 'out_global_overwritten'
 
 source_filename = "!ROOT!/final-dump/out_global_overwritten.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -47,16 +47,16 @@ declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#out_global_overwritten.res" = global i64 undef
 
-define external fastcc void @"out_global_overwritten.<0>"() {
+define external fastcc void @"out_global_overwritten#.<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#out_global_overwritten.res"
-  tail call fastcc void @"out_global_overwritten.out<0>"()
+  tail call fastcc void @"out_global_overwritten#.out<0>"()
   call ccc void @print_int(i64 10)
   call ccc void @putchar(i8 10)
   store i64 %"tmp#0##0", ptr @"resource#out_global_overwritten.res"
   ret void
 }
 
-define external fastcc void @"out_global_overwritten.out<0>"() {
+define external fastcc void @"out_global_overwritten#.out<0>"() {
   store i64 11, ptr @"resource#out_global_overwritten.res"
   ret void
 }
diff --git a/test-cases/final-dump/out_only_global_flow.exp b/test-cases/final-dump/out_only_global_flow.exp
index 3de5bc2b..2e600b69 100644
--- a/test-cases/final-dump/out_only_global_flow.exp
+++ b/test-cases/final-dump/out_only_global_flow.exp
@@ -40,7 +40,7 @@ out()<{}; {<<out_only_global_flow.res>>}; {}>:
 ; ModuleID = 'out_only_global_flow'
 
 source_filename = "!ROOT!/final-dump/out_only_global_flow.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -48,9 +48,9 @@ declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#out_only_global_flow.res" = global i64 undef
 
-define external fastcc void @"out_only_global_flow.<0>"() {
+define external fastcc void @"out_only_global_flow#.<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#out_only_global_flow.res"
-  tail call fastcc void @"out_only_global_flow.out<0>"()
+  tail call fastcc void @"out_only_global_flow#.out<0>"()
   %"res##1" = load i64, ptr @"resource#out_only_global_flow.res"
   call ccc void @print_int(i64 %"res##1")
   call ccc void @putchar(i8 10)
@@ -58,7 +58,7 @@ define external fastcc void @"out_only_global_flow.<0>"() {
   ret void
 }
 
-define external fastcc void @"out_only_global_flow.out<0>"() {
+define external fastcc void @"out_only_global_flow#.out<0>"() {
   store i64 11, ptr @"resource#out_only_global_flow.res"
   ret void
 }
diff --git a/test-cases/final-dump/person1.exp b/test-cases/final-dump/person1.exp
index 4e6231ad..d4280a54 100644
--- a/test-cases/final-dump/person1.exp
+++ b/test-cases/final-dump/person1.exp
@@ -35,16 +35,16 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'person1'
 
 source_filename = "!ROOT!/final-dump/person1.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Wang\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 4, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"person1.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"person1#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   ret void
 }
 
@@ -160,14 +160,14 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'person1.person'
 
 source_filename = "!ROOT!/final-dump/person1.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"person1.person.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"person1#.person#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#11##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#firstname##0" = load i64, ptr %"tmp#11##0"
   %"tmp#12##0" = add i64 %"#left##0", 8
@@ -178,24 +178,24 @@ define external fastcc i1 @"person1.person.=<0>"(i64 %"#left##0", i64 %"#right##
   %"tmp#15##0" = add i64 %"#right##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   %"#right#lastname##0" = load i64, ptr %"tmp#16##0"
-  %"tmp#7##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#firstname##0", i64 %"#right#firstname##0", i64 %"#left#firstname##0", i64 %"#right#firstname##0")
+  %"tmp#7##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#firstname##0", i64 %"#right#firstname##0", i64 %"#left#firstname##0", i64 %"#right#firstname##0")
   %"tmp#1##0" = icmp eq i2 %"tmp#7##0", 1
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#10##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#lastname##0", i64 %"#right#lastname##0", i64 %"#left#lastname##0", i64 %"#right#lastname##0")
+  %"tmp#10##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#lastname##0", i64 %"#right#lastname##0", i64 %"#left#lastname##0", i64 %"#right#lastname##0")
   %"tmp#17##0" = icmp eq i2 %"tmp#10##0", 1
   ret i1 %"tmp#17##0"
 if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"person1.person.firstname<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"person1#.person#.firstname<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"person1.person.firstname<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"person1#.person#.firstname<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -205,14 +205,14 @@ define external fastcc i64 @"person1.person.firstname<1>"(i64 %"#rec##0", i64 %"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person1.person.lastname<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"person1#.person#.lastname<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person1.person.lastname<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"person1#.person#.lastname<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -223,7 +223,7 @@ define external fastcc i64 @"person1.person.lastname<1>"(i64 %"#rec##0", i64 %"#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person1.person.person<0>"(i64 %"firstname##0", i64 %"lastname##0") {
+define external fastcc i64 @"person1#.person#.person<0>"(i64 %"firstname##0", i64 %"lastname##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -234,7 +234,7 @@ define external fastcc i64 @"person1.person.person<0>"(i64 %"firstname##0", i64
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"person1.person.person<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"person1#.person#.person<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -245,7 +245,7 @@ define external fastcc {i64, i64} @"person1.person.person<1>"(i64 %"#result##0")
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"person1.person.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"person1#.person#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#10##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#10##0"
   %"tmp#11##0" = add i64 %"#left##0", 8
@@ -256,11 +256,11 @@ define external fastcc i1 @"person1.person.~=<0>"(i64 %"#left##0", i64 %"#right#
   %"tmp#14##0" = add i64 %"#right##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   %"tmp#6##0" = load i64, ptr %"tmp#15##0"
-  %"tmp#7##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#3##0", i64 %"tmp#5##0", i64 %"tmp#3##0", i64 %"tmp#5##0")
+  %"tmp#7##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#3##0", i64 %"tmp#5##0", i64 %"tmp#3##0", i64 %"tmp#5##0")
   %"tmp#8##0" = icmp eq i2 %"tmp#7##0", 1
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#9##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
+  %"tmp#9##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
   %"tmp#0##0" = icmp eq i2 %"tmp#9##0", 1
   %"tmp#16##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#16##0"
diff --git a/test-cases/final-dump/person2.exp b/test-cases/final-dump/person2.exp
index bc7ac3ac..caa76eba 100644
--- a/test-cases/final-dump/person2.exp
+++ b/test-cases/final-dump/person2.exp
@@ -36,17 +36,17 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'person2'
 
 source_filename = "!ROOT!/final-dump/person2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Smith\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 5, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"person2.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"person2#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   ret void
 }
 
@@ -162,14 +162,14 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'person2.person'
 
 source_filename = "!ROOT!/final-dump/person2.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"person2.person.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"person2#.person#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#11##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#firstname##0" = load i64, ptr %"tmp#11##0"
   %"tmp#12##0" = add i64 %"#left##0", 8
@@ -180,24 +180,24 @@ define external fastcc i1 @"person2.person.=<0>"(i64 %"#left##0", i64 %"#right##
   %"tmp#15##0" = add i64 %"#right##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   %"#right#lastname##0" = load i64, ptr %"tmp#16##0"
-  %"tmp#7##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#firstname##0", i64 %"#right#firstname##0", i64 %"#left#firstname##0", i64 %"#right#firstname##0")
+  %"tmp#7##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#firstname##0", i64 %"#right#firstname##0", i64 %"#left#firstname##0", i64 %"#right#firstname##0")
   %"tmp#1##0" = icmp eq i2 %"tmp#7##0", 1
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#10##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#lastname##0", i64 %"#right#lastname##0", i64 %"#left#lastname##0", i64 %"#right#lastname##0")
+  %"tmp#10##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#lastname##0", i64 %"#right#lastname##0", i64 %"#left#lastname##0", i64 %"#right#lastname##0")
   %"tmp#17##0" = icmp eq i2 %"tmp#10##0", 1
   ret i1 %"tmp#17##0"
 if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"person2.person.firstname<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"person2#.person#.firstname<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"person2.person.firstname<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"person2#.person#.firstname<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -207,14 +207,14 @@ define external fastcc i64 @"person2.person.firstname<1>"(i64 %"#rec##0", i64 %"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person2.person.lastname<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"person2#.person#.lastname<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person2.person.lastname<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"person2#.person#.lastname<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -225,7 +225,7 @@ define external fastcc i64 @"person2.person.lastname<1>"(i64 %"#rec##0", i64 %"#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person2.person.person<0>"(i64 %"firstname##0", i64 %"lastname##0") {
+define external fastcc i64 @"person2#.person#.person<0>"(i64 %"firstname##0", i64 %"lastname##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -236,7 +236,7 @@ define external fastcc i64 @"person2.person.person<0>"(i64 %"firstname##0", i64
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"person2.person.person<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"person2#.person#.person<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -247,7 +247,7 @@ define external fastcc {i64, i64} @"person2.person.person<1>"(i64 %"#result##0")
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"person2.person.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"person2#.person#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#10##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#10##0"
   %"tmp#11##0" = add i64 %"#left##0", 8
@@ -258,11 +258,11 @@ define external fastcc i1 @"person2.person.~=<0>"(i64 %"#left##0", i64 %"#right#
   %"tmp#14##0" = add i64 %"#right##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   %"tmp#6##0" = load i64, ptr %"tmp#15##0"
-  %"tmp#7##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#3##0", i64 %"tmp#5##0", i64 %"tmp#3##0", i64 %"tmp#5##0")
+  %"tmp#7##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#3##0", i64 %"tmp#5##0", i64 %"tmp#3##0", i64 %"tmp#5##0")
   %"tmp#8##0" = icmp eq i2 %"tmp#7##0", 1
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#9##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
+  %"tmp#9##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
   %"tmp#0##0" = icmp eq i2 %"tmp#9##0", 1
   %"tmp#16##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#16##0"
diff --git a/test-cases/final-dump/person3.exp b/test-cases/final-dump/person3.exp
index 734eca7b..1a88082e 100644
--- a/test-cases/final-dump/person3.exp
+++ b/test-cases/final-dump/person3.exp
@@ -36,19 +36,19 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'person3'
 
 source_filename = "!ROOT!/final-dump/person3.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Smith\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"Wang\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 5, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 4, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"person3.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+define external fastcc void @"person3#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   ret void
 }
 
@@ -164,14 +164,14 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'person3.person'
 
 source_filename = "!ROOT!/final-dump/person3.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"person3.person.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"person3#.person#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#11##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#firstname##0" = load i64, ptr %"tmp#11##0"
   %"tmp#12##0" = add i64 %"#left##0", 8
@@ -182,24 +182,24 @@ define external fastcc i1 @"person3.person.=<0>"(i64 %"#left##0", i64 %"#right##
   %"tmp#15##0" = add i64 %"#right##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   %"#right#lastname##0" = load i64, ptr %"tmp#16##0"
-  %"tmp#7##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#firstname##0", i64 %"#right#firstname##0", i64 %"#left#firstname##0", i64 %"#right#firstname##0")
+  %"tmp#7##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#firstname##0", i64 %"#right#firstname##0", i64 %"#left#firstname##0", i64 %"#right#firstname##0")
   %"tmp#1##0" = icmp eq i2 %"tmp#7##0", 1
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#10##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#lastname##0", i64 %"#right#lastname##0", i64 %"#left#lastname##0", i64 %"#right#lastname##0")
+  %"tmp#10##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#lastname##0", i64 %"#right#lastname##0", i64 %"#left#lastname##0", i64 %"#right#lastname##0")
   %"tmp#17##0" = icmp eq i2 %"tmp#10##0", 1
   ret i1 %"tmp#17##0"
 if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"person3.person.firstname<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"person3#.person#.firstname<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"person3.person.firstname<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"person3#.person#.firstname<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -209,14 +209,14 @@ define external fastcc i64 @"person3.person.firstname<1>"(i64 %"#rec##0", i64 %"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person3.person.lastname<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"person3#.person#.lastname<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person3.person.lastname<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"person3#.person#.lastname<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -227,7 +227,7 @@ define external fastcc i64 @"person3.person.lastname<1>"(i64 %"#rec##0", i64 %"#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person3.person.person<0>"(i64 %"firstname##0", i64 %"lastname##0") {
+define external fastcc i64 @"person3#.person#.person<0>"(i64 %"firstname##0", i64 %"lastname##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -238,7 +238,7 @@ define external fastcc i64 @"person3.person.person<0>"(i64 %"firstname##0", i64
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"person3.person.person<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"person3#.person#.person<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -249,7 +249,7 @@ define external fastcc {i64, i64} @"person3.person.person<1>"(i64 %"#result##0")
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"person3.person.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"person3#.person#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#10##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#10##0"
   %"tmp#11##0" = add i64 %"#left##0", 8
@@ -260,11 +260,11 @@ define external fastcc i1 @"person3.person.~=<0>"(i64 %"#left##0", i64 %"#right#
   %"tmp#14##0" = add i64 %"#right##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   %"tmp#6##0" = load i64, ptr %"tmp#15##0"
-  %"tmp#7##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#3##0", i64 %"tmp#5##0", i64 %"tmp#3##0", i64 %"tmp#5##0")
+  %"tmp#7##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#3##0", i64 %"tmp#5##0", i64 %"tmp#3##0", i64 %"tmp#5##0")
   %"tmp#8##0" = icmp eq i2 %"tmp#7##0", 1
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#9##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
+  %"tmp#9##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
   %"tmp#0##0" = icmp eq i2 %"tmp#9##0", 1
   %"tmp#16##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#16##0"
diff --git a/test-cases/final-dump/person4.exp b/test-cases/final-dump/person4.exp
index 34f2bc18..4c2cb93f 100644
--- a/test-cases/final-dump/person4.exp
+++ b/test-cases/final-dump/person4.exp
@@ -36,19 +36,19 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'person4'
 
 source_filename = "!ROOT!/final-dump/person4.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Smith\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"Wang\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 5, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 4, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"person4.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+define external fastcc void @"person4#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   ret void
 }
 
@@ -164,14 +164,14 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'person4.person'
 
 source_filename = "!ROOT!/final-dump/person4.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"person4.person.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"person4#.person#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#11##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#firstname##0" = load i64, ptr %"tmp#11##0"
   %"tmp#12##0" = add i64 %"#left##0", 8
@@ -182,24 +182,24 @@ define external fastcc i1 @"person4.person.=<0>"(i64 %"#left##0", i64 %"#right##
   %"tmp#15##0" = add i64 %"#right##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   %"#right#lastname##0" = load i64, ptr %"tmp#16##0"
-  %"tmp#7##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#firstname##0", i64 %"#right#firstname##0", i64 %"#left#firstname##0", i64 %"#right#firstname##0")
+  %"tmp#7##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#firstname##0", i64 %"#right#firstname##0", i64 %"#left#firstname##0", i64 %"#right#firstname##0")
   %"tmp#1##0" = icmp eq i2 %"tmp#7##0", 1
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#10##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#lastname##0", i64 %"#right#lastname##0", i64 %"#left#lastname##0", i64 %"#right#lastname##0")
+  %"tmp#10##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#lastname##0", i64 %"#right#lastname##0", i64 %"#left#lastname##0", i64 %"#right#lastname##0")
   %"tmp#17##0" = icmp eq i2 %"tmp#10##0", 1
   ret i1 %"tmp#17##0"
 if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"person4.person.firstname<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"person4#.person#.firstname<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"person4.person.firstname<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"person4#.person#.firstname<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -209,14 +209,14 @@ define external fastcc i64 @"person4.person.firstname<1>"(i64 %"#rec##0", i64 %"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person4.person.lastname<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"person4#.person#.lastname<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person4.person.lastname<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"person4#.person#.lastname<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -227,7 +227,7 @@ define external fastcc i64 @"person4.person.lastname<1>"(i64 %"#rec##0", i64 %"#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person4.person.person<0>"(i64 %"firstname##0", i64 %"lastname##0") {
+define external fastcc i64 @"person4#.person#.person<0>"(i64 %"firstname##0", i64 %"lastname##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -238,7 +238,7 @@ define external fastcc i64 @"person4.person.person<0>"(i64 %"firstname##0", i64
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"person4.person.person<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"person4#.person#.person<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -249,7 +249,7 @@ define external fastcc {i64, i64} @"person4.person.person<1>"(i64 %"#result##0")
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"person4.person.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"person4#.person#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#10##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#10##0"
   %"tmp#11##0" = add i64 %"#left##0", 8
@@ -260,11 +260,11 @@ define external fastcc i1 @"person4.person.~=<0>"(i64 %"#left##0", i64 %"#right#
   %"tmp#14##0" = add i64 %"#right##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   %"tmp#6##0" = load i64, ptr %"tmp#15##0"
-  %"tmp#7##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#3##0", i64 %"tmp#5##0", i64 %"tmp#3##0", i64 %"tmp#5##0")
+  %"tmp#7##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#3##0", i64 %"tmp#5##0", i64 %"tmp#3##0", i64 %"tmp#5##0")
   %"tmp#8##0" = icmp eq i2 %"tmp#7##0", 1
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#9##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
+  %"tmp#9##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
   %"tmp#0##0" = icmp eq i2 %"tmp#9##0", 1
   %"tmp#16##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#16##0"
diff --git a/test-cases/final-dump/person5.exp b/test-cases/final-dump/person5.exp
index 129ed7af..d16a30f4 100644
--- a/test-cases/final-dump/person5.exp
+++ b/test-cases/final-dump/person5.exp
@@ -45,24 +45,24 @@ update_both(p1##0:person5.person, ?p1##1:person5.person, p2##0:person5.person, ?
 ; ModuleID = 'person5'
 
 source_filename = "!ROOT!/final-dump/person5.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Amy\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"Bob\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"person5.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+define external fastcc void @"person5#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   ret void
 }
 
-define external fastcc {i64, i64} @"person5.update_both<0>"(i64 %"p1##0", i64 %"p2##0") {
+define external fastcc {i64, i64} @"person5#.update_both<0>"(i64 %"p1##0", i64 %"p2##0") {
   %"tmp#4##0" = inttoptr i64 %"p1##0" to ptr
   %"tmp#5##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#5##0", ptr %"tmp#4##0", i64 16, i1 0)
@@ -192,14 +192,14 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'person5.person'
 
 source_filename = "!ROOT!/final-dump/person5.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"person5.person.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"person5#.person#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#11##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#firstname##0" = load i64, ptr %"tmp#11##0"
   %"tmp#12##0" = add i64 %"#left##0", 8
@@ -210,24 +210,24 @@ define external fastcc i1 @"person5.person.=<0>"(i64 %"#left##0", i64 %"#right##
   %"tmp#15##0" = add i64 %"#right##0", 8
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   %"#right#lastname##0" = load i64, ptr %"tmp#16##0"
-  %"tmp#7##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#firstname##0", i64 %"#right#firstname##0", i64 %"#left#firstname##0", i64 %"#right#firstname##0")
+  %"tmp#7##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#firstname##0", i64 %"#right#firstname##0", i64 %"#left#firstname##0", i64 %"#right#firstname##0")
   %"tmp#1##0" = icmp eq i2 %"tmp#7##0", 1
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#10##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#lastname##0", i64 %"#right#lastname##0", i64 %"#left#lastname##0", i64 %"#right#lastname##0")
+  %"tmp#10##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#lastname##0", i64 %"#right#lastname##0", i64 %"#left#lastname##0", i64 %"#right#lastname##0")
   %"tmp#17##0" = icmp eq i2 %"tmp#10##0", 1
   ret i1 %"tmp#17##0"
 if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"person5.person.firstname<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"person5#.person#.firstname<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"person5.person.firstname<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"person5#.person#.firstname<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -237,14 +237,14 @@ define external fastcc i64 @"person5.person.firstname<1>"(i64 %"#rec##0", i64 %"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person5.person.lastname<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"person5#.person#.lastname<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person5.person.lastname<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"person5#.person#.lastname<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -255,7 +255,7 @@ define external fastcc i64 @"person5.person.lastname<1>"(i64 %"#rec##0", i64 %"#
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"person5.person.person<0>"(i64 %"firstname##0", i64 %"lastname##0") {
+define external fastcc i64 @"person5#.person#.person<0>"(i64 %"firstname##0", i64 %"lastname##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -266,7 +266,7 @@ define external fastcc i64 @"person5.person.person<0>"(i64 %"firstname##0", i64
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"person5.person.person<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"person5#.person#.person<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -277,7 +277,7 @@ define external fastcc {i64, i64} @"person5.person.person<1>"(i64 %"#result##0")
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"person5.person.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"person5#.person#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#10##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#10##0"
   %"tmp#11##0" = add i64 %"#left##0", 8
@@ -288,11 +288,11 @@ define external fastcc i1 @"person5.person.~=<0>"(i64 %"#left##0", i64 %"#right#
   %"tmp#14##0" = add i64 %"#right##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   %"tmp#6##0" = load i64, ptr %"tmp#15##0"
-  %"tmp#7##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#3##0", i64 %"tmp#5##0", i64 %"tmp#3##0", i64 %"tmp#5##0")
+  %"tmp#7##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#3##0", i64 %"tmp#5##0", i64 %"tmp#3##0", i64 %"tmp#5##0")
   %"tmp#8##0" = icmp eq i2 %"tmp#7##0", 1
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#9##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
+  %"tmp#9##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
   %"tmp#0##0" = icmp eq i2 %"tmp#9##0", 1
   %"tmp#16##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#16##0"
diff --git a/test-cases/final-dump/position.exp b/test-cases/final-dump/position.exp
index 3055d786..89925b99 100644
--- a/test-cases/final-dump/position.exp
+++ b/test-cases/final-dump/position.exp
@@ -49,28 +49,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -183,13 +183,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -209,7 +209,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -220,7 +220,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -231,13 +231,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -247,14 +247,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -265,7 +265,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/position1.exp b/test-cases/final-dump/position1.exp
index 44e842c5..7bd53233 100644
--- a/test-cases/final-dump/position1.exp
+++ b/test-cases/final-dump/position1.exp
@@ -49,28 +49,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -183,13 +183,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -209,7 +209,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -220,7 +220,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -231,13 +231,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -247,14 +247,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -265,7 +265,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
@@ -316,17 +316,17 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'position1'
 
 source_filename = "!ROOT!/final-dump/position1.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"expect posA(111,112):\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 21, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position1.<0>"() {
+define external fastcc void @"position1#.<0>"() {
   %"tmp#12##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#12##0" to i64
   %"tmp#13##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -337,7 +337,7 @@ define external fastcc void @"position1.<0>"() {
   %"tmp#16##0" = add i64 %"tmp#4##0", 8
   %"tmp#17##0" = inttoptr i64 %"tmp#16##0" to ptr
   store i64 112, ptr %"tmp#17##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#4##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#4##0")
   ret void
 }
diff --git a/test-cases/final-dump/position2.exp b/test-cases/final-dump/position2.exp
index 2f99a64a..84955cdd 100644
--- a/test-cases/final-dump/position2.exp
+++ b/test-cases/final-dump/position2.exp
@@ -49,28 +49,28 @@ printPosition(pos##0:position.position)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position.printPosition<0>"(i64 %"pos##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"position#.printPosition<0>"(i64 %"pos##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   %"tmp#23##0" = inttoptr i64 %"pos##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#23##0"
   call ccc void @print_int(i64 %"tmp#0##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   %"tmp#24##0" = add i64 %"pos##0", 8
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#25##0"
   call ccc void @print_int(i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -183,13 +183,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position.position'
 
 source_filename = "!ROOT!/final-dump/position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -209,7 +209,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"position#.position#.position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -220,7 +220,7 @@ define external fastcc i64 @"position.position.position<0>"(i64 %"x##0", i64 %"y
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"position#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -231,13 +231,13 @@ define external fastcc {i64, i64} @"position.position.position<1>"(i64 %"#result
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"position.position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -247,14 +247,14 @@ define external fastcc i64 @"position.position.x<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"position#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"position#.position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -265,7 +265,7 @@ define external fastcc i64 @"position.position.y<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
@@ -323,7 +323,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'position2'
 
 source_filename = "!ROOT!/final-dump/position2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"expect posA(111,20000):\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"expect posA(111,222):\00", align 8
@@ -332,12 +332,12 @@ target triple    ????
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 21, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 21, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 
-declare external fastcc void @"position.printPosition<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"position#.printPosition<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"position2.<0>"() {
+define external fastcc void @"position2#.<0>"() {
   %"tmp#14##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#5##0" = ptrtoint ptr %"tmp#14##0" to i64
   %"tmp#15##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -352,14 +352,14 @@ define external fastcc void @"position2.<0>"() {
   %"tmp#20##0" = add i64 %"tmp#10##0", 8
   %"tmp#21##0" = inttoptr i64 %"tmp#20##0" to ptr
   store i64 222, ptr %"tmp#21##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#5##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#5##0")
   %"tmp#22##0" = add i64 %"tmp#5##0", 8
   %"tmp#23##0" = inttoptr i64 %"tmp#22##0" to ptr
   store i64 20000, ptr %"tmp#23##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#5##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
-  tail call fastcc void @"position.printPosition<0>"(i64 %"tmp#10##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#5##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"position#.printPosition<0>"(i64 %"tmp#10##0")
   ret void
 }
diff --git a/test-cases/final-dump/position_float.exp b/test-cases/final-dump/position_float.exp
index 8142dfb4..e37263fe 100644
--- a/test-cases/final-dump/position_float.exp
+++ b/test-cases/final-dump/position_float.exp
@@ -28,7 +28,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'position_float'
 
 source_filename = "!ROOT!/final-dump/position_float.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -141,13 +141,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'position_float.position'
 
 source_filename = "!ROOT!/final-dump/position_float.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"position_float.position.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position_float#.position#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#x##0" = load double, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -167,7 +167,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"position_float.position.position<0>"(double %"x##0", double %"y##0") {
+define external fastcc i64 @"position_float#.position#.position<0>"(double %"x##0", double %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -178,7 +178,7 @@ define external fastcc i64 @"position_float.position.position<0>"(double %"x##0"
   ret i64 %"#rec##0"
 }
 
-define external fastcc {double, double} @"position_float.position.position<1>"(i64 %"#result##0") {
+define external fastcc {double, double} @"position_float#.position#.position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load double, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -189,13 +189,13 @@ define external fastcc {double, double} @"position_float.position.position<1>"(i
   ret {double, double} %"tmp#6##0"
 }
 
-define external fastcc double @"position_float.position.x<0>"(i64 %"#rec##0") {
+define external fastcc double @"position_float#.position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load double, ptr %"tmp#0##0"
   ret double %"tmp#1##0"
 }
 
-define external fastcc i64 @"position_float.position.x<1>"(i64 %"#rec##0", double %"#field##0") {
+define external fastcc i64 @"position_float#.position#.x<1>"(i64 %"#rec##0", double %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -205,14 +205,14 @@ define external fastcc i64 @"position_float.position.x<1>"(i64 %"#rec##0", doubl
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc double @"position_float.position.y<0>"(i64 %"#rec##0") {
+define external fastcc double @"position_float#.position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load double, ptr %"tmp#1##0"
   ret double %"tmp#2##0"
 }
 
-define external fastcc i64 @"position_float.position.y<1>"(i64 %"#rec##0", double %"#field##0") {
+define external fastcc i64 @"position_float#.position#.y<1>"(i64 %"#rec##0", double %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -223,7 +223,7 @@ define external fastcc i64 @"position_float.position.y<1>"(i64 %"#rec##0", doubl
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"position_float.position.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"position_float#.position#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#8##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load double, ptr %"tmp#8##0"
   %"tmp#9##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/proc_allin.exp b/test-cases/final-dump/proc_allin.exp
index 8bc7fe01..079e47f1 100644
--- a/test-cases/final-dump/proc_allin.exp
+++ b/test-cases/final-dump/proc_allin.exp
@@ -24,11 +24,11 @@ nada([x##0:wybe.int], [y##0:wybe.int])<{}; {}; {}>:
 ; ModuleID = 'proc_allin'
 
 source_filename = "!ROOT!/final-dump/proc_allin.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"proc_allin.nada<0>"() {
+define external fastcc void @"proc_allin#.nada<0>"() {
   ret void
 }
diff --git a/test-cases/final-dump/proc_beer.exp b/test-cases/final-dump/proc_beer.exp
index 782ac0e8..a593891b 100644
--- a/test-cases/final-dump/proc_beer.exp
+++ b/test-cases/final-dump/proc_beer.exp
@@ -72,45 +72,45 @@ beer99#cont#2(count##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'proc_beer'
 
 source_filename = "!ROOT!/final-dump/proc_beer.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" bottles of beer on the wall\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 28, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"proc_beer.<0>"() {
-  tail call fastcc void @"proc_beer.beer99#cont#1<0>"(i64 99)
+define external fastcc void @"proc_beer#.<0>"() {
+  tail call fastcc void @"proc_beer#.beer99#cont#1<0>"(i64 99)
   ret void
 }
 
-define external fastcc void @"proc_beer.beer99<0>"() {
-  tail call fastcc void @"proc_beer.beer99#cont#1<0>"(i64 99)
+define external fastcc void @"proc_beer#.beer99<0>"() {
+  tail call fastcc void @"proc_beer#.beer99#cont#1<0>"(i64 99)
   ret void
 }
 
-define external fastcc void @"proc_beer.beer99#cont#1<0>"(i64 %"count##0") {
+define external fastcc void @"proc_beer#.beer99#cont#1<0>"(i64 %"count##0") {
   %"tmp#0##0" = icmp sge i64 %"count##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
   call ccc void @print_int(i64 %"count##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   %"tmp#8##0" = sub i64 %"count##0", 1
-  tail call fastcc void @"proc_beer.beer99#cont#1<0>"(i64 %"tmp#8##0")
+  tail call fastcc void @"proc_beer#.beer99#cont#1<0>"(i64 %"tmp#8##0")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"proc_beer.beer99#cont#2<0>"(i64 %"count##0") {
+define external fastcc void @"proc_beer#.beer99#cont#2<0>"(i64 %"count##0") {
   call ccc void @print_int(i64 %"count##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   %"count##1" = sub i64 %"count##0", 1
-  tail call fastcc void @"proc_beer.beer99#cont#1<0>"(i64 %"count##1")
+  tail call fastcc void @"proc_beer#.beer99#cont#1<0>"(i64 %"count##1")
   ret void
 }
diff --git a/test-cases/final-dump/proc_factorial.exp b/test-cases/final-dump/proc_factorial.exp
index d34b592d..027220b8 100644
--- a/test-cases/final-dump/proc_factorial.exp
+++ b/test-cases/final-dump/proc_factorial.exp
@@ -65,40 +65,40 @@ factorial#cont#2(n##0:wybe.int, result##0:wybe.int, ?result##2:wybe.int)<{}; {};
 ; ModuleID = 'proc_factorial'
 
 source_filename = "!ROOT!/final-dump/proc_factorial.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"proc_factorial.<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"proc_factorial.factorial#cont#1<0>"(i64 5, i64 1)
+define external fastcc void @"proc_factorial#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"proc_factorial#.factorial#cont#1<0>"(i64 5, i64 1)
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i64 @"proc_factorial.factorial<0>"(i64 %"n##0") {
-  %"tmp#3##0" = tail call fastcc i64 @"proc_factorial.factorial#cont#1<0>"(i64 %"n##0", i64 1)
+define external fastcc i64 @"proc_factorial#.factorial<0>"(i64 %"n##0") {
+  %"tmp#3##0" = tail call fastcc i64 @"proc_factorial#.factorial#cont#1<0>"(i64 %"n##0", i64 1)
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc i64 @"proc_factorial.factorial#cont#1<0>"(i64 %"n##0", i64 %"result##0") {
+define external fastcc i64 @"proc_factorial#.factorial#cont#1<0>"(i64 %"n##0", i64 %"result##0") {
   %"tmp#2##0" = icmp sgt i64 %"n##0", 1
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#7##0" = mul i64 %"n##0", %"result##0"
   %"tmp#8##0" = sub i64 %"n##0", 1
-  %"tmp#9##0" = tail call fastcc i64 @"proc_factorial.factorial#cont#1<0>"(i64 %"tmp#8##0", i64 %"tmp#7##0")
+  %"tmp#9##0" = tail call fastcc i64 @"proc_factorial#.factorial#cont#1<0>"(i64 %"tmp#8##0", i64 %"tmp#7##0")
   ret i64 %"tmp#9##0"
 if.else.0:
   ret i64 %"result##0"
 }
 
-define external fastcc i64 @"proc_factorial.factorial#cont#2<0>"(i64 %"n##0", i64 %"result##0") {
+define external fastcc i64 @"proc_factorial#.factorial#cont#2<0>"(i64 %"n##0", i64 %"result##0") {
   %"tmp#0##0" = mul i64 %"n##0", %"result##0"
   %"tmp#1##0" = sub i64 %"n##0", 1
-  %"tmp#6##0" = tail call fastcc i64 @"proc_factorial.factorial#cont#1<0>"(i64 %"tmp#1##0", i64 %"tmp#0##0")
+  %"tmp#6##0" = tail call fastcc i64 @"proc_factorial#.factorial#cont#1<0>"(i64 %"tmp#1##0", i64 %"tmp#0##0")
   ret i64 %"tmp#6##0"
 }
diff --git a/test-cases/final-dump/proc_gcd.exp b/test-cases/final-dump/proc_gcd.exp
index 43a28c51..1d2ab59f 100644
--- a/test-cases/final-dump/proc_gcd.exp
+++ b/test-cases/final-dump/proc_gcd.exp
@@ -79,42 +79,42 @@ mod(x##0:wybe.int, y##0:wybe.int, ?r##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.i
 ; ModuleID = 'proc_gcd'
 
 source_filename = "!ROOT!/final-dump/proc_gcd.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"proc_gcd.<0>"() {
-  %"r##0" = tail call fastcc i64 @"proc_gcd.gcd#cont#1<0>"(i64 18, i64 24)
+define external fastcc void @"proc_gcd#.<0>"() {
+  %"r##0" = tail call fastcc i64 @"proc_gcd#.gcd#cont#1<0>"(i64 18, i64 24)
   call ccc void @print_int(i64 %"r##0")
   ret void
 }
 
-define external fastcc i64 @"proc_gcd.gcd<0>"(i64 %"a##0", i64 %"b##0") {
-  %"tmp#1##0" = tail call fastcc i64 @"proc_gcd.gcd#cont#1<0>"(i64 %"a##0", i64 %"b##0")
+define external fastcc i64 @"proc_gcd#.gcd<0>"(i64 %"a##0", i64 %"b##0") {
+  %"tmp#1##0" = tail call fastcc i64 @"proc_gcd#.gcd#cont#1<0>"(i64 %"a##0", i64 %"b##0")
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"proc_gcd.gcd#cont#1<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"proc_gcd#.gcd#cont#1<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = icmp ne i64 %"y##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#6##0" = tail call fastcc i64 @"proc_gcd.mod<0>"(i64 %"x##0", i64 %"y##0")
-  %"tmp#7##0" = tail call fastcc i64 @"proc_gcd.gcd#cont#1<0>"(i64 %"y##0", i64 %"tmp#6##0")
+  %"tmp#6##0" = tail call fastcc i64 @"proc_gcd#.mod<0>"(i64 %"x##0", i64 %"y##0")
+  %"tmp#7##0" = tail call fastcc i64 @"proc_gcd#.gcd#cont#1<0>"(i64 %"y##0", i64 %"tmp#6##0")
   ret i64 %"tmp#7##0"
 if.else.0:
   ret i64 %"x##0"
 }
 
-define external fastcc i64 @"proc_gcd.gcd#cont#2<0>"(i64 %"x##0", i64 %"y##0") {
-  %"y##1" = tail call fastcc i64 @"proc_gcd.mod<0>"(i64 %"x##0", i64 %"y##0")
-  %"tmp#0##0" = tail call fastcc i64 @"proc_gcd.gcd#cont#1<0>"(i64 %"y##0", i64 %"y##1")
+define external fastcc i64 @"proc_gcd#.gcd#cont#2<0>"(i64 %"x##0", i64 %"y##0") {
+  %"y##1" = tail call fastcc i64 @"proc_gcd#.mod<0>"(i64 %"x##0", i64 %"y##0")
+  %"tmp#0##0" = tail call fastcc i64 @"proc_gcd#.gcd#cont#1<0>"(i64 %"y##0", i64 %"y##1")
   ret i64 %"tmp#0##0"
 }
 
-define external fastcc i64 @"proc_gcd.mod<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"proc_gcd#.mod<0>"(i64 %"x##0", i64 %"y##0") {
   call ccc void @putchar(i8 120)
   call ccc void @print_int(i64 %"x##0")
   call ccc void @putchar(i8 32)
diff --git a/test-cases/final-dump/proc_hello.exp b/test-cases/final-dump/proc_hello.exp
index 52aaab10..8a88a0d4 100644
--- a/test-cases/final-dump/proc_hello.exp
+++ b/test-cases/final-dump/proc_hello.exp
@@ -28,17 +28,17 @@ print2([x##0:wybe.int], [y##0:wybe.int])<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>
 ; ModuleID = 'proc_hello'
 
 source_filename = "!ROOT!/final-dump/proc_hello.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"hello, world\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 12, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"proc_hello.print2<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+define external fastcc void @"proc_hello#.print2<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/proc_print2.exp b/test-cases/final-dump/proc_print2.exp
index 9f1186a4..d7712837 100644
--- a/test-cases/final-dump/proc_print2.exp
+++ b/test-cases/final-dump/proc_print2.exp
@@ -28,13 +28,13 @@ print2(x##0:wybe.int, y##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'proc_print2'
 
 source_filename = "!ROOT!/final-dump/proc_print2.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"proc_print2.print2<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc void @"proc_print2#.print2<0>"(i64 %"x##0", i64 %"y##0") {
   call ccc void @print_int(i64 %"x##0")
   call ccc void @print_int(i64 %"y##0")
   ret void
diff --git a/test-cases/final-dump/proc_yorn.exp b/test-cases/final-dump/proc_yorn.exp
index 53ba2814..0090a285 100644
--- a/test-cases/final-dump/proc_yorn.exp
+++ b/test-cases/final-dump/proc_yorn.exp
@@ -92,7 +92,7 @@ yorn#cont#1(prompt##0:wybe.string, ?result##1:wybe.bool)<{<<wybe.io.io>>}; {<<wy
 ; ModuleID = 'proc_yorn'
 
 source_filename = "!ROOT!/final-dump/proc_yorn.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (y/n) \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"Please answer 'yes' or 'no'.\00", align 8
@@ -101,20 +101,20 @@ target triple    ????
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 28, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 16, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.bool.print<0>"(i1)
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.bool#.print<0>"(i1)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc i8 @read_char()
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"proc_yorn.<0>"() {
-  %"r##0" = tail call fastcc i1 @"proc_yorn.yorn#cont#1<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
-  tail call fastcc void @"wybe.bool.print<0>"(i1 %"r##0")
+define external fastcc void @"proc_yorn#.<0>"() {
+  %"r##0" = tail call fastcc i1 @"proc_yorn#.yorn#cont#1<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 %"r##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i1 @"proc_yorn.is_yes<0>"(i8 %"ch##0") {
+define external fastcc i1 @"proc_yorn#.is_yes<0>"(i8 %"ch##0") {
   %"tmp#2##0" = icmp ne i8 %"ch##0", 121
   %"tmp#3##0" = icmp ne i8 %"ch##0", 89
   %"tmp#1##0" = and i1 %"tmp#2##0", %"tmp#3##0"
@@ -122,7 +122,7 @@ define external fastcc i1 @"proc_yorn.is_yes<0>"(i8 %"ch##0") {
   ret i1 %"tmp#11##0"
 }
 
-define external fastcc i1 @"proc_yorn.is_yes_or_no<0>"(i8 %"ch##0") {
+define external fastcc i1 @"proc_yorn#.is_yes_or_no<0>"(i8 %"ch##0") {
   %"tmp#6##0" = icmp ne i8 %"ch##0", 121
   %"tmp#7##0" = icmp ne i8 %"ch##0", 89
   %"tmp#8##0" = and i1 %"tmp#6##0", %"tmp#7##0"
@@ -134,26 +134,26 @@ define external fastcc i1 @"proc_yorn.is_yes_or_no<0>"(i8 %"ch##0") {
   ret i1 %"tmp#17##0"
 }
 
-define external fastcc i1 @"proc_yorn.yorn<0>"(i64 %"prompt##0") {
-  %"tmp#2##0" = tail call fastcc i1 @"proc_yorn.yorn#cont#1<0>"(i64 %"prompt##0")
+define external fastcc i1 @"proc_yorn#.yorn<0>"(i64 %"prompt##0") {
+  %"tmp#2##0" = tail call fastcc i1 @"proc_yorn#.yorn#cont#1<0>"(i64 %"prompt##0")
   ret i1 %"tmp#2##0"
 }
 
-define external fastcc i1 @"proc_yorn.yorn#cont#1<0>"(i64 %"prompt##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"prompt##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+define external fastcc i1 @"proc_yorn#.yorn#cont#1<0>"(i64 %"prompt##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"prompt##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   %"response##0" = call ccc i8 @read_char()
   %"tmp#5##0" = icmp ne i8 %"response##0", 121
   %"tmp#6##0" = icmp ne i8 %"response##0", 89
   %"tmp#7##0" = and i1 %"tmp#5##0", %"tmp#6##0"
   %"tmp#0##0" = xor i1 %"tmp#7##0", 1
-  %"tmp#1##0" = tail call fastcc i1 @"proc_yorn.is_yes_or_no<0>"(i8 %"response##0")
+  %"tmp#1##0" = tail call fastcc i1 @"proc_yorn#.is_yes_or_no<0>"(i8 %"response##0")
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
   ret i1 %"tmp#0##0"
 if.else.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#11##0" = tail call fastcc i1 @"proc_yorn.yorn#cont#1<0>"(i64 %"prompt##0")
+  %"tmp#11##0" = tail call fastcc i1 @"proc_yorn#.yorn#cont#1<0>"(i64 %"prompt##0")
   ret i1 %"tmp#11##0"
 }
diff --git a/test-cases/final-dump/proc_yorn2.exp b/test-cases/final-dump/proc_yorn2.exp
index b3713caa..b839050b 100644
--- a/test-cases/final-dump/proc_yorn2.exp
+++ b/test-cases/final-dump/proc_yorn2.exp
@@ -51,26 +51,26 @@ yorn#cont#1(prompt##0:wybe.string, ?result##1:wybe.bool)<{<<wybe.io.io>>}; {<<wy
 ; ModuleID = 'proc_yorn2'
 
 source_filename = "!ROOT!/final-dump/proc_yorn2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (y/n) \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"Please answer 'yes' or 'no'.\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 7, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 28, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc i8 @read_char()
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"proc_yorn2.yorn<0>"(i64 %"prompt##0") {
-  %"tmp#3##0" = tail call fastcc i1 @"proc_yorn2.yorn#cont#1<0>"(i64 %"prompt##0")
+define external fastcc i1 @"proc_yorn2#.yorn<0>"(i64 %"prompt##0") {
+  %"tmp#3##0" = tail call fastcc i1 @"proc_yorn2#.yorn#cont#1<0>"(i64 %"prompt##0")
   ret i1 %"tmp#3##0"
 }
 
-define external fastcc i1 @"proc_yorn2.yorn#cont#1<0>"(i64 %"prompt##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"prompt##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+define external fastcc i1 @"proc_yorn2#.yorn#cont#1<0>"(i64 %"prompt##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"prompt##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   %"response##0" = call ccc i8 @read_char()
   %"tmp#0##0" = icmp eq i8 %"response##0", 89
   %"tmp#1##0" = icmp eq i8 %"response##0", 78
@@ -79,8 +79,8 @@ define external fastcc i1 @"proc_yorn2.yorn#cont#1<0>"(i64 %"prompt##0") {
 if.then.0:
   ret i1 %"tmp#0##0"
 if.else.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#14##0" = tail call fastcc i1 @"proc_yorn2.yorn#cont#1<0>"(i64 %"prompt##0")
+  %"tmp#14##0" = tail call fastcc i1 @"proc_yorn2#.yorn#cont#1<0>"(i64 %"prompt##0")
   ret i1 %"tmp#14##0"
 }
diff --git a/test-cases/final-dump/pub_importer.exp b/test-cases/final-dump/pub_importer.exp
index 00f0829f..99a88fcd 100644
--- a/test-cases/final-dump/pub_importer.exp
+++ b/test-cases/final-dump/pub_importer.exp
@@ -34,19 +34,19 @@ three(?n##0:wybe.int)<{<<exporter.res>>}; {}; {}>:
 ; ModuleID = 'exporter'
 
 source_filename = "!ROOT!/final-dump/exporter.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc i64 @ipow(i64, i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#exporter.res" = global i64 undef
 
-define external fastcc i64 @"exporter.fn<0>"(i64 %"i##0") {
+define external fastcc i64 @"exporter#.fn<0>"(i64 %"i##0") {
   %"tmp#3##0" = call ccc i64 @ipow(i64 2, i64 %"i##0")
   ret i64 %"tmp#3##0"
 }
 
-define external fastcc i64 @"exporter.three<0>"() {
+define external fastcc i64 @"exporter#.three<0>"() {
   %"tmp#1##0" = load i64, ptr @"resource#exporter.res"
   ret i64 %"tmp#1##0"
 }
@@ -70,7 +70,7 @@ define external fastcc i64 @"exporter.three<0>"() {
 ; ModuleID = 'pub_importer'
 
 source_filename = "!ROOT!/final-dump/pub_importer.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/purity_warning.exp b/test-cases/final-dump/purity_warning.exp
index 5bcc6fd0..261c5eed 100644
--- a/test-cases/final-dump/purity_warning.exp
+++ b/test-cases/final-dump/purity_warning.exp
@@ -24,12 +24,12 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'purity_warning'
 
 source_filename = "!ROOT!/final-dump/purity_warning.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"purity_warning.<0>"() {
+define external fastcc void @"purity_warning#.<0>"() {
   ret void
 }
 final-dump/purity_warning.wybe:1:2: Calling proc wybe.list.length<0> with unneeded ! marker
diff --git a/test-cases/final-dump/representation.exp b/test-cases/final-dump/representation.exp
index daa51144..4c12a4fd 100644
--- a/test-cases/final-dump/representation.exp
+++ b/test-cases/final-dump/representation.exp
@@ -25,12 +25,12 @@ proc + > public {inline} (0 calls)
 ; ModuleID = 'representation'
 
 source_filename = "!ROOT!/final-dump/representation.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i16 @"representation.+<0>"(i16 %"x##0", i16 %"y##0") {
+define external fastcc i16 @"representation#.+<0>"(i16 %"x##0", i16 %"y##0") {
   %"tmp#1##0" = add i16 %"x##0", %"y##0"
   ret i16 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/res_decl.exp b/test-cases/final-dump/res_decl.exp
index 7588a27b..f24aa603 100644
--- a/test-cases/final-dump/res_decl.exp
+++ b/test-cases/final-dump/res_decl.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'res_decl'
 
 source_filename = "!ROOT!/final-dump/res_decl.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/resource_conflict_a.exp b/test-cases/final-dump/resource_conflict_a.exp
index 318b2336..1cb6e5e5 100644
--- a/test-cases/final-dump/resource_conflict_a.exp
+++ b/test-cases/final-dump/resource_conflict_a.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'resource_conflict_a'
 
 source_filename = "!ROOT!/final-dump/resource_conflict_a.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/resource_conflict_b.exp b/test-cases/final-dump/resource_conflict_b.exp
index aad4bb9a..b250534c 100644
--- a/test-cases/final-dump/resource_conflict_b.exp
+++ b/test-cases/final-dump/resource_conflict_b.exp
@@ -19,7 +19,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'resource_conflict_b'
 
 source_filename = "!ROOT!/final-dump/resource_conflict_b.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/resource_rollback.exp b/test-cases/final-dump/resource_rollback.exp
index 5c57d653..94f3eb2d 100644
--- a/test-cases/final-dump/resource_rollback.exp
+++ b/test-cases/final-dump/resource_rollback.exp
@@ -66,7 +66,7 @@ foo(?s##0:wybe.c_string, ?#success##0:wybe.bool, %call_source_location##0:wybe.c
 ; ModuleID = 'resource_rollback'
 
 source_filename = "!ROOT!/final-dump/resource_rollback.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"resource_rollback:15:7\00", align 8
 
@@ -77,26 +77,26 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#resource_rollback.res" = global i64 undef
 @"resource#resource_rollback.ser" = global i64 undef
 
-define external fastcc void @"resource_rollback.<0>"() {
+define external fastcc void @"resource_rollback#.<0>"() {
   %"res##0" = load i64, ptr @"resource#resource_rollback.res"
   call ccc void @print_int(i64 %"res##0")
   call ccc void @putchar(i8 10)
-  %"tmp#13##0" = tail call fastcc {i64, i1} @"resource_rollback.foo<0>"(i64 ptrtoint( ptr @"cstring#0" to i64 ))
+  %"tmp#13##0" = tail call fastcc {i64, i1} @"resource_rollback#.foo<0>"(i64 ptrtoint( ptr @"cstring#0" to i64 ))
   %"s##0" = extractvalue {i64, i1}%"tmp#13##0", 0
   %"tmp#4##0" = extractvalue {i64, i1}%"tmp#13##0", 1
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
   call ccc void @print_string(i64 %"s##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"resource_rollback.#cont#1<0>"()
+  tail call fastcc void @"resource_rollback#.#cont#1<0>"()
   ret void
 if.else.0:
   store i64 %"res##0", ptr @"resource#resource_rollback.res"
-  tail call fastcc void @"resource_rollback.#cont#1<0>"()
+  tail call fastcc void @"resource_rollback#.#cont#1<0>"()
   ret void
 }
 
-define external fastcc void @"resource_rollback.#cont#1<0>"() {
+define external fastcc void @"resource_rollback#.#cont#1<0>"() {
   %"res##0" = load i64, ptr @"resource#resource_rollback.res"
   call ccc void @print_int(i64 %"res##0")
   call ccc void @putchar(i8 10)
@@ -106,7 +106,7 @@ define external fastcc void @"resource_rollback.#cont#1<0>"() {
   ret void
 }
 
-define external fastcc {i64, i1} @"resource_rollback.foo<0>"(i64 %"call_source_location##0") {
+define external fastcc {i64, i1} @"resource_rollback#.foo<0>"(i64 %"call_source_location##0") {
   %"tmp#7##0" = insertvalue {i64, i1} undef, i64 %"call_source_location##0", 0
   %"tmp#8##0" = insertvalue {i64, i1} %"tmp#7##0", i1 0, 1
   ret {i64, i1} %"tmp#8##0"
diff --git a/test-cases/final-dump/resource_tmp_vars.exp b/test-cases/final-dump/resource_tmp_vars.exp
index 0965b063..16932c21 100644
--- a/test-cases/final-dump/resource_tmp_vars.exp
+++ b/test-cases/final-dump/resource_tmp_vars.exp
@@ -45,7 +45,7 @@ proc #cont#1 > {inline,semipure} (1 calls)
 ; ModuleID = 'resource_tmp_vars'
 
 source_filename = "!ROOT!/final-dump/resource_tmp_vars.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -53,7 +53,7 @@ declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#resource_tmp_vars.counter" = global i64 undef
 
-define external fastcc void @"resource_tmp_vars.<0>"() {
+define external fastcc void @"resource_tmp_vars#.<0>"() {
   %"tmp#1##0" = load i64, ptr @"resource#resource_tmp_vars.counter"
   call ccc void @print_int(i64 1)
   call ccc void @putchar(i8 10)
@@ -62,7 +62,7 @@ define external fastcc void @"resource_tmp_vars.<0>"() {
   ret void
 }
 
-define external fastcc void @"resource_tmp_vars.#cont#1<0>"(i64 %"tmp#1##0") {
+define external fastcc void @"resource_tmp_vars#.#cont#1<0>"(i64 %"tmp#1##0") {
   call ccc void @print_int(i64 1)
   call ccc void @putchar(i8 10)
   store i64 %"tmp#1##0", ptr @"resource#resource_tmp_vars.counter"
diff --git a/test-cases/final-dump/save_restore_cond.exp b/test-cases/final-dump/save_restore_cond.exp
index c0729a2c..065f6791 100644
--- a/test-cases/final-dump/save_restore_cond.exp
+++ b/test-cases/final-dump/save_restore_cond.exp
@@ -33,16 +33,16 @@ suc(?#success##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'save_restore_cond'
 
 source_filename = "!ROOT!/final-dump/save_restore_cond.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"save_restore_cond.<0>"() {
-  %"tmp#0##0" = tail call fastcc i1 @"save_restore_cond.suc<0>"()
+define external fastcc void @"save_restore_cond#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i1 @"save_restore_cond#.suc<0>"()
   ret void
 }
 
-define external fastcc i1 @"save_restore_cond.suc<0>"() {
+define external fastcc i1 @"save_restore_cond#.suc<0>"() {
   ret i1 1
 }
diff --git a/test-cases/final-dump/save_restore_disj.exp b/test-cases/final-dump/save_restore_disj.exp
index 5b791f46..5f8fcfbf 100644
--- a/test-cases/final-dump/save_restore_disj.exp
+++ b/test-cases/final-dump/save_restore_disj.exp
@@ -24,11 +24,11 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'save_restore_disj'
 
 source_filename = "!ROOT!/final-dump/save_restore_disj.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"save_restore_disj.<0>"() {
+define external fastcc void @"save_restore_disj#.<0>"() {
   ret void
 }
diff --git a/test-cases/final-dump/simple_loop.exp b/test-cases/final-dump/simple_loop.exp
index 7d0a44c3..db0a1719 100644
--- a/test-cases/final-dump/simple_loop.exp
+++ b/test-cases/final-dump/simple_loop.exp
@@ -44,25 +44,25 @@ proc #cont#1 > {semipure} (2 calls)
 ; ModuleID = 'simple_loop'
 
 source_filename = "!ROOT!/final-dump/simple_loop.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @putchar(i8)
 declare external ccc i8 @read_char()
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"simple_loop.<0>"() {
-  tail call fastcc void @"simple_loop.#cont#1<0>"()
+define external fastcc void @"simple_loop#.<0>"() {
+  tail call fastcc void @"simple_loop#.#cont#1<0>"()
   ret void
 }
 
-define external fastcc void @"simple_loop.#cont#1<0>"() {
+define external fastcc void @"simple_loop#.#cont#1<0>"() {
   %"c##0" = call ccc i8 @read_char()
   %"tmp#0##0" = icmp ne i8 %"c##0", 97
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
   call ccc void @putchar(i8 %"c##0")
-  tail call fastcc void @"simple_loop.#cont#1<0>"()
+  tail call fastcc void @"simple_loop#.#cont#1<0>"()
   ret void
 if.else.0:
   ret void
diff --git a/test-cases/final-dump/sister_module.exp b/test-cases/final-dump/sister_module.exp
index cb8e6d96..30e841c9 100644
--- a/test-cases/final-dump/sister_module.exp
+++ b/test-cases/final-dump/sister_module.exp
@@ -36,18 +36,18 @@ buzz(i##0:wybe.int, ?j##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'sister_module'
 
 source_filename = "!ROOT!/final-dump/sister_module.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"sister_module.baz<0>"(i64 %"i##0") {
-  %"tmp#0##0" = tail call fastcc i64 @"sister_module.m1.foo<0>"(i64 %"i##0")
+define external fastcc i64 @"sister_module#.baz<0>"(i64 %"i##0") {
+  %"tmp#0##0" = tail call fastcc i64 @"sister_module#.m1#.foo<0>"(i64 %"i##0")
   ret i64 %"tmp#0##0"
 }
 
-define external fastcc i64 @"sister_module.buzz<0>"(i64 %"i##0") {
-  %"tmp#0##0" = tail call fastcc i64 @"sister_module.m2.bar<0>"(i64 %"i##0")
+define external fastcc i64 @"sister_module#.buzz<0>"(i64 %"i##0") {
+  %"tmp#0##0" = tail call fastcc i64 @"sister_module#.m2#.bar<0>"(i64 %"i##0")
   ret i64 %"tmp#0##0"
 }
 
@@ -75,12 +75,12 @@ foo(i##0:wybe.int, ?j##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'sister_module.m1'
 
 source_filename = "!ROOT!/final-dump/sister_module.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"sister_module.m1.foo<0>"(i64 %"i##0") {
+define external fastcc i64 @"sister_module#.m1#.foo<0>"(i64 %"i##0") {
   %"tmp#3##0" = add i64 %"i##0", 1
   ret i64 %"tmp#3##0"
 }
@@ -110,13 +110,13 @@ bar(i##0:wybe.int, ?j##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'sister_module.m2'
 
 source_filename = "!ROOT!/final-dump/sister_module.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"sister_module.m2.bar<0>"(i64 %"i##0") {
+define external fastcc i64 @"sister_module#.m2#.bar<0>"(i64 %"i##0") {
   %"k##0" = add i64 %"i##0", 1
-  %"tmp#2##0" = tail call fastcc i64 @"sister_module.m1.foo<0>"(i64 %"k##0")
+  %"tmp#2##0" = tail call fastcc i64 @"sister_module#.m1#.foo<0>"(i64 %"k##0")
   ret i64 %"tmp#2##0"
 }
diff --git a/test-cases/final-dump/sizeof.exp b/test-cases/final-dump/sizeof.exp
index c0bd69e1..a11c15dc 100644
--- a/test-cases/final-dump/sizeof.exp
+++ b/test-cases/final-dump/sizeof.exp
@@ -63,7 +63,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'sizeof'
 
 source_filename = "!ROOT!/final-dump/sizeof.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Char bits: \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"Char bytes: \00", align 8
@@ -78,37 +78,37 @@ target triple    ????
 @"string#10" = private unnamed_addr constant {i64, i64} { i64 13, i64 ptrtoint( ptr @"cstring#4" to i64 ) }, align 8
 @"string#11" = private unnamed_addr constant {i64, i64} { i64 12, i64 ptrtoint( ptr @"cstring#5" to i64 ) }, align 8
 
-declare external fastcc i64 @"wybe.count.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.int.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.count#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.int#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"sizeof.<0>"() {
-  %"tmp#5##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 8, i64 0, i8 32)
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#9" to i64 ), i64 %"tmp#5##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#4##0")
+define external fastcc void @"sizeof#.<0>"() {
+  %"tmp#5##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 8, i64 0, i8 32)
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#9" to i64 ), i64 %"tmp#5##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#4##0")
   call ccc void @putchar(i8 10)
-  %"tmp#7##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 64, i64 0, i8 32)
-  %"tmp#6##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#8" to i64 ), i64 %"tmp#7##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#6##0")
+  %"tmp#7##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 64, i64 0, i8 32)
+  %"tmp#6##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#8" to i64 ), i64 %"tmp#7##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#6##0")
   call ccc void @putchar(i8 10)
-  %"tmp#9##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 1, i64 0, i8 32)
-  %"tmp#8##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#7" to i64 ), i64 %"tmp#9##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#8##0")
+  %"tmp#9##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 1, i64 0, i8 32)
+  %"tmp#8##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#7" to i64 ), i64 %"tmp#9##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#8##0")
   call ccc void @putchar(i8 10)
-  %"tmp#11##0" = tail call fastcc i64 @"wybe.count.fmt<2>"(i64 8, i64 0, i8 32)
-  %"tmp#10##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#6" to i64 ), i64 %"tmp#11##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#10##0")
+  %"tmp#11##0" = tail call fastcc i64 @"wybe#.count#.fmt<2>"(i64 8, i64 0, i8 32)
+  %"tmp#10##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#6" to i64 ), i64 %"tmp#11##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#10##0")
   call ccc void @putchar(i8 10)
-  %"tmp#14##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 3, i64 0, i8 32)
-  %"tmp#13##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#10" to i64 ), i64 %"tmp#14##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#13##0")
+  %"tmp#14##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 3, i64 0, i8 32)
+  %"tmp#13##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#10" to i64 ), i64 %"tmp#14##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#13##0")
   call ccc void @putchar(i8 10)
-  %"tmp#16##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#11" to i64 ), i64 %"tmp#7##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#16##0")
+  %"tmp#16##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#11" to i64 ), i64 %"tmp#7##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#16##0")
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -187,37 +187,37 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'sizeof.narrow'
 
 source_filename = "!ROOT!/final-dump/sizeof.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"sizeof.narrow.=<0>"(i3 %"#left##0", i3 %"#right##0") {
+define external fastcc i1 @"sizeof#.narrow#.=<0>"(i3 %"#left##0", i3 %"#right##0") {
   %"tmp#1##0" = icmp eq i3 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i3 @"sizeof.narrow.five<0>"() {
+define external fastcc i3 @"sizeof#.narrow#.five<0>"() {
   ret i3 4
 }
 
-define external fastcc i3 @"sizeof.narrow.foure<0>"() {
+define external fastcc i3 @"sizeof#.narrow#.foure<0>"() {
   ret i3 3
 }
 
-define external fastcc i3 @"sizeof.narrow.one<0>"() {
+define external fastcc i3 @"sizeof#.narrow#.one<0>"() {
   ret i3 0
 }
 
-define external fastcc i3 @"sizeof.narrow.three<0>"() {
+define external fastcc i3 @"sizeof#.narrow#.three<0>"() {
   ret i3 2
 }
 
-define external fastcc i3 @"sizeof.narrow.two<0>"() {
+define external fastcc i3 @"sizeof#.narrow#.two<0>"() {
   ret i3 1
 }
 
-define external fastcc i1 @"sizeof.narrow.~=<0>"(i3 %"#left##0", i3 %"#right##0") {
+define external fastcc i1 @"sizeof#.narrow#.~=<0>"(i3 %"#left##0", i3 %"#right##0") {
   %"tmp#0##0" = icmp eq i3 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
@@ -305,13 +305,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'sizeof.wide'
 
 source_filename = "!ROOT!/final-dump/sizeof.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"sizeof.wide.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"sizeof#.wide#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -322,7 +322,7 @@ if.then.0:
 if.then.1:
   %"tmp#10##0" = inttoptr i64 %"#right##0" to ptr
   %"#right#wide#1##0" = load i64, ptr %"tmp#10##0"
-  %"tmp#11##0" = tail call fastcc i1 @"sizeof.wide.=<0>"(i64 %"#left#wide#1##0", i64 %"#right#wide#1##0")
+  %"tmp#11##0" = tail call fastcc i1 @"sizeof#.wide#.=<0>"(i64 %"#left#wide#1##0", i64 %"#right#wide#1##0")
   ret i1 %"tmp#11##0"
 if.else.1:
   ret i1 0
@@ -331,11 +331,11 @@ if.else.0:
   ret i1 %"tmp#12##0"
 }
 
-define external fastcc i64 @"sizeof.wide.other<0>"() {
+define external fastcc i64 @"sizeof#.wide#.other<0>"() {
   ret i64 0
 }
 
-define external fastcc i64 @"sizeof.wide.wide<0>"(i64 %"wide#1##0") {
+define external fastcc i64 @"sizeof#.wide#.wide<0>"(i64 %"wide#1##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 8)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -343,7 +343,7 @@ define external fastcc i64 @"sizeof.wide.wide<0>"(i64 %"wide#1##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i1} @"sizeof.wide.wide<1>"(i64 %"#result##0") {
+define external fastcc {i64, i1} @"sizeof#.wide#.wide<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -358,8 +358,8 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc i1 @"sizeof.wide.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"sizeof.wide.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"sizeof#.wide#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"sizeof#.wide#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/specials.exp b/test-cases/final-dump/specials.exp
index f3419b61..41b0354a 100644
--- a/test-cases/final-dump/specials.exp
+++ b/test-cases/final-dump/specials.exp
@@ -88,7 +88,7 @@ show_location(%call_source_location##0:wybe.c_string)<{<<wybe.io.io>>}; {<<wybe.
 ; ModuleID = 'specials'
 
 source_filename = "!ROOT!/final-dump/specials.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -96,37 +96,37 @@ declare external ccc void @print_string(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"specials.show_column<0>"(i64 %"call_source_column_number##0") {
+define external fastcc void @"specials#.show_column<0>"(i64 %"call_source_column_number##0") {
   call ccc void @print_int(i64 %"call_source_column_number##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials.show_file<0>"(i64 %"call_source_file_name##0") {
+define external fastcc void @"specials#.show_file<0>"(i64 %"call_source_file_name##0") {
   call ccc void @print_string(i64 %"call_source_file_name##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials.show_full_file<0>"(i64 %"call_source_file_full_name##0") {
+define external fastcc void @"specials#.show_full_file<0>"(i64 %"call_source_file_full_name##0") {
   call ccc void @print_string(i64 %"call_source_file_full_name##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials.show_full_location<0>"(i64 %"call_source_full_location##0") {
+define external fastcc void @"specials#.show_full_location<0>"(i64 %"call_source_full_location##0") {
   call ccc void @print_string(i64 %"call_source_full_location##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials.show_line<0>"(i64 %"call_source_line_number##0") {
+define external fastcc void @"specials#.show_line<0>"(i64 %"call_source_line_number##0") {
   call ccc void @print_int(i64 %"call_source_line_number##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials.show_location<0>"(i64 %"call_source_location##0") {
+define external fastcc void @"specials#.show_location<0>"(i64 %"call_source_location##0") {
   call ccc void @print_string(i64 %"call_source_location##0")
   call ccc void @putchar(i8 10)
   ret void
diff --git a/test-cases/final-dump/specials_one_module.exp b/test-cases/final-dump/specials_one_module.exp
index b0890fae..db634473 100644
--- a/test-cases/final-dump/specials_one_module.exp
+++ b/test-cases/final-dump/specials_one_module.exp
@@ -93,56 +93,56 @@ show_location(%call_source_location##0:wybe.c_string)<{<<wybe.io.io>>}; {<<wybe.
 ; ModuleID = 'specials_one_module'
 
 source_filename = "!ROOT!/final-dump/specials_one_module.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (should be line 28)\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"specials_one_module\00", align 8
 @"cstring#2" = private unnamed_addr constant [ ?? x i8 ] c"specials_one_module:29:2\00", align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 20, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @print_string(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"specials_one_module.<0>"() {
+define external fastcc void @"specials_one_module#.<0>"() {
   call ccc void @print_string(i64 ptrtoint( ptr @"cstring#1" to i64 ))
   call ccc void @putchar(i8 10)
   call ccc void @print_int(i64 27)
   call ccc void @putchar(i8 10)
   call ccc void @print_int(i64 2)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"specials_one_module.indirect_call_location<0>"(i64 ptrtoint( ptr @"cstring#2" to i64 ))
+  tail call fastcc void @"specials_one_module#.indirect_call_location<0>"(i64 ptrtoint( ptr @"cstring#2" to i64 ))
   ret void
 }
 
-define external fastcc void @"specials_one_module.indirect_call_location<0>"(i64 %"call_source_location##0") {
+define external fastcc void @"specials_one_module#.indirect_call_location<0>"(i64 %"call_source_location##0") {
   call ccc void @print_string(i64 %"call_source_location##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials_one_module.show_column<0>"(i64 %"call_source_column_number##0") {
+define external fastcc void @"specials_one_module#.show_column<0>"(i64 %"call_source_column_number##0") {
   call ccc void @print_int(i64 %"call_source_column_number##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials_one_module.show_file<0>"(i64 %"call_source_file_name##0") {
+define external fastcc void @"specials_one_module#.show_file<0>"(i64 %"call_source_file_name##0") {
   call ccc void @print_string(i64 %"call_source_file_name##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials_one_module.show_line<0>"(i64 %"call_source_line_number##0") {
+define external fastcc void @"specials_one_module#.show_line<0>"(i64 %"call_source_line_number##0") {
   call ccc void @print_int(i64 %"call_source_line_number##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials_one_module.show_location<0>"(i64 %"call_source_location##0") {
-  tail call fastcc void @"specials_one_module.indirect_call_location<0>"(i64 %"call_source_location##0")
+define external fastcc void @"specials_one_module#.show_location<0>"(i64 %"call_source_location##0") {
+  tail call fastcc void @"specials_one_module#.indirect_call_location<0>"(i64 %"call_source_location##0")
   ret void
 }
diff --git a/test-cases/final-dump/specials_use.exp b/test-cases/final-dump/specials_use.exp
index 9530e2c7..ea4714c2 100644
--- a/test-cases/final-dump/specials_use.exp
+++ b/test-cases/final-dump/specials_use.exp
@@ -88,7 +88,7 @@ show_location(%call_source_location##0:wybe.c_string)<{<<wybe.io.io>>}; {<<wybe.
 ; ModuleID = 'specials'
 
 source_filename = "!ROOT!/final-dump/specials.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -96,37 +96,37 @@ declare external ccc void @print_string(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"specials.show_column<0>"(i64 %"call_source_column_number##0") {
+define external fastcc void @"specials#.show_column<0>"(i64 %"call_source_column_number##0") {
   call ccc void @print_int(i64 %"call_source_column_number##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials.show_file<0>"(i64 %"call_source_file_name##0") {
+define external fastcc void @"specials#.show_file<0>"(i64 %"call_source_file_name##0") {
   call ccc void @print_string(i64 %"call_source_file_name##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials.show_full_file<0>"(i64 %"call_source_file_full_name##0") {
+define external fastcc void @"specials#.show_full_file<0>"(i64 %"call_source_file_full_name##0") {
   call ccc void @print_string(i64 %"call_source_file_full_name##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials.show_full_location<0>"(i64 %"call_source_full_location##0") {
+define external fastcc void @"specials#.show_full_location<0>"(i64 %"call_source_full_location##0") {
   call ccc void @print_string(i64 %"call_source_full_location##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials.show_line<0>"(i64 %"call_source_line_number##0") {
+define external fastcc void @"specials#.show_line<0>"(i64 %"call_source_line_number##0") {
   call ccc void @print_int(i64 %"call_source_line_number##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"specials.show_location<0>"(i64 %"call_source_location##0") {
+define external fastcc void @"specials#.show_location<0>"(i64 %"call_source_location##0") {
   call ccc void @print_string(i64 %"call_source_location##0")
   call ccc void @putchar(i8 10)
   ret void
@@ -169,7 +169,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'specials_use'
 
 source_filename = "!ROOT!/final-dump/specials_use.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"!ROOT!/final-dump/specials_use.wybe\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"!ROOT!/final-dump/specials_use.wybe:8:2\00", align 8
@@ -181,7 +181,7 @@ declare external ccc void @print_string(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"specials_use.<0>"() {
+define external fastcc void @"specials_use#.<0>"() {
   call ccc void @print_string(i64 ptrtoint( ptr @"cstring#2" to i64 ))
   call ccc void @putchar(i8 10)
   call ccc void @print_string(i64 ptrtoint( ptr @"cstring#0" to i64 ))
diff --git a/test-cases/final-dump/stmt_for.exp b/test-cases/final-dump/stmt_for.exp
index c1a53771..044b329a 100644
--- a/test-cases/final-dump/stmt_for.exp
+++ b/test-cases/final-dump/stmt_for.exp
@@ -723,7 +723,7 @@ xrange(start##0:wybe.int, stride##0:wybe.int, end##0:wybe.int, ?#result##0:stmt_
 ; ModuleID = 'stmt_for'
 
 source_filename = "!ROOT!/final-dump/stmt_for.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"\0Amultiple_generator\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"\0Ashortest_generator_termination\00", align 8
@@ -752,60 +752,60 @@ target triple    ????
 @"string#24" = private unnamed_addr constant {i64, i64} { i64 21, i64 ptrtoint( ptr @"cstring#11" to i64 ) }, align 8
 @"string#25" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#12" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"stmt_for.<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#25" to i64 ))
+define external fastcc void @"stmt_for#.<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#25" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.single_generator<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
+  tail call fastcc void @"stmt_for#.single_generator<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#13" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.multiple_generator<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"stmt_for#.multiple_generator<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.shortest_generator_termination<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
+  tail call fastcc void @"stmt_for#.shortest_generator_termination<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#15" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_break<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#18" to i64 ))
+  tail call fastcc void @"stmt_for#.using_break<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#18" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_next<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
+  tail call fastcc void @"stmt_for#.using_next<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#22" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_while<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#20" to i64 ))
+  tail call fastcc void @"stmt_for#.using_while<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#20" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_until<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
+  tail call fastcc void @"stmt_for#.using_until<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#21" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_when<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#19" to i64 ))
+  tail call fastcc void @"stmt_for#.using_when<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#19" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_unless<0>"()
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#23" to i64 ))
+  tail call fastcc void @"stmt_for#.using_unless<0>"()
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#23" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#30##0" = tail call fastcc i64 @"stmt_for.xrange<0>"(i64 1, i64 1, i64 10)
-  tail call fastcc void @"stmt_for.using_xrange#cont#1<0>"(i64 %"tmp#30##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
+  %"tmp#30##0" = tail call fastcc i64 @"stmt_for#.xrange<0>"(i64 1, i64 1, i64 10)
+  tail call fastcc void @"stmt_for#.using_xrange#cont#1<0>"(i64 %"tmp#30##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#24" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#34##0" = tail call fastcc i64 @"stmt_for.xrange<0>"(i64 10, i64 -1, i64 1)
-  tail call fastcc void @"stmt_for.using_xrange_reverse#cont#1<0>"(i64 %"tmp#34##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
+  %"tmp#34##0" = tail call fastcc i64 @"stmt_for#.xrange<0>"(i64 10, i64 -1, i64 1)
+  tail call fastcc void @"stmt_for#.using_xrange_reverse#cont#1<0>"(i64 %"tmp#34##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#16" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#38##0" = tail call fastcc i64 @"stmt_for.irange<0>"(i64 1, i64 1, i64 10)
-  tail call fastcc void @"stmt_for.using_irange#cont#1<0>"(i64 %"tmp#38##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#17" to i64 ))
+  %"tmp#38##0" = tail call fastcc i64 @"stmt_for#.irange<0>"(i64 1, i64 1, i64 10)
+  tail call fastcc void @"stmt_for#.using_irange#cont#1<0>"(i64 %"tmp#38##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#17" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#42##0" = tail call fastcc i64 @"stmt_for.irange<0>"(i64 10, i64 -1, i64 1)
-  tail call fastcc void @"stmt_for.using_irange_reverse#cont#1<0>"(i64 %"tmp#42##0")
+  %"tmp#42##0" = tail call fastcc i64 @"stmt_for#.irange<0>"(i64 10, i64 -1, i64 1)
+  tail call fastcc void @"stmt_for#.using_irange_reverse#cont#1<0>"(i64 %"tmp#42##0")
   ret void
 }
 
-define external fastcc i64 @"stmt_for.irange<0>"(i64 %"start##0", i64 %"stride##0", i64 %"end##0") {
+define external fastcc i64 @"stmt_for#.irange<0>"(i64 %"start##0", i64 %"stride##0", i64 %"end##0") {
   %"tmp#4##0" = icmp slt i64 %"stride##0", 0
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -836,7 +836,7 @@ if.else.0:
   ret i64 %"tmp#12##0"
 }
 
-define external fastcc void @"stmt_for.multiple_generator<0>"() {
+define external fastcc void @"stmt_for#.multiple_generator<0>"() {
   %"tmp#38##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#16##0" = ptrtoint ptr %"tmp#38##0" to i64
   %"tmp#39##0" = inttoptr i64 %"tmp#16##0" to ptr
@@ -879,11 +879,11 @@ define external fastcc void @"stmt_for.multiple_generator<0>"() {
   %"tmp#60##0" = add i64 %"tmp#36##0", 8
   %"tmp#61##0" = inttoptr i64 %"tmp#60##0" to ptr
   store i64 %"tmp#32##0", ptr %"tmp#61##0"
-  tail call fastcc void @"stmt_for.multiple_generator#cont#1<0>"(i64 %"tmp#24##0", i64 %"tmp#36##0")
+  tail call fastcc void @"stmt_for#.multiple_generator#cont#1<0>"(i64 %"tmp#24##0", i64 %"tmp#36##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.multiple_generator#cont#1<0>"(i64 %"tmp#8##0", i64 %"tmp#9##0") {
+define external fastcc void @"stmt_for#.multiple_generator#cont#1<0>"(i64 %"tmp#8##0", i64 %"tmp#9##0") {
   %"tmp#15##0" = icmp ne i64 %"tmp#8##0", 0
   br i1 %"tmp#15##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -904,7 +904,7 @@ if.then.1:
   call ccc void @putchar(i8 10)
   call ccc void @print_int(i64 %"j##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.multiple_generator#cont#1<0>"(i64 %"tmp#8##1", i64 %"tmp#9##1")
+  tail call fastcc void @"stmt_for#.multiple_generator#cont#1<0>"(i64 %"tmp#8##1", i64 %"tmp#9##1")
   ret void
 if.else.1:
   ret void
@@ -912,14 +912,14 @@ if.else.0:
   ret void
 }
 
-define external fastcc i1 @"stmt_for.semi_det_for_loop<0>"() {
-  %"tmp#1##0" = tail call fastcc i64 @"stmt_for.xrange<0>"(i64 0, i64 1, i64 10)
-  %"tmp#5##0" = tail call fastcc i1 @"stmt_for.semi_det_for_loop#cont#1<0>"(i64 %"tmp#1##0")
+define external fastcc i1 @"stmt_for#.semi_det_for_loop<0>"() {
+  %"tmp#1##0" = tail call fastcc i64 @"stmt_for#.xrange<0>"(i64 0, i64 1, i64 10)
+  %"tmp#5##0" = tail call fastcc i1 @"stmt_for#.semi_det_for_loop#cont#1<0>"(i64 %"tmp#1##0")
   ret i1 %"tmp#5##0"
 }
 
-define external fastcc i1 @"stmt_for.semi_det_for_loop#cont#1<0>"(i64 %"tmp#0##0") {
-  %"tmp#7##0" = tail call fastcc {i64, i64, i1} @"stmt_for.int_sequence.[|]<0>"(i64 %"tmp#0##0")
+define external fastcc i1 @"stmt_for#.semi_det_for_loop#cont#1<0>"(i64 %"tmp#0##0") {
+  %"tmp#7##0" = tail call fastcc {i64, i64, i1} @"stmt_for#.int_sequence#.[|]<0>"(i64 %"tmp#0##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#7##0", 0
   %"tmp#0##1" = extractvalue {i64, i64, i1}%"tmp#7##0", 1
   %"tmp#4##0" = extractvalue {i64, i64, i1}%"tmp#7##0", 2
@@ -928,7 +928,7 @@ if.then.0:
   %"tmp#3##0" = icmp slt i64 %"i##0", 5
   br i1 %"tmp#3##0", label %if.then.1, label %if.else.1
 if.then.1:
-  %"tmp#8##0" = tail call fastcc i1 @"stmt_for.semi_det_for_loop#cont#1<0>"(i64 %"tmp#0##1")
+  %"tmp#8##0" = tail call fastcc i1 @"stmt_for#.semi_det_for_loop#cont#1<0>"(i64 %"tmp#0##1")
   ret i1 %"tmp#8##0"
 if.else.1:
   ret i1 0
@@ -936,7 +936,7 @@ if.else.0:
   ret i1 1
 }
 
-define external fastcc void @"stmt_for.shortest_generator_termination<0>"() {
+define external fastcc void @"stmt_for#.shortest_generator_termination<0>"() {
   %"tmp#38##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#16##0" = ptrtoint ptr %"tmp#38##0" to i64
   %"tmp#39##0" = inttoptr i64 %"tmp#16##0" to ptr
@@ -979,11 +979,11 @@ define external fastcc void @"stmt_for.shortest_generator_termination<0>"() {
   %"tmp#60##0" = add i64 %"tmp#36##0", 8
   %"tmp#61##0" = inttoptr i64 %"tmp#60##0" to ptr
   store i64 %"tmp#32##0", ptr %"tmp#61##0"
-  tail call fastcc void @"stmt_for.shortest_generator_termination#cont#1<0>"(i64 %"tmp#28##0", i64 %"tmp#36##0")
+  tail call fastcc void @"stmt_for#.shortest_generator_termination#cont#1<0>"(i64 %"tmp#28##0", i64 %"tmp#36##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.shortest_generator_termination#cont#1<0>"(i64 %"tmp#8##0", i64 %"tmp#9##0") {
+define external fastcc void @"stmt_for#.shortest_generator_termination#cont#1<0>"(i64 %"tmp#8##0", i64 %"tmp#9##0") {
   %"tmp#15##0" = icmp ne i64 %"tmp#8##0", 0
   br i1 %"tmp#15##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1004,7 +1004,7 @@ if.then.1:
   call ccc void @putchar(i8 10)
   call ccc void @print_int(i64 %"j##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.shortest_generator_termination#cont#1<0>"(i64 %"tmp#8##1", i64 %"tmp#9##1")
+  tail call fastcc void @"stmt_for#.shortest_generator_termination#cont#1<0>"(i64 %"tmp#8##1", i64 %"tmp#9##1")
   ret void
 if.else.1:
   ret void
@@ -1012,7 +1012,7 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.single_generator<0>"() {
+define external fastcc void @"stmt_for#.single_generator<0>"() {
   %"tmp#19##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#9##0" = ptrtoint ptr %"tmp#19##0" to i64
   %"tmp#20##0" = inttoptr i64 %"tmp#9##0" to ptr
@@ -1034,11 +1034,11 @@ define external fastcc void @"stmt_for.single_generator<0>"() {
   %"tmp#29##0" = add i64 %"tmp#17##0", 8
   %"tmp#30##0" = inttoptr i64 %"tmp#29##0" to ptr
   store i64 %"tmp#13##0", ptr %"tmp#30##0"
-  tail call fastcc void @"stmt_for.single_generator#cont#1<0>"(i64 %"tmp#17##0")
+  tail call fastcc void @"stmt_for#.single_generator#cont#1<0>"(i64 %"tmp#17##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.single_generator#cont#1<0>"(i64 %"tmp#4##0") {
+define external fastcc void @"stmt_for#.single_generator#cont#1<0>"(i64 %"tmp#4##0") {
   %"tmp#8##0" = icmp ne i64 %"tmp#4##0", 0
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1049,13 +1049,13 @@ if.then.0:
   %"tmp#4##1" = load i64, ptr %"tmp#15##0"
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.single_generator#cont#1<0>"(i64 %"tmp#4##1")
+  tail call fastcc void @"stmt_for#.single_generator#cont#1<0>"(i64 %"tmp#4##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.using_break<0>"() {
+define external fastcc void @"stmt_for#.using_break<0>"() {
   %"tmp#25##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#11##0" = ptrtoint ptr %"tmp#25##0" to i64
   %"tmp#26##0" = inttoptr i64 %"tmp#11##0" to ptr
@@ -1084,11 +1084,11 @@ define external fastcc void @"stmt_for.using_break<0>"() {
   %"tmp#39##0" = add i64 %"tmp#23##0", 8
   %"tmp#40##0" = inttoptr i64 %"tmp#39##0" to ptr
   store i64 %"tmp#19##0", ptr %"tmp#40##0"
-  tail call fastcc void @"stmt_for.using_break#cont#1<0>"(i64 %"tmp#23##0")
+  tail call fastcc void @"stmt_for#.using_break#cont#1<0>"(i64 %"tmp#23##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.using_break#cont#1<0>"(i64 %"tmp#5##0") {
+define external fastcc void @"stmt_for#.using_break#cont#1<0>"(i64 %"tmp#5##0") {
   %"tmp#10##0" = icmp ne i64 %"tmp#5##0", 0
   br i1 %"tmp#10##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1104,20 +1104,20 @@ if.then.1:
 if.else.1:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_break#cont#1<0>"(i64 %"tmp#5##1")
+  tail call fastcc void @"stmt_for#.using_break#cont#1<0>"(i64 %"tmp#5##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.using_irange<0>"() {
-  %"tmp#1##0" = tail call fastcc i64 @"stmt_for.irange<0>"(i64 1, i64 1, i64 10)
-  tail call fastcc void @"stmt_for.using_irange#cont#1<0>"(i64 %"tmp#1##0")
+define external fastcc void @"stmt_for#.using_irange<0>"() {
+  %"tmp#1##0" = tail call fastcc i64 @"stmt_for#.irange<0>"(i64 1, i64 1, i64 10)
+  tail call fastcc void @"stmt_for#.using_irange#cont#1<0>"(i64 %"tmp#1##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.using_irange#cont#1<0>"(i64 %"tmp#0##0") {
-  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"stmt_for.int_sequence.[|]<0>"(i64 %"tmp#0##0")
+define external fastcc void @"stmt_for#.using_irange#cont#1<0>"(i64 %"tmp#0##0") {
+  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"stmt_for#.int_sequence#.[|]<0>"(i64 %"tmp#0##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 0
   %"tmp#0##1" = extractvalue {i64, i64, i1}%"tmp#8##0", 1
   %"tmp#3##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 2
@@ -1125,20 +1125,20 @@ define external fastcc void @"stmt_for.using_irange#cont#1<0>"(i64 %"tmp#0##0")
 if.then.0:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_irange#cont#1<0>"(i64 %"tmp#0##1")
+  tail call fastcc void @"stmt_for#.using_irange#cont#1<0>"(i64 %"tmp#0##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.using_irange_reverse<0>"() {
-  %"tmp#1##0" = tail call fastcc i64 @"stmt_for.irange<0>"(i64 10, i64 -1, i64 1)
-  tail call fastcc void @"stmt_for.using_irange_reverse#cont#1<0>"(i64 %"tmp#1##0")
+define external fastcc void @"stmt_for#.using_irange_reverse<0>"() {
+  %"tmp#1##0" = tail call fastcc i64 @"stmt_for#.irange<0>"(i64 10, i64 -1, i64 1)
+  tail call fastcc void @"stmt_for#.using_irange_reverse#cont#1<0>"(i64 %"tmp#1##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.using_irange_reverse#cont#1<0>"(i64 %"tmp#0##0") {
-  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"stmt_for.int_sequence.[|]<0>"(i64 %"tmp#0##0")
+define external fastcc void @"stmt_for#.using_irange_reverse#cont#1<0>"(i64 %"tmp#0##0") {
+  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"stmt_for#.int_sequence#.[|]<0>"(i64 %"tmp#0##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 0
   %"tmp#0##1" = extractvalue {i64, i64, i1}%"tmp#8##0", 1
   %"tmp#3##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 2
@@ -1146,13 +1146,13 @@ define external fastcc void @"stmt_for.using_irange_reverse#cont#1<0>"(i64 %"tmp
 if.then.0:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_irange_reverse#cont#1<0>"(i64 %"tmp#0##1")
+  tail call fastcc void @"stmt_for#.using_irange_reverse#cont#1<0>"(i64 %"tmp#0##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.using_next<0>"() {
+define external fastcc void @"stmt_for#.using_next<0>"() {
   %"tmp#25##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#11##0" = ptrtoint ptr %"tmp#25##0" to i64
   %"tmp#26##0" = inttoptr i64 %"tmp#11##0" to ptr
@@ -1181,11 +1181,11 @@ define external fastcc void @"stmt_for.using_next<0>"() {
   %"tmp#39##0" = add i64 %"tmp#23##0", 8
   %"tmp#40##0" = inttoptr i64 %"tmp#39##0" to ptr
   store i64 %"tmp#19##0", ptr %"tmp#40##0"
-  tail call fastcc void @"stmt_for.using_next#cont#1<0>"(i64 %"tmp#23##0")
+  tail call fastcc void @"stmt_for#.using_next#cont#1<0>"(i64 %"tmp#23##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.using_next#cont#1<0>"(i64 %"tmp#5##0") {
+define external fastcc void @"stmt_for#.using_next#cont#1<0>"(i64 %"tmp#5##0") {
   %"tmp#10##0" = icmp ne i64 %"tmp#5##0", 0
   br i1 %"tmp#10##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1197,18 +1197,18 @@ if.then.0:
   %"tmp#7##0" = icmp eq i64 %"i##0", 3
   br i1 %"tmp#7##0", label %if.then.1, label %if.else.1
 if.then.1:
-  tail call fastcc void @"stmt_for.using_next#cont#1<0>"(i64 %"tmp#5##1")
+  tail call fastcc void @"stmt_for#.using_next#cont#1<0>"(i64 %"tmp#5##1")
   ret void
 if.else.1:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_next#cont#1<0>"(i64 %"tmp#5##1")
+  tail call fastcc void @"stmt_for#.using_next#cont#1<0>"(i64 %"tmp#5##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.using_unless<0>"() {
+define external fastcc void @"stmt_for#.using_unless<0>"() {
   %"tmp#25##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#11##0" = ptrtoint ptr %"tmp#25##0" to i64
   %"tmp#26##0" = inttoptr i64 %"tmp#11##0" to ptr
@@ -1237,11 +1237,11 @@ define external fastcc void @"stmt_for.using_unless<0>"() {
   %"tmp#39##0" = add i64 %"tmp#23##0", 8
   %"tmp#40##0" = inttoptr i64 %"tmp#39##0" to ptr
   store i64 %"tmp#19##0", ptr %"tmp#40##0"
-  tail call fastcc void @"stmt_for.using_unless#cont#1<0>"(i64 %"tmp#23##0")
+  tail call fastcc void @"stmt_for#.using_unless#cont#1<0>"(i64 %"tmp#23##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.using_unless#cont#1<0>"(i64 %"tmp#5##0") {
+define external fastcc void @"stmt_for#.using_unless#cont#1<0>"(i64 %"tmp#5##0") {
   %"tmp#10##0" = icmp ne i64 %"tmp#5##0", 0
   br i1 %"tmp#10##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1253,18 +1253,18 @@ if.then.0:
   %"tmp#7##0" = icmp slt i64 %"i##0", 3
   br i1 %"tmp#7##0", label %if.then.1, label %if.else.1
 if.then.1:
-  tail call fastcc void @"stmt_for.using_unless#cont#1<0>"(i64 %"tmp#5##1")
+  tail call fastcc void @"stmt_for#.using_unless#cont#1<0>"(i64 %"tmp#5##1")
   ret void
 if.else.1:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_unless#cont#1<0>"(i64 %"tmp#5##1")
+  tail call fastcc void @"stmt_for#.using_unless#cont#1<0>"(i64 %"tmp#5##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.using_until<0>"() {
+define external fastcc void @"stmt_for#.using_until<0>"() {
   %"tmp#25##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#11##0" = ptrtoint ptr %"tmp#25##0" to i64
   %"tmp#26##0" = inttoptr i64 %"tmp#11##0" to ptr
@@ -1293,11 +1293,11 @@ define external fastcc void @"stmt_for.using_until<0>"() {
   %"tmp#39##0" = add i64 %"tmp#23##0", 8
   %"tmp#40##0" = inttoptr i64 %"tmp#39##0" to ptr
   store i64 %"tmp#19##0", ptr %"tmp#40##0"
-  tail call fastcc void @"stmt_for.using_until#cont#1<0>"(i64 %"tmp#23##0")
+  tail call fastcc void @"stmt_for#.using_until#cont#1<0>"(i64 %"tmp#23##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.using_until#cont#1<0>"(i64 %"tmp#5##0") {
+define external fastcc void @"stmt_for#.using_until#cont#1<0>"(i64 %"tmp#5##0") {
   %"tmp#10##0" = icmp ne i64 %"tmp#5##0", 0
   br i1 %"tmp#10##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1313,13 +1313,13 @@ if.then.1:
 if.else.1:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_until#cont#1<0>"(i64 %"tmp#5##1")
+  tail call fastcc void @"stmt_for#.using_until#cont#1<0>"(i64 %"tmp#5##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.using_when<0>"() {
+define external fastcc void @"stmt_for#.using_when<0>"() {
   %"tmp#25##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#11##0" = ptrtoint ptr %"tmp#25##0" to i64
   %"tmp#26##0" = inttoptr i64 %"tmp#11##0" to ptr
@@ -1348,11 +1348,11 @@ define external fastcc void @"stmt_for.using_when<0>"() {
   %"tmp#39##0" = add i64 %"tmp#23##0", 8
   %"tmp#40##0" = inttoptr i64 %"tmp#39##0" to ptr
   store i64 %"tmp#19##0", ptr %"tmp#40##0"
-  tail call fastcc void @"stmt_for.using_when#cont#1<0>"(i64 %"tmp#23##0")
+  tail call fastcc void @"stmt_for#.using_when#cont#1<0>"(i64 %"tmp#23##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.using_when#cont#1<0>"(i64 %"tmp#5##0") {
+define external fastcc void @"stmt_for#.using_when#cont#1<0>"(i64 %"tmp#5##0") {
   %"tmp#10##0" = icmp ne i64 %"tmp#5##0", 0
   br i1 %"tmp#10##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1366,16 +1366,16 @@ if.then.0:
 if.then.1:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_when#cont#1<0>"(i64 %"tmp#5##1")
+  tail call fastcc void @"stmt_for#.using_when#cont#1<0>"(i64 %"tmp#5##1")
   ret void
 if.else.1:
-  tail call fastcc void @"stmt_for.using_when#cont#1<0>"(i64 %"tmp#5##1")
+  tail call fastcc void @"stmt_for#.using_when#cont#1<0>"(i64 %"tmp#5##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.using_while<0>"() {
+define external fastcc void @"stmt_for#.using_while<0>"() {
   %"tmp#25##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#11##0" = ptrtoint ptr %"tmp#25##0" to i64
   %"tmp#26##0" = inttoptr i64 %"tmp#11##0" to ptr
@@ -1404,11 +1404,11 @@ define external fastcc void @"stmt_for.using_while<0>"() {
   %"tmp#39##0" = add i64 %"tmp#23##0", 8
   %"tmp#40##0" = inttoptr i64 %"tmp#39##0" to ptr
   store i64 %"tmp#19##0", ptr %"tmp#40##0"
-  tail call fastcc void @"stmt_for.using_while#cont#1<0>"(i64 %"tmp#23##0")
+  tail call fastcc void @"stmt_for#.using_while#cont#1<0>"(i64 %"tmp#23##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.using_while#cont#1<0>"(i64 %"tmp#5##0") {
+define external fastcc void @"stmt_for#.using_while#cont#1<0>"(i64 %"tmp#5##0") {
   %"tmp#10##0" = icmp ne i64 %"tmp#5##0", 0
   br i1 %"tmp#10##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -1422,7 +1422,7 @@ if.then.0:
 if.then.1:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_while#cont#1<0>"(i64 %"tmp#5##1")
+  tail call fastcc void @"stmt_for#.using_while#cont#1<0>"(i64 %"tmp#5##1")
   ret void
 if.else.1:
   ret void
@@ -1430,14 +1430,14 @@ if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.using_xrange<0>"() {
-  %"tmp#1##0" = tail call fastcc i64 @"stmt_for.xrange<0>"(i64 1, i64 1, i64 10)
-  tail call fastcc void @"stmt_for.using_xrange#cont#1<0>"(i64 %"tmp#1##0")
+define external fastcc void @"stmt_for#.using_xrange<0>"() {
+  %"tmp#1##0" = tail call fastcc i64 @"stmt_for#.xrange<0>"(i64 1, i64 1, i64 10)
+  tail call fastcc void @"stmt_for#.using_xrange#cont#1<0>"(i64 %"tmp#1##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.using_xrange#cont#1<0>"(i64 %"tmp#0##0") {
-  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"stmt_for.int_sequence.[|]<0>"(i64 %"tmp#0##0")
+define external fastcc void @"stmt_for#.using_xrange#cont#1<0>"(i64 %"tmp#0##0") {
+  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"stmt_for#.int_sequence#.[|]<0>"(i64 %"tmp#0##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 0
   %"tmp#0##1" = extractvalue {i64, i64, i1}%"tmp#8##0", 1
   %"tmp#3##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 2
@@ -1445,20 +1445,20 @@ define external fastcc void @"stmt_for.using_xrange#cont#1<0>"(i64 %"tmp#0##0")
 if.then.0:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_xrange#cont#1<0>"(i64 %"tmp#0##1")
+  tail call fastcc void @"stmt_for#.using_xrange#cont#1<0>"(i64 %"tmp#0##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_for.using_xrange_reverse<0>"() {
-  %"tmp#1##0" = tail call fastcc i64 @"stmt_for.xrange<0>"(i64 10, i64 -1, i64 1)
-  tail call fastcc void @"stmt_for.using_xrange_reverse#cont#1<0>"(i64 %"tmp#1##0")
+define external fastcc void @"stmt_for#.using_xrange_reverse<0>"() {
+  %"tmp#1##0" = tail call fastcc i64 @"stmt_for#.xrange<0>"(i64 10, i64 -1, i64 1)
+  tail call fastcc void @"stmt_for#.using_xrange_reverse#cont#1<0>"(i64 %"tmp#1##0")
   ret void
 }
 
-define external fastcc void @"stmt_for.using_xrange_reverse#cont#1<0>"(i64 %"tmp#0##0") {
-  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"stmt_for.int_sequence.[|]<0>"(i64 %"tmp#0##0")
+define external fastcc void @"stmt_for#.using_xrange_reverse#cont#1<0>"(i64 %"tmp#0##0") {
+  %"tmp#8##0" = tail call fastcc {i64, i64, i1} @"stmt_for#.int_sequence#.[|]<0>"(i64 %"tmp#0##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 0
   %"tmp#0##1" = extractvalue {i64, i64, i1}%"tmp#8##0", 1
   %"tmp#3##0" = extractvalue {i64, i64, i1}%"tmp#8##0", 2
@@ -1466,13 +1466,13 @@ define external fastcc void @"stmt_for.using_xrange_reverse#cont#1<0>"(i64 %"tmp
 if.then.0:
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_for.using_xrange_reverse#cont#1<0>"(i64 %"tmp#0##1")
+  tail call fastcc void @"stmt_for#.using_xrange_reverse#cont#1<0>"(i64 %"tmp#0##1")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc i64 @"stmt_for.xrange<0>"(i64 %"start##0", i64 %"stride##0", i64 %"end##0") {
+define external fastcc i64 @"stmt_for#.xrange<0>"(i64 %"start##0", i64 %"stride##0", i64 %"end##0") {
   %"tmp#8##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#4##0" = ptrtoint ptr %"tmp#8##0" to i64
   %"tmp#9##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -1682,13 +1682,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'stmt_for.int_sequence'
 
 source_filename = "!ROOT!/final-dump/stmt_for.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"stmt_for.int_sequence.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"stmt_for#.int_sequence#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#12##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#start##0" = load i64, ptr %"tmp#12##0"
   %"tmp#13##0" = add i64 %"#left##0", 8
@@ -1719,7 +1719,7 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc {i64, i64, i1} @"stmt_for.int_sequence.[|]<0>"(i64 %"current##0") {
+define external fastcc {i64, i64, i1} @"stmt_for#.int_sequence#.[|]<0>"(i64 %"current##0") {
   %"tmp#12##0" = inttoptr i64 %"current##0" to ptr
   %"s##0" = load i64, ptr %"tmp#12##0"
   %"tmp#13##0" = add i64 %"current##0", 8
@@ -1734,7 +1734,7 @@ if.then.0:
   %"tmp#2##0" = icmp slt i64 %"en##0", %"s##0"
   br i1 %"tmp#2##0", label %if.then.1, label %if.else.1
 if.then.1:
-  %"tmp#17##0" = tail call fastcc {i64, i64, i1} @"stmt_for.int_sequence.[|]#cont#1<0>"(i64 %"en##0", i64 %"s##0", i64 %"st##0")
+  %"tmp#17##0" = tail call fastcc {i64, i64, i1} @"stmt_for#.int_sequence#.[|]#cont#1<0>"(i64 %"en##0", i64 %"s##0", i64 %"st##0")
   %"tmp#18##0" = extractvalue {i64, i64, i1}%"tmp#17##0", 0
   %"tmp#19##0" = extractvalue {i64, i64, i1}%"tmp#17##0", 1
   %"tmp#20##0" = extractvalue {i64, i64, i1}%"tmp#17##0", 2
@@ -1751,7 +1751,7 @@ if.else.0:
   %"tmp#3##0" = icmp sgt i64 %"en##0", %"s##0"
   br i1 %"tmp#3##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#27##0" = tail call fastcc {i64, i64, i1} @"stmt_for.int_sequence.[|]#cont#1<0>"(i64 %"en##0", i64 %"s##0", i64 %"st##0")
+  %"tmp#27##0" = tail call fastcc {i64, i64, i1} @"stmt_for#.int_sequence#.[|]#cont#1<0>"(i64 %"en##0", i64 %"s##0", i64 %"st##0")
   %"tmp#28##0" = extractvalue {i64, i64, i1}%"tmp#27##0", 0
   %"tmp#29##0" = extractvalue {i64, i64, i1}%"tmp#27##0", 1
   %"tmp#30##0" = extractvalue {i64, i64, i1}%"tmp#27##0", 2
@@ -1766,7 +1766,7 @@ if.else.2:
   ret {i64, i64, i1} %"tmp#36##0"
 }
 
-define external fastcc {i64, i64, i1} @"stmt_for.int_sequence.[|]#cont#1<0>"(i64 %"en##0", i64 %"s##0", i64 %"st##0") {
+define external fastcc {i64, i64, i1} @"stmt_for#.int_sequence#.[|]#cont#1<0>"(i64 %"en##0", i64 %"s##0", i64 %"st##0") {
   %"tmp#1##0" = add i64 %"s##0", %"st##0"
   %"tmp#10##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#7##0" = ptrtoint ptr %"tmp#10##0" to i64
@@ -1784,14 +1784,14 @@ define external fastcc {i64, i64, i1} @"stmt_for.int_sequence.[|]#cont#1<0>"(i64
   ret {i64, i64, i1} %"tmp#18##0"
 }
 
-define external fastcc i64 @"stmt_for.int_sequence.end<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"stmt_for#.int_sequence#.end<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 16
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"stmt_for.int_sequence.end<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"stmt_for#.int_sequence#.end<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 24)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 24, i1 0)
@@ -1802,7 +1802,7 @@ define external fastcc i64 @"stmt_for.int_sequence.end<1>"(i64 %"#rec##0", i64 %
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"stmt_for.int_sequence.int_sequence<0>"(i64 %"start##0", i64 %"stride##0", i64 %"end##0") {
+define external fastcc i64 @"stmt_for#.int_sequence#.int_sequence<0>"(i64 %"start##0", i64 %"stride##0", i64 %"end##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -1816,7 +1816,7 @@ define external fastcc i64 @"stmt_for.int_sequence.int_sequence<0>"(i64 %"start#
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64} @"stmt_for.int_sequence.int_sequence<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64} @"stmt_for#.int_sequence#.int_sequence<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -1831,13 +1831,13 @@ define external fastcc {i64, i64, i64} @"stmt_for.int_sequence.int_sequence<1>"(
   ret {i64, i64, i64} %"tmp#10##0"
 }
 
-define external fastcc i64 @"stmt_for.int_sequence.start<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"stmt_for#.int_sequence#.start<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"stmt_for.int_sequence.start<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"stmt_for#.int_sequence#.start<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 24)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 24, i1 0)
@@ -1847,14 +1847,14 @@ define external fastcc i64 @"stmt_for.int_sequence.start<1>"(i64 %"#rec##0", i64
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"stmt_for.int_sequence.stride<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"stmt_for#.int_sequence#.stride<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"stmt_for.int_sequence.stride<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"stmt_for#.int_sequence#.stride<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 24)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 24, i1 0)
@@ -1865,7 +1865,7 @@ define external fastcc i64 @"stmt_for.int_sequence.stride<1>"(i64 %"#rec##0", i6
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"stmt_for.int_sequence.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"stmt_for#.int_sequence#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#11##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#11##0"
   %"tmp#12##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/stmt_if.exp b/test-cases/final-dump/stmt_if.exp
index ba90f883..5071c469 100644
--- a/test-cases/final-dump/stmt_if.exp
+++ b/test-cases/final-dump/stmt_if.exp
@@ -95,7 +95,7 @@ lookup(key##0:wybe.int, tree##0:stmt_if.tree, ?result##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'stmt_if'
 
 source_filename = "!ROOT!/final-dump/stmt_if.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"lookup fails when it should\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"lookup fails when it should succeed\00", align 8
@@ -108,12 +108,12 @@ target triple    ????
 @"array#8" = private unnamed_addr constant [ 2 x i64 ] [i64 ptrtoint( ptr @"string#5" to i64 ), i64 ptrtoint( ptr @"string#6" to i64 )]
 @"array#9" = private unnamed_addr constant [ 2 x i64 ] [i64 ptrtoint( ptr @"string#7" to i64 ), i64 ptrtoint( ptr @"string#4" to i64 )]
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"stmt_if.foobar<0>"() {
+define external fastcc void @"stmt_if#.foobar<0>"() {
   %"tmp#20##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#8##0" = ptrtoint ptr %"tmp#20##0" to i64
   %"tmp#21##0" = inttoptr i64 %"tmp#8##0" to ptr
@@ -124,27 +124,27 @@ define external fastcc void @"stmt_if.foobar<0>"() {
   %"tmp#24##0" = add i64 %"tmp#8##0", 16
   %"tmp#25##0" = inttoptr i64 %"tmp#24##0" to ptr
   store i64 0, ptr %"tmp#25##0"
-  %"tmp#4##0" = tail call fastcc i1 @"stmt_if.lookup<0>"(i64 1, i64 %"tmp#8##0")
+  %"tmp#4##0" = tail call fastcc i1 @"stmt_if#.lookup<0>"(i64 1, i64 %"tmp#8##0")
   %"tmp#27##0" = zext i1 %"tmp#4##0" to i64
   %"tmp#26##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#8", i64 0, i64 %"tmp#27##0"
   %"tmp#19##0" = load i64, ptr %"tmp#26##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#19##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#19##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_if.foobar#cont#1<0>"(i64 %"tmp#8##0")
+  tail call fastcc void @"stmt_if#.foobar#cont#1<0>"(i64 %"tmp#8##0")
   ret void
 }
 
-define external fastcc void @"stmt_if.foobar#cont#1<0>"(i64 %"tr##0") {
-  %"tmp#3##0" = tail call fastcc i1 @"stmt_if.lookup<0>"(i64 3, i64 %"tr##0")
+define external fastcc void @"stmt_if#.foobar#cont#1<0>"(i64 %"tr##0") {
+  %"tmp#3##0" = tail call fastcc i1 @"stmt_if#.lookup<0>"(i64 3, i64 %"tr##0")
   %"tmp#13##0" = zext i1 %"tmp#3##0" to i64
   %"tmp#12##0" = getelementptr inbounds [ 2 x i64 ], ptr @"array#9", i64 0, i64 %"tmp#13##0"
   %"tmp#11##0" = load i64, ptr %"tmp#12##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#11##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#11##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i1 @"stmt_if.lookup<0>"(i64 %"key##0", i64 %"tree##0") {
+define external fastcc i1 @"stmt_if#.lookup<0>"(i64 %"key##0", i64 %"tree##0") {
   %"tmp#6##0" = icmp ne i64 %"tree##0", 0
   br i1 %"tmp#6##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -164,10 +164,10 @@ if.else.1:
   %"tmp#2##0" = icmp slt i64 %"key##0", %"nodekey##0"
   br i1 %"tmp#2##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#16##0" = tail call fastcc i1 @"stmt_if.lookup<0>"(i64 %"key##0", i64 %"left##0")
+  %"tmp#16##0" = tail call fastcc i1 @"stmt_if#.lookup<0>"(i64 %"key##0", i64 %"left##0")
   ret i1 %"tmp#16##0"
 if.else.2:
-  %"tmp#17##0" = tail call fastcc i1 @"stmt_if.lookup<0>"(i64 %"key##0", i64 %"right##0")
+  %"tmp#17##0" = tail call fastcc i1 @"stmt_if#.lookup<0>"(i64 %"key##0", i64 %"right##0")
   ret i1 %"tmp#17##0"
 if.else.0:
   ret i1 0
@@ -384,13 +384,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'stmt_if.tree'
 
 source_filename = "!ROOT!/final-dump/stmt_if.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"stmt_if.tree.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"stmt_if#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -413,13 +413,13 @@ if.then.1:
   %"tmp#21##0" = add i64 %"#right##0", 16
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   %"#right#right##0" = load i64, ptr %"tmp#22##0"
-  %"tmp#4##0" = tail call fastcc i1 @"stmt_if.tree.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
+  %"tmp#4##0" = tail call fastcc i1 @"stmt_if#.tree#.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
   %"tmp#5##0" = icmp eq i64 %"#left#key##0", %"#right#key##0"
   br i1 %"tmp#5##0", label %if.then.3, label %if.else.3
 if.then.3:
-  %"tmp#23##0" = tail call fastcc i1 @"stmt_if.tree.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
+  %"tmp#23##0" = tail call fastcc i1 @"stmt_if#.tree#.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
   ret i1 %"tmp#23##0"
 if.else.3:
   ret i1 0
@@ -432,11 +432,11 @@ if.else.0:
   ret i1 %"tmp#24##0"
 }
 
-define external fastcc i64 @"stmt_if.tree.empty<0>"() {
+define external fastcc i64 @"stmt_if#.tree#.empty<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"stmt_if.tree.key<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"stmt_if#.tree#.key<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -452,7 +452,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"stmt_if.tree.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"stmt_if#.tree#.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -472,7 +472,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"stmt_if.tree.left<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"stmt_if#.tree#.left<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -487,7 +487,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"stmt_if.tree.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"stmt_if#.tree#.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -506,7 +506,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"stmt_if.tree.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
+define external fastcc i64 @"stmt_if#.tree#.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -520,7 +520,7 @@ define external fastcc i64 @"stmt_if.tree.node<0>"(i64 %"left##0", i64 %"key##0"
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64, i1} @"stmt_if.tree.node<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i1} @"stmt_if#.tree#.node<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -545,7 +545,7 @@ if.else.0:
   ret {i64, i64, i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"stmt_if.tree.right<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"stmt_if#.tree#.right<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -561,7 +561,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"stmt_if.tree.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"stmt_if#.tree#.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -581,8 +581,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"stmt_if.tree.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"stmt_if.tree.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"stmt_if#.tree#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"stmt_if#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/stmt_if2.exp b/test-cases/final-dump/stmt_if2.exp
index dfe3589c..3539623a 100644
--- a/test-cases/final-dump/stmt_if2.exp
+++ b/test-cases/final-dump/stmt_if2.exp
@@ -96,16 +96,16 @@ lookup#cont#1(tmp#4##0:wybe.bool, ?#result##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'stmt_if2'
 
 source_filename = "!ROOT!/final-dump/stmt_if2.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"found\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 5, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"stmt_if2.<0>"() {
+define external fastcc void @"stmt_if2#.<0>"() {
   %"tmp#11##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#7##0" = ptrtoint ptr %"tmp#11##0" to i64
   %"tmp#12##0" = inttoptr i64 %"tmp#7##0" to ptr
@@ -116,17 +116,17 @@ define external fastcc void @"stmt_if2.<0>"() {
   %"tmp#15##0" = add i64 %"tmp#7##0", 16
   %"tmp#16##0" = inttoptr i64 %"tmp#15##0" to ptr
   store i64 0, ptr %"tmp#16##0"
-  %"tmp#3##0" = tail call fastcc i1 @"stmt_if2.lookup<0>"(i64 1, i64 %"tmp#7##0")
+  %"tmp#3##0" = tail call fastcc i1 @"stmt_if2#.lookup<0>"(i64 1, i64 %"tmp#7##0")
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc i1 @"stmt_if2.lookup<0>"(i64 %"key##0", i64 %"tree##0") {
-  %"tmp#13##0" = tail call fastcc i1 @"stmt_if2.tree.=<0>"(i64 %"tree##0", i64 0)
+define external fastcc i1 @"stmt_if2#.lookup<0>"(i64 %"key##0", i64 %"tree##0") {
+  %"tmp#13##0" = tail call fastcc i1 @"stmt_if2#.tree#.=<0>"(i64 %"tree##0", i64 0)
   br i1 %"tmp#13##0", label %if.then.0, label %if.else.0
 if.then.0:
   ret i1 0
@@ -150,16 +150,16 @@ if.else.2:
   %"tmp#10##0" = icmp sgt i64 %"k##0", %"key##0"
   br i1 %"tmp#10##0", label %if.then.3, label %if.else.3
 if.then.3:
-  %"tmp#28##0" = tail call fastcc i1 @"stmt_if2.lookup<0>"(i64 %"key##0", i64 %"l##0")
+  %"tmp#28##0" = tail call fastcc i1 @"stmt_if2#.lookup<0>"(i64 %"key##0", i64 %"l##0")
   ret i1 %"tmp#28##0"
 if.else.3:
-  %"tmp#29##0" = tail call fastcc i1 @"stmt_if2.lookup<0>"(i64 %"key##0", i64 %"r##0")
+  %"tmp#29##0" = tail call fastcc i1 @"stmt_if2#.lookup<0>"(i64 %"key##0", i64 %"r##0")
   ret i1 %"tmp#29##0"
 if.else.1:
   ret i1 0
 }
 
-define external fastcc i1 @"stmt_if2.lookup#cont#1<0>"(i1 %"tmp#4##0") {
+define external fastcc i1 @"stmt_if2#.lookup#cont#1<0>"(i1 %"tmp#4##0") {
   ret i1 %"tmp#4##0"
 }
 
@@ -374,13 +374,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'stmt_if2.tree'
 
 source_filename = "!ROOT!/final-dump/stmt_if2.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"stmt_if2.tree.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"stmt_if2#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -403,13 +403,13 @@ if.then.1:
   %"tmp#21##0" = add i64 %"#right##0", 16
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   %"#right#right##0" = load i64, ptr %"tmp#22##0"
-  %"tmp#4##0" = tail call fastcc i1 @"stmt_if2.tree.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
+  %"tmp#4##0" = tail call fastcc i1 @"stmt_if2#.tree#.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
   %"tmp#5##0" = icmp eq i64 %"#left#key##0", %"#right#key##0"
   br i1 %"tmp#5##0", label %if.then.3, label %if.else.3
 if.then.3:
-  %"tmp#23##0" = tail call fastcc i1 @"stmt_if2.tree.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
+  %"tmp#23##0" = tail call fastcc i1 @"stmt_if2#.tree#.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
   ret i1 %"tmp#23##0"
 if.else.3:
   ret i1 0
@@ -422,11 +422,11 @@ if.else.0:
   ret i1 %"tmp#24##0"
 }
 
-define external fastcc i64 @"stmt_if2.tree.empty<0>"() {
+define external fastcc i64 @"stmt_if2#.tree#.empty<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"stmt_if2.tree.key<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"stmt_if2#.tree#.key<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -442,7 +442,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"stmt_if2.tree.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"stmt_if2#.tree#.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -462,7 +462,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"stmt_if2.tree.left<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"stmt_if2#.tree#.left<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -477,7 +477,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"stmt_if2.tree.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"stmt_if2#.tree#.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -496,7 +496,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"stmt_if2.tree.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
+define external fastcc i64 @"stmt_if2#.tree#.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"right##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -510,7 +510,7 @@ define external fastcc i64 @"stmt_if2.tree.node<0>"(i64 %"left##0", i64 %"key##0
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64, i1} @"stmt_if2.tree.node<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i1} @"stmt_if2#.tree#.node<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -535,7 +535,7 @@ if.else.0:
   ret {i64, i64, i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"stmt_if2.tree.right<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"stmt_if2#.tree#.right<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -551,7 +551,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"stmt_if2.tree.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"stmt_if2#.tree#.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -571,8 +571,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"stmt_if2.tree.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"stmt_if2.tree.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"stmt_if2#.tree#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"stmt_if2#.tree#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/stmt_nop.exp b/test-cases/final-dump/stmt_nop.exp
index ad366cab..ec1e3e67 100644
--- a/test-cases/final-dump/stmt_nop.exp
+++ b/test-cases/final-dump/stmt_nop.exp
@@ -24,11 +24,11 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'stmt_nop'
 
 source_filename = "!ROOT!/final-dump/stmt_nop.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"stmt_nop.<0>"() {
+define external fastcc void @"stmt_nop#.<0>"() {
   ret void
 }
diff --git a/test-cases/final-dump/stmt_unless.exp b/test-cases/final-dump/stmt_unless.exp
index 054f1468..11779005 100644
--- a/test-cases/final-dump/stmt_unless.exp
+++ b/test-cases/final-dump/stmt_unless.exp
@@ -69,44 +69,44 @@ mod(x##0:wybe.int, y##0:wybe.int, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'stmt_unless'
 
 source_filename = "!ROOT!/final-dump/stmt_unless.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"stmt_unless.<0>"() {
-  tail call fastcc void @"stmt_unless.#cont#1<0>"(i64 10)
+define external fastcc void @"stmt_unless#.<0>"() {
+  tail call fastcc void @"stmt_unless#.#cont#1<0>"(i64 10)
   ret void
 }
 
-define external fastcc void @"stmt_unless.#cont#1<0>"(i64 %"n##0") {
+define external fastcc void @"stmt_unless#.#cont#1<0>"(i64 %"n##0") {
   %"tmp#3##0" = icmp sgt i64 %"n##0", 0
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"stmt_unless.#cont#2<0>"(i64 %"n##0")
+  tail call fastcc void @"stmt_unless#.#cont#2<0>"(i64 %"n##0")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_unless.#cont#2<0>"(i64 %"n##0") {
+define external fastcc void @"stmt_unless#.#cont#2<0>"(i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = urem i64 %"tmp#0##0", 2
   %"tmp#2##0" = icmp eq i64 %"tmp#1##0", 0
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"stmt_unless.#cont#1<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"stmt_unless#.#cont#1<0>"(i64 %"tmp#0##0")
   ret void
 if.else.0:
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_unless.#cont#1<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"stmt_unless#.#cont#1<0>"(i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc i64 @"stmt_unless.mod<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"stmt_unless#.mod<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = urem i64 %"x##0", %"y##0"
   ret i64 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/stmt_until.exp b/test-cases/final-dump/stmt_until.exp
index e364ee7a..045981cb 100644
--- a/test-cases/final-dump/stmt_until.exp
+++ b/test-cases/final-dump/stmt_until.exp
@@ -57,19 +57,19 @@ proc #cont#2 > {inline,semipure} (1 calls)
 ; ModuleID = 'stmt_until'
 
 source_filename = "!ROOT!/final-dump/stmt_until.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"stmt_until.<0>"() {
-  tail call fastcc void @"stmt_until.#cont#1<0>"(i64 10)
+define external fastcc void @"stmt_until#.<0>"() {
+  tail call fastcc void @"stmt_until#.#cont#1<0>"(i64 10)
   ret void
 }
 
-define external fastcc void @"stmt_until.#cont#1<0>"(i64 %"n##0") {
+define external fastcc void @"stmt_until#.#cont#1<0>"(i64 %"n##0") {
   %"tmp#1##0" = icmp slt i64 %"n##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -78,14 +78,14 @@ if.else.0:
   %"tmp#5##0" = sub i64 %"n##0", 1
   call ccc void @print_int(i64 %"tmp#5##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_until.#cont#1<0>"(i64 %"tmp#5##0")
+  tail call fastcc void @"stmt_until#.#cont#1<0>"(i64 %"tmp#5##0")
   ret void
 }
 
-define external fastcc void @"stmt_until.#cont#2<0>"(i64 %"n##0") {
+define external fastcc void @"stmt_until#.#cont#2<0>"(i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_until.#cont#1<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"stmt_until#.#cont#1<0>"(i64 %"tmp#0##0")
   ret void
 }
diff --git a/test-cases/final-dump/stmt_when.exp b/test-cases/final-dump/stmt_when.exp
index 1ba289a0..ffff6eb2 100644
--- a/test-cases/final-dump/stmt_when.exp
+++ b/test-cases/final-dump/stmt_when.exp
@@ -69,29 +69,29 @@ mod(x##0:wybe.int, y##0:wybe.int, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'stmt_when'
 
 source_filename = "!ROOT!/final-dump/stmt_when.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"stmt_when.<0>"() {
-  tail call fastcc void @"stmt_when.#cont#1<0>"(i64 10)
+define external fastcc void @"stmt_when#.<0>"() {
+  tail call fastcc void @"stmt_when#.#cont#1<0>"(i64 10)
   ret void
 }
 
-define external fastcc void @"stmt_when.#cont#1<0>"(i64 %"n##0") {
+define external fastcc void @"stmt_when#.#cont#1<0>"(i64 %"n##0") {
   %"tmp#3##0" = icmp sgt i64 %"n##0", 0
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"stmt_when.#cont#2<0>"(i64 %"n##0")
+  tail call fastcc void @"stmt_when#.#cont#2<0>"(i64 %"n##0")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_when.#cont#2<0>"(i64 %"n##0") {
+define external fastcc void @"stmt_when#.#cont#2<0>"(i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   %"tmp#1##0" = urem i64 %"tmp#0##0", 2
   %"tmp#2##0" = icmp eq i64 %"tmp#1##0", 0
@@ -99,14 +99,14 @@ define external fastcc void @"stmt_when.#cont#2<0>"(i64 %"n##0") {
 if.then.0:
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_when.#cont#1<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"stmt_when#.#cont#1<0>"(i64 %"tmp#0##0")
   ret void
 if.else.0:
-  tail call fastcc void @"stmt_when.#cont#1<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"stmt_when#.#cont#1<0>"(i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc i64 @"stmt_when.mod<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"stmt_when#.mod<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = urem i64 %"x##0", %"y##0"
   ret i64 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/stmt_while.exp b/test-cases/final-dump/stmt_while.exp
index 020c6e1e..e7a0fb54 100644
--- a/test-cases/final-dump/stmt_while.exp
+++ b/test-cases/final-dump/stmt_while.exp
@@ -57,35 +57,35 @@ proc #cont#2 > {inline,semipure} (1 calls)
 ; ModuleID = 'stmt_while'
 
 source_filename = "!ROOT!/final-dump/stmt_while.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"stmt_while.<0>"() {
-  tail call fastcc void @"stmt_while.#cont#1<0>"(i64 10)
+define external fastcc void @"stmt_while#.<0>"() {
+  tail call fastcc void @"stmt_while#.#cont#1<0>"(i64 10)
   ret void
 }
 
-define external fastcc void @"stmt_while.#cont#1<0>"(i64 %"n##0") {
+define external fastcc void @"stmt_while#.#cont#1<0>"(i64 %"n##0") {
   %"tmp#1##0" = icmp sgt i64 %"n##0", 0
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#5##0" = sub i64 %"n##0", 1
   call ccc void @print_int(i64 %"tmp#5##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_while.#cont#1<0>"(i64 %"tmp#5##0")
+  tail call fastcc void @"stmt_while#.#cont#1<0>"(i64 %"tmp#5##0")
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"stmt_while.#cont#2<0>"(i64 %"n##0") {
+define external fastcc void @"stmt_while#.#cont#2<0>"(i64 %"n##0") {
   %"tmp#0##0" = sub i64 %"n##0", 1
   call ccc void @print_int(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"stmt_while.#cont#1<0>"(i64 %"tmp#0##0")
+  tail call fastcc void @"stmt_while#.#cont#1<0>"(i64 %"tmp#0##0")
   ret void
 }
diff --git a/test-cases/final-dump/string.exp b/test-cases/final-dump/string.exp
index ce916aae..ff3ddd2d 100644
--- a/test-cases/final-dump/string.exp
+++ b/test-cases/final-dump/string.exp
@@ -173,7 +173,7 @@ test_index(s##0:wybe.string, i##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>};
 ; ModuleID = 'string'
 
 source_filename = "!ROOT!/final-dump/string.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"\0ATESTING CONVERSION TO c_string\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"\0ATESTING INDEXING\00", align 8
@@ -197,126 +197,126 @@ target triple    ????
 @"string#19" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#11" to i64 ) }, align 8
 @"string#20" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#12" to i64 ) }, align 8
 
-declare external fastcc i64 @"wybe.range...<0>"(i64, i64)
-declare external fastcc i64 @"wybe.range.construct<0>"(i64, i64, i64)
-declare external fastcc i64 @"wybe.range.irange<0>"(i64, i64, i64)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc {i8, i1} @"wybe.string.[]<0>"(i64, i64)
-declare external fastcc i64 @"wybe.string.[]<1>"(i64, i64)
-declare external fastcc {i8, i64, i1} @"wybe.string.[|]<0>"(i64)
-declare external fastcc {i8, i64, i1} @"wybe.string.[|]<0>[785a827a1b]"(i64)
-declare external fastcc i64 @"wybe.string.c_string<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.range#...<0>"(i64, i64)
+declare external fastcc i64 @"wybe#.range#.construct<0>"(i64, i64, i64)
+declare external fastcc i64 @"wybe#.range#.irange<0>"(i64, i64, i64)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc {i8, i1} @"wybe#.string#.[]<0>"(i64, i64)
+declare external fastcc i64 @"wybe#.string#.[]<1>"(i64, i64)
+declare external fastcc {i8, i64, i1} @"wybe#.string#.[|]<0>"(i64)
+declare external fastcc {i8, i64, i1} @"wybe#.string#.[|]<0>[785a827a1b]"(i64)
+declare external fastcc i64 @"wybe#.string#.c_string<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_string(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"string.<0>"() {
+define external fastcc void @"string#.<0>"() {
   call ccc void @print_string(i64 ptrtoint( ptr @"cstring#4" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 0)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 0)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1415)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1415)
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 ptrtoint( ptr @"string#14" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#0##0")
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 ptrtoint( ptr @"string#14" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1415)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1415)
   call ccc void @putchar(i8 10)
-  %"tmp#3##0" = tail call fastcc i64 @"wybe.range.construct<0>"(i64 1, i64 3, i64 100)
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.string.[]<1>"(i64 ptrtoint( ptr @"string#16" to i64 ), i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#2##0")
+  %"tmp#3##0" = tail call fastcc i64 @"wybe#.range#.construct<0>"(i64 1, i64 3, i64 100)
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.string#.[]<1>"(i64 ptrtoint( ptr @"string#16" to i64 ), i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
-  %"tmp#5##0" = tail call fastcc i64 @"wybe.string.[]<1>"(i64 ptrtoint( ptr @"string#16" to i64 ), i64 %"tmp#3##0")
-  %"tmp#7##0" = tail call fastcc i64 @"wybe.range...<0>"(i64 1, i64 3)
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.string.[]<1>"(i64 %"tmp#5##0", i64 %"tmp#7##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#4##0")
+  %"tmp#5##0" = tail call fastcc i64 @"wybe#.string#.[]<1>"(i64 ptrtoint( ptr @"string#16" to i64 ), i64 %"tmp#3##0")
+  %"tmp#7##0" = tail call fastcc i64 @"wybe#.range#...<0>"(i64 1, i64 3)
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.string#.[]<1>"(i64 %"tmp#5##0", i64 %"tmp#7##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#4##0")
   call ccc void @putchar(i8 10)
   call ccc void @print_string(i64 ptrtoint( ptr @"cstring#0" to i64 ))
   call ccc void @putchar(i8 10)
-  %"tmp#12##0" = tail call fastcc i64 @"wybe.range...<0>"(i64 1, i64 2)
-  %"tmp#11##0" = tail call fastcc i64 @"wybe.string.[]<1>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#12##0")
-  %"tmp#9##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 1427, i64 %"tmp#11##0")
-  %"tmp#8##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 %"tmp#9##0")
-  %"r##0" = tail call fastcc i64 @"wybe.string.c_string<0>"(i64 %"tmp#8##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#8##0")
+  %"tmp#12##0" = tail call fastcc i64 @"wybe#.range#...<0>"(i64 1, i64 2)
+  %"tmp#11##0" = tail call fastcc i64 @"wybe#.string#.[]<1>"(i64 ptrtoint( ptr @"string#20" to i64 ), i64 %"tmp#12##0")
+  %"tmp#9##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 1427, i64 %"tmp#11##0")
+  %"tmp#8##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 %"tmp#9##0")
+  %"r##0" = tail call fastcc i64 @"wybe#.string#.c_string<0>"(i64 %"tmp#8##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#8##0")
   call ccc void @putchar(i8 32)
   call ccc void @print_string(i64 %"r##0")
   call ccc void @putchar(i8 10)
   call ccc void @print_string(i64 ptrtoint( ptr @"cstring#2" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"string.print_loop#cont#1<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
-  %"tmp#14##0" = tail call fastcc i64 @"wybe.range.irange<0>"(i64 10, i64 -1, i64 1)
-  %"tmp#13##0" = tail call fastcc i64 @"wybe.string.[]<1>"(i64 ptrtoint( ptr @"string#17" to i64 ), i64 %"tmp#14##0")
-  tail call fastcc void @"string.print_loop#cont#1<0>[410bae77d3]"(i64 %"tmp#13##0")
+  tail call fastcc void @"string#.print_loop#cont#1<0>"(i64 ptrtoint( ptr @"string#14" to i64 ))
+  %"tmp#14##0" = tail call fastcc i64 @"wybe#.range#.irange<0>"(i64 10, i64 -1, i64 1)
+  %"tmp#13##0" = tail call fastcc i64 @"wybe#.string#.[]<1>"(i64 ptrtoint( ptr @"string#17" to i64 ), i64 %"tmp#14##0")
+  tail call fastcc void @"string#.print_loop#cont#1<0>[410bae77d3]"(i64 %"tmp#13##0")
   call ccc void @print_string(i64 ptrtoint( ptr @"cstring#1" to i64 ))
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"string.test_index<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 0)
-  tail call fastcc void @"string.test_index<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 1)
-  tail call fastcc void @"string.test_index<0>"(i64 ptrtoint( ptr @"string#18" to i64 ), i64 25)
-  %"tmp#15##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#13" to i64 ), i64 ptrtoint( ptr @"string#19" to i64 ))
-  tail call fastcc void @"string.test_index<0>"(i64 %"tmp#15##0", i64 1)
-  %"tmp#16##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#13" to i64 ), i64 ptrtoint( ptr @"string#19" to i64 ))
-  tail call fastcc void @"string.test_index<0>"(i64 %"tmp#16##0", i64 2)
-  tail call fastcc void @"string.test_index<0>"(i64 1415, i64 0)
-  %"tmp#19##0" = tail call fastcc i64 @"wybe.range.construct<0>"(i64 0, i64 2, i64 10)
-  %"tmp#18##0" = tail call fastcc i64 @"wybe.string.[]<1>"(i64 ptrtoint( ptr @"string#15" to i64 ), i64 %"tmp#19##0")
-  tail call fastcc void @"string.test_index<0>"(i64 %"tmp#18##0", i64 0)
-  tail call fastcc void @"string.test_index<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 3)
-  tail call fastcc void @"string.test_index<0>"(i64 1415, i64 3)
-  tail call fastcc void @"string.test_index<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 -3)
-  %"tmp#21##0" = tail call fastcc i64 @"wybe.string.[]<1>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 %"tmp#19##0")
-  tail call fastcc void @"string.test_index<0>"(i64 %"tmp#21##0", i64 2)
-  %"tmp#23##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 1415)
-  tail call fastcc void @"string.test_index<0>"(i64 %"tmp#23##0", i64 2)
-  %"tmp#28##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 1419, i64 1423)
-  %"tmp#26##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 1415, i64 %"tmp#28##0")
-  %"tmp#31##0" = tail call fastcc i64 @"wybe.range...<0>"(i64 0, i64 2)
-  %"tmp#25##0" = tail call fastcc i64 @"wybe.string.[]<1>"(i64 %"tmp#26##0", i64 %"tmp#31##0")
-  tail call fastcc void @"string.test_index<0>"(i64 %"tmp#25##0", i64 1)
+  tail call fastcc void @"string#.test_index<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 0)
+  tail call fastcc void @"string#.test_index<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 1)
+  tail call fastcc void @"string#.test_index<0>"(i64 ptrtoint( ptr @"string#18" to i64 ), i64 25)
+  %"tmp#15##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#13" to i64 ), i64 ptrtoint( ptr @"string#19" to i64 ))
+  tail call fastcc void @"string#.test_index<0>"(i64 %"tmp#15##0", i64 1)
+  %"tmp#16##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#13" to i64 ), i64 ptrtoint( ptr @"string#19" to i64 ))
+  tail call fastcc void @"string#.test_index<0>"(i64 %"tmp#16##0", i64 2)
+  tail call fastcc void @"string#.test_index<0>"(i64 1415, i64 0)
+  %"tmp#19##0" = tail call fastcc i64 @"wybe#.range#.construct<0>"(i64 0, i64 2, i64 10)
+  %"tmp#18##0" = tail call fastcc i64 @"wybe#.string#.[]<1>"(i64 ptrtoint( ptr @"string#15" to i64 ), i64 %"tmp#19##0")
+  tail call fastcc void @"string#.test_index<0>"(i64 %"tmp#18##0", i64 0)
+  tail call fastcc void @"string#.test_index<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 3)
+  tail call fastcc void @"string#.test_index<0>"(i64 1415, i64 3)
+  tail call fastcc void @"string#.test_index<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 -3)
+  %"tmp#21##0" = tail call fastcc i64 @"wybe#.string#.[]<1>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 %"tmp#19##0")
+  tail call fastcc void @"string#.test_index<0>"(i64 %"tmp#21##0", i64 2)
+  %"tmp#23##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#14" to i64 ), i64 1415)
+  tail call fastcc void @"string#.test_index<0>"(i64 %"tmp#23##0", i64 2)
+  %"tmp#28##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 1419, i64 1423)
+  %"tmp#26##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 1415, i64 %"tmp#28##0")
+  %"tmp#31##0" = tail call fastcc i64 @"wybe#.range#...<0>"(i64 0, i64 2)
+  %"tmp#25##0" = tail call fastcc i64 @"wybe#.string#.[]<1>"(i64 %"tmp#26##0", i64 %"tmp#31##0")
+  tail call fastcc void @"string#.test_index<0>"(i64 %"tmp#25##0", i64 1)
   ret void
 }
 
-define external fastcc void @"string.print_loop<0>"(i64 %"s##0") {
-  tail call fastcc void @"string.print_loop#cont#1<0>"(i64 %"s##0")
+define external fastcc void @"string#.print_loop<0>"(i64 %"s##0") {
+  tail call fastcc void @"string#.print_loop#cont#1<0>"(i64 %"s##0")
   ret void
 }
 
-define external fastcc void @"string.print_loop#cont#1<0>"(i64 %"tmp#0##0") {
-  %"tmp#8##0" = tail call fastcc {i8, i64, i1} @"wybe.string.[|]<0>"(i64 %"tmp#0##0")
+define external fastcc void @"string#.print_loop#cont#1<0>"(i64 %"tmp#0##0") {
+  %"tmp#8##0" = tail call fastcc {i8, i64, i1} @"wybe#.string#.[|]<0>"(i64 %"tmp#0##0")
   %"c##0" = extractvalue {i8, i64, i1}%"tmp#8##0", 0
   %"tmp#0##1" = extractvalue {i8, i64, i1}%"tmp#8##0", 1
   %"tmp#2##0" = extractvalue {i8, i64, i1}%"tmp#8##0", 2
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
   call ccc void @putchar(i8 %"c##0")
-  tail call fastcc void @"string.print_loop#cont#1<0>[410bae77d3]"(i64 %"tmp#0##1")
+  tail call fastcc void @"string#.print_loop#cont#1<0>[410bae77d3]"(i64 %"tmp#0##1")
   ret void
 if.else.0:
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"string.print_loop#cont#1<0>[410bae77d3]"(i64 %"tmp#0##0") {
-  %"tmp#8##0" = tail call fastcc {i8, i64, i1} @"wybe.string.[|]<0>[785a827a1b]"(i64 %"tmp#0##0")
+define external fastcc void @"string#.print_loop#cont#1<0>[410bae77d3]"(i64 %"tmp#0##0") {
+  %"tmp#8##0" = tail call fastcc {i8, i64, i1} @"wybe#.string#.[|]<0>[785a827a1b]"(i64 %"tmp#0##0")
   %"c##0" = extractvalue {i8, i64, i1}%"tmp#8##0", 0
   %"tmp#0##1" = extractvalue {i8, i64, i1}%"tmp#8##0", 1
   %"tmp#2##0" = extractvalue {i8, i64, i1}%"tmp#8##0", 2
   br i1 %"tmp#2##0", label %if.then.0, label %if.else.0
 if.then.0:
   call ccc void @putchar(i8 %"c##0")
-  tail call fastcc void @"string.print_loop#cont#1<0>[410bae77d3]"(i64 %"tmp#0##1")
+  tail call fastcc void @"string#.print_loop#cont#1<0>[410bae77d3]"(i64 %"tmp#0##1")
   ret void
 if.else.0:
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"string.test_index<0>"(i64 %"s##0", i64 %"i##0") {
-  %"tmp#10##0" = tail call fastcc {i8, i1} @"wybe.string.[]<0>"(i64 %"s##0", i64 %"i##0")
+define external fastcc void @"string#.test_index<0>"(i64 %"s##0", i64 %"i##0") {
+  %"tmp#10##0" = tail call fastcc {i8, i1} @"wybe#.string#.[]<0>"(i64 %"s##0", i64 %"i##0")
   %"tmp#0##0" = extractvalue {i8, i1}%"tmp#10##0", 0
   %"tmp#1##0" = extractvalue {i8, i1}%"tmp#10##0", 1
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
diff --git a/test-cases/final-dump/string_interpolation.exp b/test-cases/final-dump/string_interpolation.exp
index 4fc693cd..25419dd4 100644
--- a/test-cases/final-dump/string_interpolation.exp
+++ b/test-cases/final-dump/string_interpolation.exp
@@ -48,7 +48,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'string_interpolation'
 
 source_filename = "!ROOT!/final-dump/string_interpolation.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" and minint is \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c" is the answer\00", align 8
@@ -61,30 +61,30 @@ target triple    ????
 @"string#8" = private unnamed_addr constant {i64, i64} { i64 4, i64 ptrtoint( ptr @"cstring#3" to i64 ) }, align 8
 @"string#9" = private unnamed_addr constant {i64, i64} { i64 10, i64 ptrtoint( ptr @"cstring#4" to i64 ) }, align 8
 
-declare external fastcc i64 @"wybe.int.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.int#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc i64 @ipow(i64, i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"string_interpolation.<0>"() {
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#8" to i64 ), i64 1159)
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#7" to i64 ), i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#0##0")
+define external fastcc void @"string_interpolation#.<0>"() {
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#8" to i64 ), i64 1159)
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#7" to i64 ), i64 %"tmp#1##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
-  %"tmp#5##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 42, i64 0, i8 32)
-  %"tmp#4##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#5##0", i64 ptrtoint( ptr @"string#6" to i64 ))
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#4##0")
+  %"tmp#5##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 42, i64 0, i8 32)
+  %"tmp#4##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#5##0", i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#4##0")
   call ccc void @putchar(i8 10)
   %"tmp#10##0" = call ccc i64 @ipow(i64 2, i64 63)
   %"tmp#9##0" = sub i64 %"tmp#10##0", 1
-  %"tmp#8##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"tmp#9##0", i64 0, i8 32)
-  %"tmp#12##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"tmp#10##0", i64 0, i8 32)
-  %"tmp#11##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#5" to i64 ), i64 %"tmp#12##0")
-  %"tmp#7##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 %"tmp#8##0", i64 %"tmp#11##0")
-  %"tmp#6##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#9" to i64 ), i64 %"tmp#7##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#6##0")
+  %"tmp#8##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"tmp#9##0", i64 0, i8 32)
+  %"tmp#12##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"tmp#10##0", i64 0, i8 32)
+  %"tmp#11##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#5" to i64 ), i64 %"tmp#12##0")
+  %"tmp#7##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 %"tmp#8##0", i64 %"tmp#11##0")
+  %"tmp#6##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#9" to i64 ), i64 %"tmp#7##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#6##0")
   call ccc void @putchar(i8 10)
   ret void
 }
diff --git a/test-cases/final-dump/student.exp b/test-cases/final-dump/student.exp
index 375e4c0f..30cdfc56 100644
--- a/test-cases/final-dump/student.exp
+++ b/test-cases/final-dump/student.exp
@@ -79,7 +79,7 @@ printStudent(stu##0:student.student)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'student'
 
 source_filename = "!ROOT!/final-dump/student.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Declarative Programming\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"course code: \00", align 8
@@ -90,13 +90,13 @@ target triple    ????
 @"string#6" = private unnamed_addr constant {i64, i64} { i64 13, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 @"string#7" = private unnamed_addr constant {i64, i64} { i64 12, i64 ptrtoint( ptr @"cstring#3" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"student.<0>"() {
+define external fastcc void @"student#.<0>"() {
   %"tmp#12##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#4##0" = ptrtoint ptr %"tmp#12##0" to i64
   %"tmp#13##0" = inttoptr i64 %"tmp#4##0" to ptr
@@ -111,12 +111,12 @@ define external fastcc void @"student.<0>"() {
   %"tmp#18##0" = add i64 %"tmp#9##0", 8
   %"tmp#19##0" = inttoptr i64 %"tmp#18##0" to ptr
   store i64 %"tmp#4##0", ptr %"tmp#19##0"
-  tail call fastcc void @"student.printStudent<0>"(i64 %"tmp#9##0")
+  tail call fastcc void @"student#.printStudent<0>"(i64 %"tmp#9##0")
   ret void
 }
 
-define external fastcc void @"student.printStudent<0>"(i64 %"stu##0") {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
+define external fastcc void @"student#.printStudent<0>"(i64 %"stu##0") {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#7" to i64 ))
   %"tmp#19##0" = inttoptr i64 %"stu##0" to ptr
   %"tmp#0##0" = load i64, ptr %"tmp#19##0"
   call ccc void @print_int(i64 %"tmp#0##0")
@@ -124,16 +124,16 @@ define external fastcc void @"student.printStudent<0>"(i64 %"stu##0") {
   %"tmp#20##0" = add i64 %"stu##0", 8
   %"tmp#21##0" = inttoptr i64 %"tmp#20##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#21##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   %"tmp#22##0" = inttoptr i64 %"tmp#1##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#22##0"
   call ccc void @print_int(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#6" to i64 ))
   %"tmp#23##0" = add i64 %"tmp#1##0", 8
   %"tmp#24##0" = inttoptr i64 %"tmp#23##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#24##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#3##0")
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -248,14 +248,14 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'student.course'
 
 source_filename = "!ROOT!/final-dump/student.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"student.course.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"student#.course#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#10##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#code##0" = load i64, ptr %"tmp#10##0"
   %"tmp#11##0" = add i64 %"#left##0", 8
@@ -269,20 +269,20 @@ define external fastcc i1 @"student.course.=<0>"(i64 %"#left##0", i64 %"#right##
   %"tmp#1##0" = icmp eq i64 %"#left#code##0", %"#right#code##0"
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#9##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"#left#name##0", i64 %"#right#name##0", i64 %"#left#name##0", i64 %"#right#name##0")
+  %"tmp#9##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"#left#name##0", i64 %"#right#name##0", i64 %"#left#name##0", i64 %"#right#name##0")
   %"tmp#16##0" = icmp eq i2 %"tmp#9##0", 1
   ret i1 %"tmp#16##0"
 if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"student.course.code<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"student#.course#.code<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"student.course.code<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"student#.course#.code<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -292,7 +292,7 @@ define external fastcc i64 @"student.course.code<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"student.course.course<0>"(i64 %"code##0", i64 %"name##0") {
+define external fastcc i64 @"student#.course#.course<0>"(i64 %"code##0", i64 %"name##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -303,7 +303,7 @@ define external fastcc i64 @"student.course.course<0>"(i64 %"code##0", i64 %"nam
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"student.course.course<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"student#.course#.course<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -314,14 +314,14 @@ define external fastcc {i64, i64} @"student.course.course<1>"(i64 %"#result##0")
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"student.course.name<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"student#.course#.name<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"student.course.name<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"student#.course#.name<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -332,7 +332,7 @@ define external fastcc i64 @"student.course.name<1>"(i64 %"#rec##0", i64 %"#fiel
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"student.course.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"student#.course#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#9##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#9##0"
   %"tmp#10##0" = add i64 %"#left##0", 8
@@ -346,7 +346,7 @@ define external fastcc i1 @"student.course.~=<0>"(i64 %"#left##0", i64 %"#right#
   %"tmp#7##0" = icmp eq i64 %"tmp#3##0", %"tmp#5##0"
   br i1 %"tmp#7##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#8##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
+  %"tmp#8##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#4##0", i64 %"tmp#6##0", i64 %"tmp#4##0", i64 %"tmp#6##0")
   %"tmp#0##0" = icmp eq i2 %"tmp#8##0", 1
   %"tmp#15##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#15##0"
@@ -488,14 +488,14 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'student.student'
 
 source_filename = "!ROOT!/final-dump/student.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
+declare external fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2, i64, i64, i64, i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"student.student.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"student#.student#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#15##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#id##0" = load i64, ptr %"tmp#15##0"
   %"tmp#16##0" = add i64 %"#left##0", 8
@@ -522,7 +522,7 @@ if.then.0:
   %"tmp#13##0" = icmp eq i64 %"tmp#11##0", %"tmp#9##0"
   br i1 %"tmp#13##0", label %if.then.1, label %if.else.1
 if.then.1:
-  %"tmp#14##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#10##0", i64 %"tmp#12##0", i64 %"tmp#10##0", i64 %"tmp#12##0")
+  %"tmp#14##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#10##0", i64 %"tmp#12##0", i64 %"tmp#10##0", i64 %"tmp#12##0")
   %"tmp#27##0" = icmp eq i2 %"tmp#14##0", 1
   ret i1 %"tmp#27##0"
 if.else.1:
@@ -531,13 +531,13 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"student.student.id<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"student#.student#.id<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"student.student.id<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"student#.student#.id<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -547,14 +547,14 @@ define external fastcc i64 @"student.student.id<1>"(i64 %"#rec##0", i64 %"#field
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"student.student.major<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"student#.student#.major<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"student.student.major<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"student#.student#.major<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -565,7 +565,7 @@ define external fastcc i64 @"student.student.major<1>"(i64 %"#rec##0", i64 %"#fi
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"student.student.student<0>"(i64 %"id##0", i64 %"major##0") {
+define external fastcc i64 @"student#.student#.student<0>"(i64 %"id##0", i64 %"major##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -576,7 +576,7 @@ define external fastcc i64 @"student.student.student<0>"(i64 %"id##0", i64 %"maj
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"student.student.student<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"student#.student#.student<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -587,7 +587,7 @@ define external fastcc {i64, i64} @"student.student.student<1>"(i64 %"#result##0
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i1 @"student.student.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"student#.student#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#14##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#14##0"
   %"tmp#15##0" = add i64 %"#left##0", 8
@@ -614,7 +614,7 @@ if.then.0:
   %"tmp#12##0" = icmp eq i64 %"tmp#10##0", %"tmp#8##0"
   br i1 %"tmp#12##0", label %if.then.1, label %if.else.1
 if.then.1:
-  %"tmp#13##0" = tail call fastcc i2 @"wybe.string.<=>#cont#2<0>"(i2 1, i64 %"tmp#9##0", i64 %"tmp#11##0", i64 %"tmp#9##0", i64 %"tmp#11##0")
+  %"tmp#13##0" = tail call fastcc i2 @"wybe#.string#.<=>#cont#2<0>"(i2 1, i64 %"tmp#9##0", i64 %"tmp#11##0", i64 %"tmp#9##0", i64 %"tmp#11##0")
   %"tmp#0##0" = icmp eq i2 %"tmp#13##0", 1
   %"tmp#26##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#26##0"
diff --git a/test-cases/final-dump/submodule.exp b/test-cases/final-dump/submodule.exp
index 7aa0d4ba..403770df 100644
--- a/test-cases/final-dump/submodule.exp
+++ b/test-cases/final-dump/submodule.exp
@@ -22,7 +22,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'submodule'
 
 source_filename = "!ROOT!/final-dump/submodule.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -59,23 +59,23 @@ semi_hidden()<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'submodule.privatetest'
 
 source_filename = "!ROOT!/final-dump/submodule.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"private proc in a private module\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"public proc in a private module\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 32, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 31, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"submodule.privatetest.hidden<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+define external fastcc void @"submodule#.privatetest#.hidden<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   ret void
 }
 
-define external fastcc void @"submodule.privatetest.semi_hidden<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+define external fastcc void @"submodule#.privatetest#.semi_hidden<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   ret void
 }
 
@@ -111,22 +111,22 @@ visible()<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'submodule.publictest'
 
 source_filename = "!ROOT!/final-dump/submodule.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"private proc in a public module\00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"public proc in a public module\00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 31, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 30, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"submodule.publictest.semi_visible<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+define external fastcc void @"submodule#.publictest#.semi_visible<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   ret void
 }
 
-define external fastcc void @"submodule.publictest.visible<0>"() {
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+define external fastcc void @"submodule#.publictest#.visible<0>"() {
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   ret void
 }
diff --git a/test-cases/final-dump/subresource.exp b/test-cases/final-dump/subresource.exp
index 2eec9ee3..50c88967 100644
--- a/test-cases/final-dump/subresource.exp
+++ b/test-cases/final-dump/subresource.exp
@@ -34,22 +34,22 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'subresource'
 
 source_filename = "!ROOT!/final-dump/subresource.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"res = \00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 6, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc i64 @"wybe.int.fmt<2>"(i64, i64, i8)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.int#.fmt<2>"(i64, i64, i8)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"subresource.<0>"() {
+define external fastcc void @"subresource#.<0>"() {
   %"res##0" = load i64, ptr @"resource#subresource.a.res"
-  %"tmp#1##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"res##0", i64 0, i8 32)
-  %"tmp#0##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#1" to i64 ), i64 %"tmp#1##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#0##0")
+  %"tmp#1##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"res##0", i64 0, i8 32)
+  %"tmp#0##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#1" to i64 ), i64 %"tmp#1##0")
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -72,7 +72,7 @@ define external fastcc void @"subresource.<0>"() {
 ; ModuleID = 'subresource.a'
 
 source_filename = "!ROOT!/final-dump/subresource.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/terminal_ok.exp b/test-cases/final-dump/terminal_ok.exp
index 648bb026..d5569e13 100644
--- a/test-cases/final-dump/terminal_ok.exp
+++ b/test-cases/final-dump/terminal_ok.exp
@@ -34,18 +34,18 @@ exit_bool(b##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'terminal_ok'
 
 source_filename = "!ROOT!/final-dump/terminal_ok.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @exit(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"terminal_ok.<0>"() {
+define external fastcc void @"terminal_ok#.<0>"() {
   call ccc void @exit(i64 0)
   ret void
 }
 
-define external fastcc void @"terminal_ok.exit_bool<0>"(i1 %"b##0") {
+define external fastcc void @"terminal_ok#.exit_bool<0>"(i1 %"b##0") {
   %"tmp#1##0" = zext i1 %"b##0" to i64
   call ccc void @exit(i64 %"tmp#1##0")
   ret void
diff --git a/test-cases/final-dump/test_loop.exp b/test-cases/final-dump/test_loop.exp
index 01a4cfc4..a67473e1 100644
--- a/test-cases/final-dump/test_loop.exp
+++ b/test-cases/final-dump/test_loop.exp
@@ -124,7 +124,7 @@ find_test(modulus##0:wybe.int)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ; ModuleID = 'test_loop'
 
 source_filename = "!ROOT!/final-dump/test_loop.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" is \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"Couldn't find even number divisible by \00", align 8
@@ -133,20 +133,20 @@ target triple    ????
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 39, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 31, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"test_loop.<0>"() {
-  tail call fastcc void @"test_loop.find_test<0>"(i64 3)
-  tail call fastcc void @"test_loop.find_test<0>"(i64 7)
+define external fastcc void @"test_loop#.<0>"() {
+  tail call fastcc void @"test_loop#.find_test<0>"(i64 3)
+  tail call fastcc void @"test_loop#.find_test<0>"(i64 7)
   ret void
 }
 
-define external fastcc {i64, i1} @"test_loop.find_modulo<0>"(i64 %"seq##0", i64 %"modulus##0") {
-  %"tmp#3##0" = tail call fastcc {i64, i1} @"test_loop.find_modulo#cont#1<0>"(i64 %"modulus##0", i64 %"seq##0")
+define external fastcc {i64, i1} @"test_loop#.find_modulo<0>"(i64 %"seq##0", i64 %"modulus##0") {
+  %"tmp#3##0" = tail call fastcc {i64, i1} @"test_loop#.find_modulo#cont#1<0>"(i64 %"modulus##0", i64 %"seq##0")
   %"tmp#4##0" = extractvalue {i64, i1}%"tmp#3##0", 0
   %"tmp#5##0" = extractvalue {i64, i1}%"tmp#3##0", 1
   %"tmp#6##0" = insertvalue {i64, i1} undef, i64 %"tmp#4##0", 0
@@ -154,8 +154,8 @@ define external fastcc {i64, i1} @"test_loop.find_modulo<0>"(i64 %"seq##0", i64
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"test_loop.find_modulo#cont#1<0>"(i64 %"modulus##0", i64 %"seq##0") {
-  %"tmp#7##0" = tail call fastcc {i64, i64, i1} @"test_loop.int_seq.seq_next<0>"(i64 %"seq##0")
+define external fastcc {i64, i1} @"test_loop#.find_modulo#cont#1<0>"(i64 %"modulus##0", i64 %"seq##0") {
+  %"tmp#7##0" = tail call fastcc {i64, i64, i1} @"test_loop#.int_seq#.seq_next<0>"(i64 %"seq##0")
   %"seq##1" = extractvalue {i64, i64, i1}%"tmp#7##0", 0
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#7##0", 1
   %"tmp#1##0" = extractvalue {i64, i64, i1}%"tmp#7##0", 2
@@ -169,7 +169,7 @@ if.then.1:
   %"tmp#9##0" = insertvalue {i64, i1} %"tmp#8##0", i1 1, 1
   ret {i64, i1} %"tmp#9##0"
 if.else.1:
-  %"tmp#10##0" = tail call fastcc {i64, i1} @"test_loop.find_modulo#cont#1<0>"(i64 %"modulus##0", i64 %"seq##1")
+  %"tmp#10##0" = tail call fastcc {i64, i1} @"test_loop#.find_modulo#cont#1<0>"(i64 %"modulus##0", i64 %"seq##1")
   %"tmp#11##0" = extractvalue {i64, i1}%"tmp#10##0", 0
   %"tmp#12##0" = extractvalue {i64, i1}%"tmp#10##0", 1
   %"tmp#13##0" = insertvalue {i64, i1} undef, i64 %"tmp#11##0", 0
@@ -181,8 +181,8 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc {i64, i1} @"test_loop.find_modulo#cont#1<0>[6dacb8fd25]"(i64 %"modulus##0", i64 %"seq##0") {
-  %"tmp#7##0" = tail call fastcc {i64, i64, i1} @"test_loop.int_seq.seq_next<0>[410bae77d3]"(i64 %"seq##0")
+define external fastcc {i64, i1} @"test_loop#.find_modulo#cont#1<0>[6dacb8fd25]"(i64 %"modulus##0", i64 %"seq##0") {
+  %"tmp#7##0" = tail call fastcc {i64, i64, i1} @"test_loop#.int_seq#.seq_next<0>[410bae77d3]"(i64 %"seq##0")
   %"seq##1" = extractvalue {i64, i64, i1}%"tmp#7##0", 0
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#7##0", 1
   %"tmp#1##0" = extractvalue {i64, i64, i1}%"tmp#7##0", 2
@@ -196,7 +196,7 @@ if.then.1:
   %"tmp#9##0" = insertvalue {i64, i1} %"tmp#8##0", i1 1, 1
   ret {i64, i1} %"tmp#9##0"
 if.else.1:
-  %"tmp#10##0" = tail call fastcc {i64, i1} @"test_loop.find_modulo#cont#1<0>[6dacb8fd25]"(i64 %"modulus##0", i64 %"seq##1")
+  %"tmp#10##0" = tail call fastcc {i64, i1} @"test_loop#.find_modulo#cont#1<0>[6dacb8fd25]"(i64 %"modulus##0", i64 %"seq##1")
   %"tmp#11##0" = extractvalue {i64, i1}%"tmp#10##0", 0
   %"tmp#12##0" = extractvalue {i64, i1}%"tmp#10##0", 1
   %"tmp#13##0" = insertvalue {i64, i1} undef, i64 %"tmp#11##0", 0
@@ -208,7 +208,7 @@ if.else.0:
   ret {i64, i1} %"tmp#16##0"
 }
 
-define external fastcc void @"test_loop.find_test<0>"(i64 %"modulus##0") {
+define external fastcc void @"test_loop#.find_test<0>"(i64 %"modulus##0") {
   %"tmp#22##0" = call ccc ptr @wybe_malloc(i32 24)
   %"tmp#5##0" = ptrtoint ptr %"tmp#22##0" to i64
   %"tmp#23##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -219,19 +219,19 @@ define external fastcc void @"test_loop.find_test<0>"(i64 %"modulus##0") {
   %"tmp#26##0" = add i64 %"tmp#5##0", 16
   %"tmp#27##0" = inttoptr i64 %"tmp#26##0" to ptr
   store i64 10, ptr %"tmp#27##0"
-  %"tmp#28##0" = tail call fastcc {i64, i1} @"test_loop.find_modulo#cont#1<0>[6dacb8fd25]"(i64 %"modulus##0", i64 %"tmp#5##0")
+  %"tmp#28##0" = tail call fastcc {i64, i1} @"test_loop#.find_modulo#cont#1<0>[6dacb8fd25]"(i64 %"modulus##0", i64 %"tmp#5##0")
   %"i##0" = extractvalue {i64, i1}%"tmp#28##0", 0
   %"tmp#1##0" = extractvalue {i64, i1}%"tmp#28##0", 1
   br i1 %"tmp#1##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#5" to i64 ))
   call ccc void @print_int(i64 %"modulus##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @print_int(i64 %"i##0")
   call ccc void @putchar(i8 10)
   ret void
 if.else.0:
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @print_int(i64 %"modulus##0")
   call ccc void @putchar(i8 10)
   ret void
@@ -419,13 +419,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'test_loop.int_seq'
 
 source_filename = "!ROOT!/final-dump/test_loop.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"test_loop.int_seq.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"test_loop#.int_seq#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#12##0" = inttoptr i64 %"#left##0" to ptr
   %"#left#low##0" = load i64, ptr %"tmp#12##0"
   %"tmp#13##0" = add i64 %"#left##0", 8
@@ -456,14 +456,14 @@ if.else.0:
   ret i1 0
 }
 
-define external fastcc i64 @"test_loop.int_seq.high<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"test_loop#.int_seq#.high<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 16
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"test_loop.int_seq.high<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"test_loop#.int_seq#.high<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 24)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 24, i1 0)
@@ -474,7 +474,7 @@ define external fastcc i64 @"test_loop.int_seq.high<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"test_loop.int_seq.int_seq<0>"(i64 %"low##0", i64 %"step##0", i64 %"high##0") {
+define external fastcc i64 @"test_loop#.int_seq#.int_seq<0>"(i64 %"low##0", i64 %"step##0", i64 %"high##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 24)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -488,7 +488,7 @@ define external fastcc i64 @"test_loop.int_seq.int_seq<0>"(i64 %"low##0", i64 %"
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64} @"test_loop.int_seq.int_seq<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64} @"test_loop#.int_seq#.int_seq<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -503,13 +503,13 @@ define external fastcc {i64, i64, i64} @"test_loop.int_seq.int_seq<1>"(i64 %"#re
   ret {i64, i64, i64} %"tmp#10##0"
 }
 
-define external fastcc i64 @"test_loop.int_seq.low<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"test_loop#.int_seq#.low<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"test_loop.int_seq.low<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"test_loop#.int_seq#.low<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 24)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 24, i1 0)
@@ -519,7 +519,7 @@ define external fastcc i64 @"test_loop.int_seq.low<1>"(i64 %"#rec##0", i64 %"#fi
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc {i64, i64, i1} @"test_loop.int_seq.seq_next<0>"(i64 %"seq##0") {
+define external fastcc {i64, i64, i1} @"test_loop#.int_seq#.seq_next<0>"(i64 %"seq##0") {
   %"tmp#9##0" = inttoptr i64 %"seq##0" to ptr
   %"tmp#10##0" = load i64, ptr %"tmp#9##0"
   %"tmp#11##0" = add i64 %"seq##0", 8
@@ -549,7 +549,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#24##0"
 }
 
-define external fastcc {i64, i64, i1} @"test_loop.int_seq.seq_next<0>[410bae77d3]"(i64 %"seq##0") {
+define external fastcc {i64, i64, i1} @"test_loop#.int_seq#.seq_next<0>[410bae77d3]"(i64 %"seq##0") {
   %"tmp#9##0" = inttoptr i64 %"seq##0" to ptr
   %"tmp#10##0" = load i64, ptr %"tmp#9##0"
   %"tmp#11##0" = add i64 %"seq##0", 8
@@ -575,14 +575,14 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#21##0"
 }
 
-define external fastcc i64 @"test_loop.int_seq.step<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"test_loop#.int_seq#.step<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"test_loop.int_seq.step<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"test_loop#.int_seq#.step<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 24)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 24, i1 0)
@@ -593,7 +593,7 @@ define external fastcc i64 @"test_loop.int_seq.step<1>"(i64 %"#rec##0", i64 %"#f
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i1 @"test_loop.int_seq.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"test_loop#.int_seq#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#11##0" = inttoptr i64 %"#left##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#11##0"
   %"tmp#12##0" = add i64 %"#left##0", 8
diff --git a/test-cases/final-dump/tests.exp b/test-cases/final-dump/tests.exp
index 1ef3b2c1..ff6a34e2 100644
--- a/test-cases/final-dump/tests.exp
+++ b/test-cases/final-dump/tests.exp
@@ -89,13 +89,13 @@ lt3(x##0:wybe.int, y##0:wybe.int, ?#success##0:wybe.bool)<{}; {}; {}>:
 ; ModuleID = 'tests'
 
 source_filename = "!ROOT!/final-dump/tests.wybe"
-target triple    ????
+target triple   = ????
 
 @"array#0" = private unnamed_addr constant [ 2 x i64 ] [i64 24, i64 0]
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc {i64, i1} @"tests.lookup<0>"(i64 %"key##0", i64 %"map##0") {
+define external fastcc {i64, i1} @"tests#.lookup<0>"(i64 %"key##0", i64 %"map##0") {
   %"tmp#15##0" = icmp ne i64 %"map##0", 0
   br i1 %"tmp#15##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -119,7 +119,7 @@ if.else.1:
   %"tmp#51##0" = add i64 %"map##0", %"tmp#41##0"
   %"tmp#52##0" = inttoptr i64 %"tmp#51##0" to ptr
   %"tmp#3##0" = load i64, ptr %"tmp#52##0"
-  %"tmp#53##0" = tail call fastcc {i64, i1} @"tests.lookup<0>"(i64 %"key##0", i64 %"tmp#3##0")
+  %"tmp#53##0" = tail call fastcc {i64, i1} @"tests#.lookup<0>"(i64 %"key##0", i64 %"tmp#3##0")
   %"tmp#54##0" = extractvalue {i64, i1}%"tmp#53##0", 0
   %"tmp#55##0" = extractvalue {i64, i1}%"tmp#53##0", 1
   %"tmp#56##0" = insertvalue {i64, i1} undef, i64 %"tmp#54##0", 0
@@ -131,17 +131,17 @@ if.else.0:
   ret {i64, i1} %"tmp#59##0"
 }
 
-define external fastcc i1 @"tests.lt<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"tests#.lt<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#3##0" = icmp slt i64 %"x##0", %"y##0"
   ret i1 %"tmp#3##0"
 }
 
-define external fastcc i1 @"tests.lt2<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"tests#.lt2<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#4##0" = icmp slt i64 %"x##0", %"y##0"
   ret i1 %"tmp#4##0"
 }
 
-define external fastcc i1 @"tests.lt3<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"tests#.lt3<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#3##0" = icmp sgt i64 %"x##0", %"y##0"
   ret i1 %"tmp#3##0"
 }
@@ -403,13 +403,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'tests.map'
 
 source_filename = "!ROOT!/final-dump/tests.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"tests.map.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"tests#.map#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -438,7 +438,7 @@ if.then.1:
   %"tmp#28##0" = add i64 %"#right##0", 24
   %"tmp#29##0" = inttoptr i64 %"tmp#28##0" to ptr
   %"#right#right##0" = load i64, ptr %"tmp#29##0"
-  %"tmp#4##0" = tail call fastcc i1 @"tests.map.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
+  %"tmp#4##0" = tail call fastcc i1 @"tests#.map#.=<0>"(i64 %"#left#left##0", i64 %"#right#left##0")
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
   %"tmp#5##0" = icmp eq i64 %"#left#key##0", %"#right#key##0"
@@ -447,7 +447,7 @@ if.then.3:
   %"tmp#6##0" = icmp eq i64 %"#left#value##0", %"#right#value##0"
   br i1 %"tmp#6##0", label %if.then.4, label %if.else.4
 if.then.4:
-  %"tmp#30##0" = tail call fastcc i1 @"tests.map.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
+  %"tmp#30##0" = tail call fastcc i1 @"tests#.map#.=<0>"(i64 %"#left#right##0", i64 %"#right#right##0")
   ret i1 %"tmp#30##0"
 if.else.4:
   ret i1 0
@@ -462,11 +462,11 @@ if.else.0:
   ret i1 %"tmp#31##0"
 }
 
-define external fastcc i64 @"tests.map.empty<0>"() {
+define external fastcc i64 @"tests#.map#.empty<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"tests.map.key<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"tests#.map#.key<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -482,7 +482,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"tests.map.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"tests#.map#.key<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -502,7 +502,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"tests.map.left<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"tests#.map#.left<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -517,7 +517,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"tests.map.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"tests#.map#.left<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -536,7 +536,7 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"tests.map.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"value##0", i64 %"right##0") {
+define external fastcc i64 @"tests#.map#.node<0>"(i64 %"left##0", i64 %"key##0", i64 %"value##0", i64 %"right##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 32)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -553,7 +553,7 @@ define external fastcc i64 @"tests.map.node<0>"(i64 %"left##0", i64 %"key##0", i
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i64, i64, i1} @"tests.map.node<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i64, i64, i1} @"tests#.map#.node<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -583,7 +583,7 @@ if.else.0:
   ret {i64, i64, i64, i64, i1} %"tmp#21##0"
 }
 
-define external fastcc {i64, i1} @"tests.map.right<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"tests#.map#.right<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -599,7 +599,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"tests.map.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"tests#.map#.right<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -619,7 +619,7 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc {i64, i1} @"tests.map.value<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"tests#.map#.value<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -635,7 +635,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"tests.map.value<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"tests#.map#.value<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -655,8 +655,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"tests.map.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"tests.map.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"tests#.map#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"tests#.map#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/thistype.exp b/test-cases/final-dump/thistype.exp
index cc2bf075..5c69a20e 100644
--- a/test-cases/final-dump/thistype.exp
+++ b/test-cases/final-dump/thistype.exp
@@ -247,7 +247,7 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'thistype'
 
 source_filename = "!ROOT!/final-dump/thistype.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -255,7 +255,7 @@ declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"thistype.<0>"() {
+define external fastcc void @"thistype#.<0>"() {
   %"tmp#33##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#11##0" = ptrtoint ptr %"tmp#33##0" to i64
   %"tmp#34##0" = inttoptr i64 %"tmp#11##0" to ptr
@@ -292,15 +292,15 @@ define external fastcc void @"thistype.<0>"() {
   %"tmp#52##0" = inttoptr i64 %"tmp#51##0" to ptr
   store i64 %"tmp#23##0", ptr %"tmp#52##0"
   %"tmp#53##0" = alloca i8, i64 8, align 8
-  call fastcc void @"thistype.concat<0>[410bae77d3]"(i64 %"tmp#19##0", i64 %"tmp#27##0", ptr %"tmp#53##0")
+  call fastcc void @"thistype#.concat<0>[410bae77d3]"(i64 %"tmp#19##0", i64 %"tmp#27##0", ptr %"tmp#53##0")
   %"tmp#8##0" = load i64, ptr %"tmp#53##0"
-  %"tmp#7##0" = call fastcc i64 @"thistype.length<0>"(i64 %"tmp#8##0")
+  %"tmp#7##0" = call fastcc i64 @"thistype#.length<0>"(i64 %"tmp#8##0")
   call ccc void @print_int(i64 %"tmp#7##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i1 @"thistype.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"thistype#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -320,7 +320,7 @@ if.then.1:
   %"tmp#4##0" = icmp eq i64 %"#left#head##0", %"#right#head##0"
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#18##0" = tail call fastcc i1 @"thistype.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
+  %"tmp#18##0" = tail call fastcc i1 @"thistype#.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
   ret i1 %"tmp#18##0"
 if.else.2:
   ret i1 0
@@ -331,7 +331,7 @@ if.else.0:
   ret i1 %"tmp#19##0"
 }
 
-define external fastcc void @"thistype.concat<0>"(i64 %"x##0", i64 %"y##0", ptr %"tmp#10##0") {
+define external fastcc void @"thistype#.concat<0>"(i64 %"x##0", i64 %"y##0", ptr %"tmp#10##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -347,14 +347,14 @@ if.then.0:
   store i64 %"tmp#8##0", ptr %"tmp#10##0"
   %"tmp#16##0" = add i64 %"tmp#8##0", 8
   %"tmp#17##0" = inttoptr i64 %"tmp#16##0" to ptr
-  musttail call fastcc void @"thistype.concat<0>"(i64 %"t##0", i64 %"y##0", ptr %"tmp#17##0")
+  musttail call fastcc void @"thistype#.concat<0>"(i64 %"t##0", i64 %"y##0", ptr %"tmp#17##0")
   ret void
 if.else.0:
   store i64 %"y##0", ptr %"tmp#10##0"
   ret void
 }
 
-define external fastcc void @"thistype.concat<0>[410bae77d3]"(i64 %"x##0", i64 %"y##0", ptr %"tmp#10##0") {
+define external fastcc void @"thistype#.concat<0>[410bae77d3]"(i64 %"x##0", i64 %"y##0", ptr %"tmp#10##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -364,14 +364,14 @@ if.then.0:
   store i64 %"x##0", ptr %"tmp#10##0"
   %"tmp#13##0" = add i64 %"x##0", 8
   %"tmp#14##0" = inttoptr i64 %"tmp#13##0" to ptr
-  musttail call fastcc void @"thistype.concat<0>[410bae77d3]"(i64 %"t##0", i64 %"y##0", ptr %"tmp#14##0")
+  musttail call fastcc void @"thistype#.concat<0>[410bae77d3]"(i64 %"t##0", i64 %"y##0", ptr %"tmp#14##0")
   ret void
 if.else.0:
   store i64 %"y##0", ptr %"tmp#10##0"
   ret void
 }
 
-define external fastcc i64 @"thistype.cons<0>"(i64 %"head##0", i64 %"tail##0") {
+define external fastcc i64 @"thistype#.cons<0>"(i64 %"head##0", i64 %"tail##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -382,7 +382,7 @@ define external fastcc i64 @"thistype.cons<0>"(i64 %"head##0", i64 %"tail##0") {
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"thistype.cons<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"thistype#.cons<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -402,7 +402,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"thistype.head<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"thistype#.head<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -417,7 +417,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"thistype.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"thistype#.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -436,25 +436,25 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"thistype.length<0>"(i64 %"x##0") {
+define external fastcc i64 @"thistype#.length<0>"(i64 %"x##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#8##0" = add i64 %"x##0", 8
   %"tmp#9##0" = inttoptr i64 %"tmp#8##0" to ptr
   %"t##0" = load i64, ptr %"tmp#9##0"
-  %"tmp#2##0" = tail call fastcc i64 @"thistype.length<0>"(i64 %"t##0")
+  %"tmp#2##0" = tail call fastcc i64 @"thistype#.length<0>"(i64 %"t##0")
   %"tmp#10##0" = add i64 %"tmp#2##0", 1
   ret i64 %"tmp#10##0"
 if.else.0:
   ret i64 0
 }
 
-define external fastcc i64 @"thistype.nil<0>"() {
+define external fastcc i64 @"thistype#.nil<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"thistype.tail<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"thistype#.tail<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -470,7 +470,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"thistype.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"thistype#.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -490,8 +490,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"thistype.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"thistype.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"thistype#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"thistype#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/top_level_use.exp b/test-cases/final-dump/top_level_use.exp
index ff90d6ed..53d398ec 100644
--- a/test-cases/final-dump/top_level_use.exp
+++ b/test-cases/final-dump/top_level_use.exp
@@ -28,7 +28,7 @@ module top-level code > public {semipure} (0 calls)
 ; ModuleID = 'top_level_use'
 
 source_filename = "!ROOT!/final-dump/top_level_use.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
@@ -36,7 +36,7 @@ declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#top_level_use.res" = global i64 undef
 
-define external fastcc void @"top_level_use.<0>"() {
+define external fastcc void @"top_level_use#.<0>"() {
   call ccc void @print_int(i64 0)
   call ccc void @putchar(i8 10)
   ret void
diff --git a/test-cases/final-dump/type_enum.exp b/test-cases/final-dump/type_enum.exp
index 3b8a263e..db773db4 100644
--- a/test-cases/final-dump/type_enum.exp
+++ b/test-cases/final-dump/type_enum.exp
@@ -26,7 +26,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'type_enum'
 
 source_filename = "!ROOT!/final-dump/type_enum.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -101,33 +101,33 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'type_enum.season'
 
 source_filename = "!ROOT!/final-dump/type_enum.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"type_enum.season.=<0>"(i2 %"#left##0", i2 %"#right##0") {
+define external fastcc i1 @"type_enum#.season#.=<0>"(i2 %"#left##0", i2 %"#right##0") {
   %"tmp#1##0" = icmp eq i2 %"#left##0", %"#right##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i2 @"type_enum.season.autumn<0>"() {
+define external fastcc i2 @"type_enum#.season#.autumn<0>"() {
   ret i2 3
 }
 
-define external fastcc i2 @"type_enum.season.spring<0>"() {
+define external fastcc i2 @"type_enum#.season#.spring<0>"() {
   ret i2 1
 }
 
-define external fastcc i2 @"type_enum.season.summer<0>"() {
+define external fastcc i2 @"type_enum#.season#.summer<0>"() {
   ret i2 2
 }
 
-define external fastcc i2 @"type_enum.season.winter<0>"() {
+define external fastcc i2 @"type_enum#.season#.winter<0>"() {
   ret i2 0
 }
 
-define external fastcc i1 @"type_enum.season.~=<0>"(i2 %"#left##0", i2 %"#right##0") {
+define external fastcc i1 @"type_enum#.season#.~=<0>"(i2 %"#left##0", i2 %"#right##0") {
   %"tmp#0##0" = icmp eq i2 %"#left##0", %"#right##0"
   %"tmp#3##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#3##0"
diff --git a/test-cases/final-dump/type_generics.exp b/test-cases/final-dump/type_generics.exp
index 76385269..97fe6f4b 100644
--- a/test-cases/final-dump/type_generics.exp
+++ b/test-cases/final-dump/type_generics.exp
@@ -168,53 +168,53 @@ foo2(x##0:T0 <{}; {}; {0}>, ?y##0:T0 <{}; {}; {0}>, ?#success##0:wybe.bool)<{};
 ; ModuleID = 'type_generics'
 
 source_filename = "!ROOT!/final-dump/type_generics.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"wybe.bool.print<0>"(i1)
-declare external fastcc i64 @"wybe.list.length1<0>"(i64, i64)
+declare external fastcc void @"wybe#.bool#.print<0>"(i1)
+declare external fastcc i64 @"wybe#.list#.length1<0>"(i64, i64)
 declare external ccc void @print_float(double)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"type_generics.<0>"() {
-  tail call fastcc void @"type_generics.foo<0>"(i64 1)
-  tail call fastcc void @"type_generics.foo<0>"(i64 1)
-  tail call fastcc void @"type_generics.foo<0>"(i64 bitcast( double 1.0 to i64 ))
-  tail call fastcc void @"type_generics.foo<0>"(i64 bitcast( double 1.0 to i64 ))
-  %"tmp#13##0" = tail call fastcc {i64, i1} @"type_generics.foo2<0>"(i64 1)
+define external fastcc void @"type_generics#.<0>"() {
+  tail call fastcc void @"type_generics#.foo<0>"(i64 1)
+  tail call fastcc void @"type_generics#.foo<0>"(i64 1)
+  tail call fastcc void @"type_generics#.foo<0>"(i64 bitcast( double 1.0 to i64 ))
+  tail call fastcc void @"type_generics#.foo<0>"(i64 bitcast( double 1.0 to i64 ))
+  %"tmp#13##0" = tail call fastcc {i64, i1} @"type_generics#.foo2<0>"(i64 1)
   %"y##0" = extractvalue {i64, i1}%"tmp#13##0", 0
   %"tmp#8##0" = extractvalue {i64, i1}%"tmp#13##0", 1
   br i1 %"tmp#8##0", label %if.then.0, label %if.else.0
 if.then.0:
   call ccc void @print_int(i64 %"y##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"type_generics.#cont#1<0>"()
+  tail call fastcc void @"type_generics#.#cont#1<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"type_generics.#cont#1<0>"()
+  tail call fastcc void @"type_generics#.#cont#1<0>"()
   ret void
 }
 
-define external fastcc void @"type_generics.#cont#1<0>"() {
-  %"tmp#12##0" = tail call fastcc {i64, i1} @"type_generics.foo2<0>"(i64 1)
+define external fastcc void @"type_generics#.#cont#1<0>"() {
+  %"tmp#12##0" = tail call fastcc {i64, i1} @"type_generics#.foo2<0>"(i64 1)
   %"y##0" = extractvalue {i64, i1}%"tmp#12##0", 0
   %"tmp#7##0" = extractvalue {i64, i1}%"tmp#12##0", 1
   br i1 %"tmp#7##0", label %if.then.0, label %if.else.0
 if.then.0:
   call ccc void @print_int(i64 %"y##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"type_generics.#cont#2<0>"()
+  tail call fastcc void @"type_generics#.#cont#2<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"type_generics.#cont#2<0>"()
+  tail call fastcc void @"type_generics#.#cont#2<0>"()
   ret void
 }
 
-define external fastcc void @"type_generics.#cont#2<0>"() {
-  %"tmp#11##0" = tail call fastcc {i64, i1} @"type_generics.foo2<0>"(i64 bitcast( double 1.0 to i64 ))
+define external fastcc void @"type_generics#.#cont#2<0>"() {
+  %"tmp#11##0" = tail call fastcc {i64, i1} @"type_generics#.foo2<0>"(i64 bitcast( double 1.0 to i64 ))
   %"tmp#12##0" = extractvalue {i64, i1}%"tmp#11##0", 0
   %"fx##0" = bitcast i64 %"tmp#12##0" to double
   %"tmp#6##0" = extractvalue {i64, i1}%"tmp#11##0", 1
@@ -222,15 +222,15 @@ define external fastcc void @"type_generics.#cont#2<0>"() {
 if.then.0:
   call ccc void @print_float(double %"fx##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"type_generics.#cont#3<0>"()
+  tail call fastcc void @"type_generics#.#cont#3<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"type_generics.#cont#3<0>"()
+  tail call fastcc void @"type_generics#.#cont#3<0>"()
   ret void
 }
 
-define external fastcc void @"type_generics.#cont#3<0>"() {
-  %"tmp#10##0" = tail call fastcc {i64, i1} @"type_generics.foo2<0>"(i64 bitcast( double 1.0 to i64 ))
+define external fastcc void @"type_generics#.#cont#3<0>"() {
+  %"tmp#10##0" = tail call fastcc {i64, i1} @"type_generics#.foo2<0>"(i64 bitcast( double 1.0 to i64 ))
   %"tmp#11##0" = extractvalue {i64, i1}%"tmp#10##0", 0
   %"x##1" = bitcast i64 %"tmp#11##0" to double
   %"tmp#5##0" = extractvalue {i64, i1}%"tmp#10##0", 1
@@ -238,15 +238,15 @@ define external fastcc void @"type_generics.#cont#3<0>"() {
 if.then.0:
   call ccc void @print_float(double %"x##1")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"type_generics.#cont#4<0>"()
+  tail call fastcc void @"type_generics#.#cont#4<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"type_generics.#cont#4<0>"()
+  tail call fastcc void @"type_generics#.#cont#4<0>"()
   ret void
 }
 
-define external fastcc void @"type_generics.#cont#4<0>"() {
-  %"tmp#9##0" = tail call fastcc {i64, i1} @"type_generics.foo2<0>"(i64 97)
+define external fastcc void @"type_generics#.#cont#4<0>"() {
+  %"tmp#9##0" = tail call fastcc {i64, i1} @"type_generics#.foo2<0>"(i64 97)
   %"tmp#10##0" = extractvalue {i64, i1}%"tmp#9##0", 0
   %"z##0" = trunc i64 %"tmp#10##0" to i8
   %"tmp#4##0" = extractvalue {i64, i1}%"tmp#9##0", 1
@@ -254,28 +254,28 @@ define external fastcc void @"type_generics.#cont#4<0>"() {
 if.then.0:
   call ccc void @putchar(i8 %"z##0")
   call ccc void @putchar(i8 10)
-  tail call fastcc void @"type_generics.#cont#5<0>"()
+  tail call fastcc void @"type_generics#.#cont#5<0>"()
   ret void
 if.else.0:
-  tail call fastcc void @"type_generics.#cont#5<0>"()
+  tail call fastcc void @"type_generics#.#cont#5<0>"()
   ret void
 }
 
-define external fastcc void @"type_generics.#cont#5<0>"() {
-  %"tmp#7##0" = tail call fastcc {i64, i1} @"type_generics.foo2<0>"(i64 0)
+define external fastcc void @"type_generics#.#cont#5<0>"() {
+  %"tmp#7##0" = tail call fastcc {i64, i1} @"type_generics#.foo2<0>"(i64 0)
   %"tmp#8##0" = extractvalue {i64, i1}%"tmp#7##0", 0
   %"b##0" = trunc i64 %"tmp#8##0" to i1
   %"tmp#3##0" = extractvalue {i64, i1}%"tmp#7##0", 1
   br i1 %"tmp#3##0", label %if.then.0, label %if.else.0
 if.then.0:
-  tail call fastcc void @"wybe.bool.print<0>"(i1 %"b##0")
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 %"b##0")
   call ccc void @putchar(i8 10)
   ret void
 if.else.0:
   ret void
 }
 
-define external fastcc void @"type_generics.foo<0>"(i64 %"x##0") {
+define external fastcc void @"type_generics#.foo<0>"(i64 %"x##0") {
   %"tmp#12##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#5##0" = ptrtoint ptr %"tmp#12##0" to i64
   %"tmp#13##0" = inttoptr i64 %"tmp#5##0" to ptr
@@ -283,13 +283,13 @@ define external fastcc void @"type_generics.foo<0>"(i64 %"x##0") {
   %"tmp#14##0" = add i64 %"tmp#5##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
   store i64 0, ptr %"tmp#15##0"
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.list.length1<0>"(i64 %"tmp#5##0", i64 0)
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.list#.length1<0>"(i64 %"tmp#5##0", i64 0)
   call ccc void @print_int(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc {i64, i1} @"type_generics.foo2<0>"(i64 %"x##0") {
+define external fastcc {i64, i1} @"type_generics#.foo2<0>"(i64 %"x##0") {
   %"tmp#13##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#7##0" = ptrtoint ptr %"tmp#13##0" to i64
   %"tmp#14##0" = inttoptr i64 %"tmp#7##0" to ptr
diff --git a/test-cases/final-dump/type_int.exp b/test-cases/final-dump/type_int.exp
index 561c8976..9ba804de 100644
--- a/test-cases/final-dump/type_int.exp
+++ b/test-cases/final-dump/type_int.exp
@@ -34,7 +34,7 @@ AFTER EVERYTHING:
 ; ModuleID = 'type_int'
 
 source_filename = "!ROOT!/final-dump/type_int.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -172,77 +172,77 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'type_int.myint'
 
 source_filename = "!ROOT!/final-dump/type_int.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"type_int.myint.*<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"type_int#.myint#.*<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = mul i64 %"x##0", %"y##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"type_int.myint.+<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"type_int#.myint#.+<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = add i64 %"x##0", %"y##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"type_int.myint.+<1>"(i64 %"y##0", i64 %"z##0") {
+define external fastcc i64 @"type_int#.myint#.+<1>"(i64 %"y##0", i64 %"z##0") {
   %"tmp#1##0" = sub i64 %"z##0", %"y##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"type_int.myint.+<2>"(i64 %"x##0", i64 %"z##0") {
+define external fastcc i64 @"type_int#.myint#.+<2>"(i64 %"x##0", i64 %"z##0") {
   %"tmp#1##0" = sub i64 %"z##0", %"x##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"type_int.myint.-<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"type_int#.myint#.-<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = sub i64 %"x##0", %"y##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"type_int.myint.-<1>"(i64 %"y##0", i64 %"z##0") {
+define external fastcc i64 @"type_int#.myint#.-<1>"(i64 %"y##0", i64 %"z##0") {
   %"tmp#1##0" = add i64 %"y##0", %"z##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"type_int.myint.-<2>"(i64 %"x##0", i64 %"z##0") {
+define external fastcc i64 @"type_int#.myint#.-<2>"(i64 %"x##0", i64 %"z##0") {
   %"tmp#1##0" = sub i64 %"z##0", %"x##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"type_int.myint./<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"type_int#.myint#./<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = sdiv i64 %"x##0", %"y##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i1 @"type_int.myint.<<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"type_int#.myint#.<<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = icmp slt i64 %"x##0", %"y##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"type_int.myint.<=<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"type_int#.myint#.<=<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = icmp sle i64 %"x##0", %"y##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"type_int.myint.=<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"type_int#.myint#.=<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = icmp eq i64 %"x##0", %"y##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"type_int.myint.><0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"type_int#.myint#.><0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = icmp sgt i64 %"x##0", %"y##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"type_int.myint.>=<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"type_int#.myint#.>=<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = icmp sge i64 %"x##0", %"y##0"
   ret i1 %"tmp#1##0"
 }
 
-define external fastcc i1 @"type_int.myint.~=<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i1 @"type_int#.myint#.~=<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#1##0" = icmp ne i64 %"x##0", %"y##0"
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/type_list.exp b/test-cases/final-dump/type_list.exp
index 5a18c06e..e20602c6 100644
--- a/test-cases/final-dump/type_list.exp
+++ b/test-cases/final-dump/type_list.exp
@@ -107,14 +107,14 @@ length(x##0:type_list.intlist, ?#result##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'type_list'
 
 source_filename = "!ROOT!/final-dump/type_list.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"type_list.<0>"() {
+define external fastcc void @"type_list#.<0>"() {
   %"tmp#37##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#11##0" = ptrtoint ptr %"tmp#37##0" to i64
   %"tmp#38##0" = inttoptr i64 %"tmp#11##0" to ptr
@@ -151,14 +151,14 @@ define external fastcc void @"type_list.<0>"() {
   %"tmp#56##0" = inttoptr i64 %"tmp#55##0" to ptr
   store i64 %"tmp#26##0", ptr %"tmp#56##0"
   %"tmp#57##0" = alloca i8, i64 8, align 8
-  call fastcc void @"type_list.,,<0>[410bae77d3]"(i64 %"tmp#21##0", i64 %"tmp#31##0", ptr %"tmp#57##0")
+  call fastcc void @"type_list#.,,<0>[410bae77d3]"(i64 %"tmp#21##0", i64 %"tmp#31##0", ptr %"tmp#57##0")
   %"tmp#8##0" = load i64, ptr %"tmp#57##0"
-  %"tmp#7##0" = call fastcc i64 @"type_list.length<0>"(i64 %"tmp#8##0")
+  %"tmp#7##0" = call fastcc i64 @"type_list#.length<0>"(i64 %"tmp#8##0")
   call ccc void @print_int(i64 %"tmp#7##0")
   ret void
 }
 
-define external fastcc void @"type_list.,,<0>"(i64 %"x##0", i64 %"y##0", ptr %"tmp#11##0") {
+define external fastcc void @"type_list#.,,<0>"(i64 %"x##0", i64 %"y##0", ptr %"tmp#11##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -174,14 +174,14 @@ if.then.0:
   store i64 %"tmp#8##0", ptr %"tmp#11##0"
   %"tmp#17##0" = add i64 %"tmp#8##0", 8
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
-  musttail call fastcc void @"type_list.,,<0>"(i64 %"t##0", i64 %"y##0", ptr %"tmp#18##0")
+  musttail call fastcc void @"type_list#.,,<0>"(i64 %"t##0", i64 %"y##0", ptr %"tmp#18##0")
   ret void
 if.else.0:
   store i64 %"y##0", ptr %"tmp#11##0"
   ret void
 }
 
-define external fastcc void @"type_list.,,<0>[410bae77d3]"(i64 %"x##0", i64 %"y##0", ptr %"tmp#11##0") {
+define external fastcc void @"type_list#.,,<0>[410bae77d3]"(i64 %"x##0", i64 %"y##0", ptr %"tmp#11##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -191,21 +191,21 @@ if.then.0:
   store i64 %"x##0", ptr %"tmp#11##0"
   %"tmp#14##0" = add i64 %"x##0", 8
   %"tmp#15##0" = inttoptr i64 %"tmp#14##0" to ptr
-  musttail call fastcc void @"type_list.,,<0>[410bae77d3]"(i64 %"t##0", i64 %"y##0", ptr %"tmp#15##0")
+  musttail call fastcc void @"type_list#.,,<0>[410bae77d3]"(i64 %"t##0", i64 %"y##0", ptr %"tmp#15##0")
   ret void
 if.else.0:
   store i64 %"y##0", ptr %"tmp#11##0"
   ret void
 }
 
-define external fastcc i64 @"type_list.length<0>"(i64 %"x##0") {
+define external fastcc i64 @"type_list#.length<0>"(i64 %"x##0") {
   %"tmp#5##0" = icmp ne i64 %"x##0", 0
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#8##0" = add i64 %"x##0", 8
   %"tmp#9##0" = inttoptr i64 %"tmp#8##0" to ptr
   %"t##0" = load i64, ptr %"tmp#9##0"
-  %"tmp#2##0" = tail call fastcc i64 @"type_list.length<0>"(i64 %"t##0")
+  %"tmp#2##0" = tail call fastcc i64 @"type_list#.length<0>"(i64 %"t##0")
   %"tmp#10##0" = add i64 %"tmp#2##0", 1
   ret i64 %"tmp#10##0"
 if.else.0:
@@ -377,13 +377,13 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'type_list.intlist'
 
 source_filename = "!ROOT!/final-dump/type_list.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"type_list.intlist.=<0>"(i64 %"#left##0", i64 %"#right##0") {
+define external fastcc i1 @"type_list#.intlist#.=<0>"(i64 %"#left##0", i64 %"#right##0") {
   %"tmp#0##0" = icmp ne i64 %"#left##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -403,7 +403,7 @@ if.then.1:
   %"tmp#4##0" = icmp eq i64 %"#left#head##0", %"#right#head##0"
   br i1 %"tmp#4##0", label %if.then.2, label %if.else.2
 if.then.2:
-  %"tmp#18##0" = tail call fastcc i1 @"type_list.intlist.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
+  %"tmp#18##0" = tail call fastcc i1 @"type_list#.intlist#.=<0>"(i64 %"#left#tail##0", i64 %"#right#tail##0")
   ret i1 %"tmp#18##0"
 if.else.2:
   ret i1 0
@@ -414,7 +414,7 @@ if.else.0:
   ret i1 %"tmp#19##0"
 }
 
-define external fastcc i64 @"type_list.intlist.cons<0>"(i64 %"head##0", i64 %"tail##0") {
+define external fastcc i64 @"type_list#.intlist#.cons<0>"(i64 %"head##0", i64 %"tail##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -425,7 +425,7 @@ define external fastcc i64 @"type_list.intlist.cons<0>"(i64 %"head##0", i64 %"ta
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64, i1} @"type_list.intlist.cons<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64, i1} @"type_list#.intlist#.cons<1>"(i64 %"#result##0") {
   %"tmp#0##0" = icmp ne i64 %"#result##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -445,7 +445,7 @@ if.else.0:
   ret {i64, i64, i1} %"tmp#11##0"
 }
 
-define external fastcc {i64, i1} @"type_list.intlist.head<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"type_list#.intlist#.head<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -460,7 +460,7 @@ if.else.0:
   ret {i64, i1} %"tmp#6##0"
 }
 
-define external fastcc {i64, i1} @"type_list.intlist.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"type_list#.intlist#.head<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -479,11 +479,11 @@ if.else.0:
   ret {i64, i1} %"tmp#8##0"
 }
 
-define external fastcc i64 @"type_list.intlist.nil<0>"() {
+define external fastcc i64 @"type_list#.intlist#.nil<0>"() {
   ret i64 0
 }
 
-define external fastcc {i64, i1} @"type_list.intlist.tail<0>"(i64 %"#rec##0") {
+define external fastcc {i64, i1} @"type_list#.intlist#.tail<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -499,7 +499,7 @@ if.else.0:
   ret {i64, i1} %"tmp#7##0"
 }
 
-define external fastcc {i64, i1} @"type_list.intlist.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc {i64, i1} @"type_list#.intlist#.tail<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = icmp ne i64 %"#rec##0", 0
   br i1 %"tmp#0##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -519,8 +519,8 @@ if.else.0:
   ret {i64, i1} %"tmp#9##0"
 }
 
-define external fastcc i1 @"type_list.intlist.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
-  %"tmp#0##0" = tail call fastcc i1 @"type_list.intlist.=<0>"(i64 %"#left##0", i64 %"#right##0")
+define external fastcc i1 @"type_list#.intlist#.~=<0>"(i64 %"#left##0", i64 %"#right##0") {
+  %"tmp#0##0" = tail call fastcc i1 @"type_list#.intlist#.=<0>"(i64 %"#left##0", i64 %"#right##0")
   %"tmp#1##0" = xor i1 %"tmp#0##0", 1
   ret i1 %"tmp#1##0"
 }
diff --git a/test-cases/final-dump/unbranch_bug.exp b/test-cases/final-dump/unbranch_bug.exp
index 14e6ea31..26133539 100644
--- a/test-cases/final-dump/unbranch_bug.exp
+++ b/test-cases/final-dump/unbranch_bug.exp
@@ -54,32 +54,32 @@ proc #cont#3 > {semipure} (2 calls)
 ; ModuleID = 'unbranch_bug'
 
 source_filename = "!ROOT!/final-dump/unbranch_bug.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"unbranch_bug.<0>"() {
-  tail call fastcc void @"unbranch_bug.#cont#3<0>"(i64 0)
+define external fastcc void @"unbranch_bug#.<0>"() {
+  tail call fastcc void @"unbranch_bug#.#cont#3<0>"(i64 0)
   ret void
 }
 
-define external fastcc void @"unbranch_bug.#cont#1<0>"() {
+define external fastcc void @"unbranch_bug#.#cont#1<0>"() {
   ret void
 }
 
-define external fastcc void @"unbranch_bug.#cont#2<0>"() {
+define external fastcc void @"unbranch_bug#.#cont#2<0>"() {
   ret void
 }
 
-define external fastcc void @"unbranch_bug.#cont#3<0>"(i64 %"tmp#0##0") {
+define external fastcc void @"unbranch_bug#.#cont#3<0>"(i64 %"tmp#0##0") {
   %"tmp#7##0" = icmp ne i64 %"tmp#0##0", 0
   br i1 %"tmp#7##0", label %if.then.0, label %if.else.0
 if.then.0:
   %"tmp#9##0" = add i64 %"tmp#0##0", 8
   %"tmp#10##0" = inttoptr i64 %"tmp#9##0" to ptr
   %"tmp#0##1" = load i64, ptr %"tmp#10##0"
-  tail call fastcc void @"unbranch_bug.#cont#3<0>"(i64 %"tmp#0##1")
+  tail call fastcc void @"unbranch_bug#.#cont#3<0>"(i64 %"tmp#0##1")
   ret void
 if.else.0:
   ret void
diff --git a/test-cases/final-dump/unbranch_inout.exp b/test-cases/final-dump/unbranch_inout.exp
index 4b28cbac..f12d70fb 100644
--- a/test-cases/final-dump/unbranch_inout.exp
+++ b/test-cases/final-dump/unbranch_inout.exp
@@ -42,21 +42,21 @@ bug#cont#1(i##0:wybe.int, [?i##0:wybe.int])<{}; {}; {}>:
 ; ModuleID = 'unbranch_inout'
 
 source_filename = "!ROOT!/final-dump/unbranch_inout.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @print_int(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"unbranch_inout.<0>"() {
+define external fastcc void @"unbranch_inout#.<0>"() {
   call ccc void @print_int(i64 1)
   ret void
 }
 
-define external fastcc i64 @"unbranch_inout.bug<0>"(i64 %"i##0") {
+define external fastcc i64 @"unbranch_inout#.bug<0>"(i64 %"i##0") {
   ret i64 %"i##0"
 }
 
-define external fastcc void @"unbranch_inout.bug#cont#1<0>"(i64 %"i##0") {
+define external fastcc void @"unbranch_inout#.bug#cont#1<0>"(i64 %"i##0") {
   ret void
 }
diff --git a/test-cases/final-dump/unbranch_issue.exp b/test-cases/final-dump/unbranch_issue.exp
index cbc11418..363bde33 100644
--- a/test-cases/final-dump/unbranch_issue.exp
+++ b/test-cases/final-dump/unbranch_issue.exp
@@ -42,19 +42,19 @@ test#cont#1(b##0:wybe.bool, tmp#2##0:wybe.int, tmp#3##0:wybe.int, ?#success##0:w
 ; ModuleID = 'unbranch_issue'
 
 source_filename = "!ROOT!/final-dump/unbranch_issue.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#unbranch_issue.n" = global i64 undef
 
-define external fastcc i1 @"unbranch_issue.test<0>"() {
+define external fastcc i1 @"unbranch_issue#.test<0>"() {
   %"tmp#2##0" = load i64, ptr @"resource#unbranch_issue.n"
-  %"tmp#5##0" = tail call fastcc i1 @"unbranch_issue.test#cont#1<0>"(i1 0, i64 %"tmp#2##0", i64 %"tmp#2##0")
+  %"tmp#5##0" = tail call fastcc i1 @"unbranch_issue#.test#cont#1<0>"(i1 0, i64 %"tmp#2##0", i64 %"tmp#2##0")
   ret i1 %"tmp#5##0"
 }
 
-define external fastcc i1 @"unbranch_issue.test#cont#1<0>"(i1 %"b##0", i64 %"tmp#2##0", i64 %"tmp#3##0") {
+define external fastcc i1 @"unbranch_issue#.test#cont#1<0>"(i1 %"b##0", i64 %"tmp#2##0", i64 %"tmp#3##0") {
   br i1 %"b##0", label %if.then.0, label %if.else.0
 if.then.0:
   store i64 %"tmp#3##0", ptr @"resource#unbranch_issue.n"
diff --git a/test-cases/final-dump/undef_bug.exp b/test-cases/final-dump/undef_bug.exp
index b8ddf9b4..7d4a5af1 100644
--- a/test-cases/final-dump/undef_bug.exp
+++ b/test-cases/final-dump/undef_bug.exp
@@ -77,32 +77,32 @@ is_true#cont#1(check##0:wybe.bool, res##0:wybe.bool, tmp#1##0:wybe.range, ?res##
 ; ModuleID = 'undef_bug'
 
 source_filename = "!ROOT!/final-dump/undef_bug.wybe"
-target triple    ????
+target triple   = ????
 
 
-declare external fastcc void @"wybe.bool.print<0>"(i1)
-declare external fastcc i64 @"wybe.range...<0>"(i64, i64)
-declare external fastcc {i64, i64, i1} @"wybe.range.[|]<0>"(i64)
-declare external fastcc {i64, i64, i1} @"wybe.range.[|]<0>[785a827a1b]"(i64)
+declare external fastcc void @"wybe#.bool#.print<0>"(i1)
+declare external fastcc i64 @"wybe#.range#...<0>"(i64, i64)
+declare external fastcc {i64, i64, i1} @"wybe#.range#.[|]<0>"(i64)
+declare external fastcc {i64, i64, i1} @"wybe#.range#.[|]<0>[785a827a1b]"(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"undef_bug.<0>"() {
-  %"tmp#3##0" = tail call fastcc i64 @"wybe.range...<0>"(i64 0, i64 1)
-  %"tmp#0##0" = tail call fastcc i1 @"undef_bug.is_true#cont#1<0>[785a827a1b]"(i1 0, i1 0, i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.bool.print<0>"(i1 %"tmp#0##0")
+define external fastcc void @"undef_bug#.<0>"() {
+  %"tmp#3##0" = tail call fastcc i64 @"wybe#.range#...<0>"(i64 0, i64 1)
+  %"tmp#0##0" = tail call fastcc i1 @"undef_bug#.is_true#cont#1<0>[785a827a1b]"(i1 0, i1 0, i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.bool#.print<0>"(i1 %"tmp#0##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc i1 @"undef_bug.is_true<0>"(i1 %"check##0") {
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.range...<0>"(i64 0, i64 1)
-  %"tmp#6##0" = tail call fastcc i1 @"undef_bug.is_true#cont#1<0>"(i1 %"check##0", i1 0, i64 %"tmp#2##0")
+define external fastcc i1 @"undef_bug#.is_true<0>"(i1 %"check##0") {
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.range#...<0>"(i64 0, i64 1)
+  %"tmp#6##0" = tail call fastcc i1 @"undef_bug#.is_true#cont#1<0>"(i1 %"check##0", i1 0, i64 %"tmp#2##0")
   ret i1 %"tmp#6##0"
 }
 
-define external fastcc i1 @"undef_bug.is_true#cont#1<0>"(i1 %"check##0", i1 %"res##0", i64 %"tmp#1##0") {
-  %"tmp#6##0" = tail call fastcc {i64, i64, i1} @"wybe.range.[|]<0>"(i64 %"tmp#1##0")
+define external fastcc i1 @"undef_bug#.is_true#cont#1<0>"(i1 %"check##0", i1 %"res##0", i64 %"tmp#1##0") {
+  %"tmp#6##0" = tail call fastcc {i64, i64, i1} @"wybe#.range#.[|]<0>"(i64 %"tmp#1##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#6##0", 0
   %"tmp#1##1" = extractvalue {i64, i64, i1}%"tmp#6##0", 1
   %"tmp#5##0" = extractvalue {i64, i64, i1}%"tmp#6##0", 2
@@ -112,14 +112,14 @@ if.then.0:
 if.then.1:
   ret i1 1
 if.else.1:
-  %"tmp#7##0" = tail call fastcc i1 @"undef_bug.is_true#cont#1<0>[785a827a1b]"(i1 0, i1 %"res##0", i64 %"tmp#1##1")
+  %"tmp#7##0" = tail call fastcc i1 @"undef_bug#.is_true#cont#1<0>[785a827a1b]"(i1 0, i1 %"res##0", i64 %"tmp#1##1")
   ret i1 %"tmp#7##0"
 if.else.0:
   ret i1 %"res##0"
 }
 
-define external fastcc i1 @"undef_bug.is_true#cont#1<0>[785a827a1b]"(i1 %"check##0", i1 %"res##0", i64 %"tmp#1##0") {
-  %"tmp#6##0" = tail call fastcc {i64, i64, i1} @"wybe.range.[|]<0>[785a827a1b]"(i64 %"tmp#1##0")
+define external fastcc i1 @"undef_bug#.is_true#cont#1<0>[785a827a1b]"(i1 %"check##0", i1 %"res##0", i64 %"tmp#1##0") {
+  %"tmp#6##0" = tail call fastcc {i64, i64, i1} @"wybe#.range#.[|]<0>[785a827a1b]"(i64 %"tmp#1##0")
   %"i##0" = extractvalue {i64, i64, i1}%"tmp#6##0", 0
   %"tmp#1##1" = extractvalue {i64, i64, i1}%"tmp#6##0", 1
   %"tmp#5##0" = extractvalue {i64, i64, i1}%"tmp#6##0", 2
@@ -129,7 +129,7 @@ if.then.0:
 if.then.1:
   ret i1 1
 if.else.1:
-  %"tmp#7##0" = tail call fastcc i1 @"undef_bug.is_true#cont#1<0>[785a827a1b]"(i1 0, i1 %"res##0", i64 %"tmp#1##1")
+  %"tmp#7##0" = tail call fastcc i1 @"undef_bug#.is_true#cont#1<0>[785a827a1b]"(i1 0, i1 %"res##0", i64 %"tmp#1##1")
   ret i1 %"tmp#7##0"
 if.else.0:
   ret i1 %"res##0"
diff --git a/test-cases/final-dump/uneeded_closure_args.exp b/test-cases/final-dump/uneeded_closure_args.exp
index 2ed5e1a1..d4263b0e 100644
--- a/test-cases/final-dump/uneeded_closure_args.exp
+++ b/test-cases/final-dump/uneeded_closure_args.exp
@@ -52,29 +52,29 @@ second([a##0:A <{}; {}; {0}>], b##0:B <{}; {}; {1}>, ?#result##0:B <{}; {}; {1}>
 ; ModuleID = 'uneeded_closure_args'
 
 source_filename = "!ROOT!/final-dump/uneeded_closure_args.wybe"
-target triple    ????
+target triple   = ????
 
-@"closure#0" = private unnamed_addr constant {ptr} { ptr @"uneeded_closure_args.#closure#1<0>" }, align 8
+@"closure#0" = private unnamed_addr constant {ptr} { ptr @"uneeded_closure_args#.#closure#1<0>" }, align 8
 
 declare external ccc void @print_int(i64)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"uneeded_closure_args.<0>"() {
-  %"tmp#0##0" = tail call fastcc i64 @"uneeded_closure_args.call<0>"(ptr @"closure#0", i64 2)
+define external fastcc void @"uneeded_closure_args#.<0>"() {
+  %"tmp#0##0" = tail call fastcc i64 @"uneeded_closure_args#.call<0>"(ptr @"closure#0", i64 2)
   call ccc void @print_int(i64 %"tmp#0##0")
   ret void
 }
 
-define external fastcc i64 @"uneeded_closure_args.#closure#1<0>"(ptr %"#env##0", i64 %"generic#b##0") {
+define external fastcc i64 @"uneeded_closure_args#.#closure#1<0>"(ptr %"#env##0", i64 %"generic#b##0") {
   ret i64 %"generic#b##0"
 }
 
-define external fastcc i64 @"uneeded_closure_args.call<0>"(ptr %"f##0", i64 %"a##0") {
+define external fastcc i64 @"uneeded_closure_args#.call<0>"(ptr %"f##0", i64 %"a##0") {
   %"tmp#1##0" = load ptr, ptr %"f##0"
   %"tmp#2##0" = tail call fastcc i64 %"tmp#1##0"(ptr %"f##0", i64 %"a##0")
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"uneeded_closure_args.second<0>"(i64 %"b##0") {
+define external fastcc i64 @"uneeded_closure_args#.second<0>"(i64 %"b##0") {
   ret i64 %"b##0"
 }
diff --git a/test-cases/final-dump/unique_conditional.exp b/test-cases/final-dump/unique_conditional.exp
index c63be1f4..a8f3db11 100644
--- a/test-cases/final-dump/unique_conditional.exp
+++ b/test-cases/final-dump/unique_conditional.exp
@@ -40,19 +40,19 @@ foo(b##0:wybe.bool, [a##0:unique_conditional])<{}; {}; {}>:
 ; ModuleID = 'unique_conditional'
 
 source_filename = "!ROOT!/final-dump/unique_conditional.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"unique_conditional.bar<0>"() {
+define external fastcc void @"unique_conditional#.bar<0>"() {
   ret void
 }
 
-define external fastcc void @"unique_conditional.baz<0>"() {
+define external fastcc void @"unique_conditional#.baz<0>"() {
   ret void
 }
 
-define external fastcc void @"unique_conditional.foo<0>"(i1 %"b##0") {
+define external fastcc void @"unique_conditional#.foo<0>"(i1 %"b##0") {
   ret void
 }
diff --git a/test-cases/final-dump/unique_position.exp b/test-cases/final-dump/unique_position.exp
index ffd5803e..f2dfe903 100644
--- a/test-cases/final-dump/unique_position.exp
+++ b/test-cases/final-dump/unique_position.exp
@@ -60,19 +60,19 @@ printPosition(pos##0:unique_position.unique_position)<{<<wybe.io.io>>}; {<<wybe.
 ; ModuleID = 'unique_position'
 
 source_filename = "!ROOT!/final-dump/unique_position.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" (\00", align 8
 @"string#1" = private unnamed_addr constant {i64, i64} { i64 2, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"unique_position.<0>"() {
+define external fastcc void @"unique_position#.<0>"() {
   %"tmp#8##0" = call ccc ptr @wybe_malloc(i32 16)
   %"tmp#3##0" = ptrtoint ptr %"tmp#8##0" to i64
   %"tmp#9##0" = inttoptr i64 %"tmp#3##0" to ptr
@@ -82,21 +82,21 @@ define external fastcc void @"unique_position.<0>"() {
   store i64 4, ptr %"tmp#11##0"
   %"tmp#12##0" = inttoptr i64 %"tmp#3##0" to ptr
   store i64 5, ptr %"tmp#12##0"
-  tail call fastcc void @"unique_position.printPosition<0>"(i64 %"tmp#3##0")
+  tail call fastcc void @"unique_position#.printPosition<0>"(i64 %"tmp#3##0")
   ret void
 }
 
-define external fastcc void @"unique_position.printPosition<0>"(i64 %"pos##0") {
+define external fastcc void @"unique_position#.printPosition<0>"(i64 %"pos##0") {
   %"tmp#20##0" = inttoptr i64 %"pos##0" to ptr
   %"x##0" = load i64, ptr %"tmp#20##0"
   %"tmp#21##0" = add i64 %"pos##0", 8
   %"tmp#22##0" = inttoptr i64 %"tmp#21##0" to ptr
   %"y##0" = load i64, ptr %"tmp#22##0"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#1" to i64 ))
   call ccc void @print_int(i64 %"x##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1203)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1203)
   call ccc void @print_int(i64 %"y##0")
-  tail call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 1191)
+  tail call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 1191)
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -168,13 +168,13 @@ y(#rec##0:unique_position.unique_position, ?#rec##1:unique_position.unique_posit
 ; ModuleID = 'unique_position.unique_position'
 
 source_filename = "!ROOT!/final-dump/unique_position.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"unique_position.unique_position.unique_position<0>"(i64 %"x##0", i64 %"y##0") {
+define external fastcc i64 @"unique_position#.unique_position#.unique_position<0>"(i64 %"x##0", i64 %"y##0") {
   %"tmp#0##0" = call ccc ptr @wybe_malloc(i32 16)
   %"#rec##0" = ptrtoint ptr %"tmp#0##0" to i64
   %"tmp#1##0" = inttoptr i64 %"#rec##0" to ptr
@@ -185,7 +185,7 @@ define external fastcc i64 @"unique_position.unique_position.unique_position<0>"
   ret i64 %"#rec##0"
 }
 
-define external fastcc {i64, i64} @"unique_position.unique_position.unique_position<1>"(i64 %"#result##0") {
+define external fastcc {i64, i64} @"unique_position#.unique_position#.unique_position<1>"(i64 %"#result##0") {
   %"tmp#0##0" = inttoptr i64 %"#result##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   %"tmp#2##0" = add i64 %"#result##0", 8
@@ -196,13 +196,13 @@ define external fastcc {i64, i64} @"unique_position.unique_position.unique_posit
   ret {i64, i64} %"tmp#6##0"
 }
 
-define external fastcc i64 @"unique_position.unique_position.x<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"unique_position#.unique_position#.x<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = load i64, ptr %"tmp#0##0"
   ret i64 %"tmp#1##0"
 }
 
-define external fastcc i64 @"unique_position.unique_position.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"unique_position#.unique_position#.x<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
@@ -212,14 +212,14 @@ define external fastcc i64 @"unique_position.unique_position.x<1>"(i64 %"#rec##0
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"unique_position.unique_position.y<0>"(i64 %"#rec##0") {
+define external fastcc i64 @"unique_position#.unique_position#.y<0>"(i64 %"#rec##0") {
   %"tmp#0##0" = add i64 %"#rec##0", 8
   %"tmp#1##0" = inttoptr i64 %"tmp#0##0" to ptr
   %"tmp#2##0" = load i64, ptr %"tmp#1##0"
   ret i64 %"tmp#2##0"
 }
 
-define external fastcc i64 @"unique_position.unique_position.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
+define external fastcc i64 @"unique_position#.unique_position#.y<1>"(i64 %"#rec##0", i64 %"#field##0") {
   %"tmp#0##0" = inttoptr i64 %"#rec##0" to ptr
   %"tmp#1##0" = call ccc ptr @wybe_malloc(i32 16)
   call ccc void @llvm.memcpy.p0.p0.i64(ptr %"tmp#1##0", ptr %"tmp#0##0", i64 16, i1 0)
diff --git a/test-cases/final-dump/unneeded.exp b/test-cases/final-dump/unneeded.exp
index 0378c348..57da3cf1 100644
--- a/test-cases/final-dump/unneeded.exp
+++ b/test-cases/final-dump/unneeded.exp
@@ -25,12 +25,12 @@ unneeded(x##0:wybe.int, [y##0:wybe.int], ?z##0:wybe.int, q##0:wybe.int, [?q##0:w
 ; ModuleID = 'unneeded'
 
 source_filename = "!ROOT!/final-dump/unneeded.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"unneeded.unneeded<0>"(i64 %"x##0", i64 %"q##0") {
+define external fastcc i64 @"unneeded#.unneeded<0>"(i64 %"x##0", i64 %"q##0") {
   %"tmp#3##0" = add i64 %"x##0", 1
   ret i64 %"tmp#3##0"
 }
diff --git a/test-cases/final-dump/update.exp b/test-cases/final-dump/update.exp
index a70fd5cd..4176165b 100644
--- a/test-cases/final-dump/update.exp
+++ b/test-cases/final-dump/update.exp
@@ -34,18 +34,18 @@ inc2(?x##0:wybe.int, y##0:wybe.int)<{}; {}; {}>:
 ; ModuleID = 'update'
 
 source_filename = "!ROOT!/final-dump/update.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i64 @"update.inc2<0>"(i64 %"x##0") {
+define external fastcc i64 @"update#.inc2<0>"(i64 %"x##0") {
   %"tmp#1##0" = add i64 %"x##0", 1
   %"tmp#6##0" = add i64 %"tmp#1##0", 1
   ret i64 %"tmp#6##0"
 }
 
-define external fastcc i64 @"update.inc2<1>"(i64 %"y##0") {
+define external fastcc i64 @"update#.inc2<1>"(i64 %"y##0") {
   %"tmp#0##0" = sub i64 %"y##0", 1
   %"tmp#5##0" = sub i64 %"tmp#0##0", 1
   ret i64 %"tmp#5##0"
diff --git a/test-cases/final-dump/upto.exp b/test-cases/final-dump/upto.exp
index 6203e4c8..00da5be6 100644
--- a/test-cases/final-dump/upto.exp
+++ b/test-cases/final-dump/upto.exp
@@ -55,7 +55,7 @@ proc #cont#1 > {inline,semipure} (1 calls)
 ; ModuleID = 'upto'
 
 source_filename = "!ROOT!/final-dump/upto.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"lst[3] = \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"shouldn't happen!\00", align 8
@@ -63,40 +63,40 @@ target triple    ????
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 9, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#4" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc i64 @"wybe.int.fmt<2>"(i64, i64, i8)
-declare external fastcc {i64, i1} @"wybe.list.[]<0>"(i64, i64)
-declare external fastcc i64 @"wybe.string.,,<0>"(i64, i64)
-declare external fastcc i64 @"wybe.string.c_string<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>"(i64)
-declare external fastcc void @"wybe.string.print<0>[410bae77d3]"(i64)
+declare external fastcc i64 @"wybe#.int#.fmt<2>"(i64, i64, i8)
+declare external fastcc {i64, i1} @"wybe#.list#.[]<0>"(i64, i64)
+declare external fastcc i64 @"wybe#.string#.,,<0>"(i64, i64)
+declare external fastcc i64 @"wybe#.string#.c_string<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64)
 declare external ccc void @error_exit(i64, i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"upto.<0>"() {
+define external fastcc void @"upto#.<0>"() {
   %"tmp#12##0" = alloca i8, i64 8, align 8
-  call fastcc void @"upto.submod.upto<0>"(i64 0, i64 10, ptr %"tmp#12##0")
+  call fastcc void @"upto#.submod#.upto<0>"(i64 0, i64 10, ptr %"tmp#12##0")
   %"tmp#0##0" = load i64, ptr %"tmp#12##0"
-  %"tmp#13##0" = call fastcc {i64, i1} @"wybe.list.[]<0>"(i64 %"tmp#0##0", i64 3)
+  %"tmp#13##0" = call fastcc {i64, i1} @"wybe#.list#.[]<0>"(i64 %"tmp#0##0", i64 3)
   %"tmp#1##0" = extractvalue {i64, i1}%"tmp#13##0", 0
   %"tmp#4##0" = extractvalue {i64, i1}%"tmp#13##0", 1
   br i1 %"tmp#4##0", label %if.then.0, label %if.else.0
 if.then.0:
-  %"tmp#8##0" = call fastcc i64 @"wybe.int.fmt<2>"(i64 %"tmp#1##0", i64 0, i8 32)
-  %"tmp#9##0" = call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#8##0")
-  call fastcc void @"wybe.string.print<0>[410bae77d3]"(i64 %"tmp#9##0")
+  %"tmp#8##0" = call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"tmp#1##0", i64 0, i8 32)
+  %"tmp#9##0" = call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#8##0")
+  call fastcc void @"wybe#.string#.print<0>[410bae77d3]"(i64 %"tmp#9##0")
   call ccc void @putchar(i8 10)
   ret void
 if.else.0:
-  %"tmp#6##0" = call fastcc i64 @"wybe.string.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
+  %"tmp#6##0" = call fastcc i64 @"wybe#.string#.c_string<0>"(i64 ptrtoint( ptr @"string#4" to i64 ))
   call ccc void @error_exit(i64 ptrtoint( ptr @"cstring#2" to i64 ), i64 %"tmp#6##0")
   ret void
 }
 
-define external fastcc void @"upto.#cont#1<0>"(i64 %"result##0") {
-  %"tmp#3##0" = tail call fastcc i64 @"wybe.int.fmt<2>"(i64 %"result##0", i64 0, i8 32)
-  %"tmp#2##0" = tail call fastcc i64 @"wybe.string.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#3##0")
-  tail call fastcc void @"wybe.string.print<0>"(i64 %"tmp#2##0")
+define external fastcc void @"upto#.#cont#1<0>"(i64 %"result##0") {
+  %"tmp#3##0" = tail call fastcc i64 @"wybe#.int#.fmt<2>"(i64 %"result##0", i64 0, i8 32)
+  %"tmp#2##0" = tail call fastcc i64 @"wybe#.string#.,,<0>"(i64 ptrtoint( ptr @"string#3" to i64 ), i64 %"tmp#3##0")
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 %"tmp#2##0")
   call ccc void @putchar(i8 10)
   ret void
 }
@@ -136,13 +136,13 @@ upto(lo##0:wybe.int, hi##0:wybe.int, outByReference #result##0:wybe.list(wybe.in
 ; ModuleID = 'upto.submod'
 
 source_filename = "!ROOT!/final-dump/upto.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc ptr @wybe_malloc(i32)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"upto.submod.upto<0>"(i64 %"lo##0", i64 %"hi##0", ptr %"tmp#14##0") {
+define external fastcc void @"upto#.submod#.upto<0>"(i64 %"lo##0", i64 %"hi##0", ptr %"tmp#14##0") {
   %"tmp#5##0" = icmp sle i64 %"hi##0", %"lo##0"
   br i1 %"tmp#5##0", label %if.then.0, label %if.else.0
 if.then.0:
@@ -157,6 +157,6 @@ if.else.0:
   store i64 %"tmp#12##0", ptr %"tmp#14##0"
   %"tmp#17##0" = add i64 %"tmp#12##0", 8
   %"tmp#18##0" = inttoptr i64 %"tmp#17##0" to ptr
-  musttail call fastcc void @"upto.submod.upto<0>"(i64 %"tmp#4##0", i64 %"hi##0", ptr %"tmp#18##0")
+  musttail call fastcc void @"upto#.submod#.upto<0>"(i64 %"tmp#4##0", i64 %"hi##0", ptr %"tmp#18##0")
   ret void
 }
diff --git a/test-cases/final-dump/use_resource.exp b/test-cases/final-dump/use_resource.exp
index a4fe8543..0e9542c6 100644
--- a/test-cases/final-dump/use_resource.exp
+++ b/test-cases/final-dump/use_resource.exp
@@ -73,53 +73,53 @@ use_test()<{<<use_resource.count>>, <<wybe.io.io>>}; {<<use_resource.count>>, <<
 ; ModuleID = 'use_resource'
 
 source_filename = "!ROOT!/final-dump/use_resource.wybe"
-target triple    ????
+target triple   = ????
 
 @"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Inner count (4): \00", align 8
 @"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"Outer count (1): \00", align 8
 @"string#2" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#3" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 
-declare external fastcc void @"wybe.string.print<0>"(i64)
+declare external fastcc void @"wybe#.string#.print<0>"(i64)
 declare external ccc void @print_int(i64)
 declare external ccc void @putchar(i8)
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 @"resource#use_resource.count" = global i64 undef
 
-define external fastcc void @"use_resource.<0>"() {
+define external fastcc void @"use_resource#.<0>"() {
   %"tmp#0##0" = load i64, ptr @"resource#use_resource.count"
   %"tmp#1##0" = add i64 %"tmp#0##0", 1
   %"tmp#2##0" = add i64 %"tmp#1##0", 1
   %"tmp#3##0" = add i64 %"tmp#2##0", 1
   %"tmp#4##0" = add i64 %"tmp#3##0", 1
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @print_int(i64 %"tmp#4##0")
   call ccc void @putchar(i8 10)
   store i64 %"tmp#1##0", ptr @"resource#use_resource.count"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @print_int(i64 %"tmp#1##0")
   call ccc void @putchar(i8 10)
   ret void
 }
 
-define external fastcc void @"use_resource.inc_count<0>"() {
+define external fastcc void @"use_resource#.inc_count<0>"() {
   %"count##0" = load i64, ptr @"resource#use_resource.count"
   %"tmp#0##0" = add i64 %"count##0", 1
   store i64 %"tmp#0##0", ptr @"resource#use_resource.count"
   ret void
 }
 
-define external fastcc void @"use_resource.use_test<0>"() {
+define external fastcc void @"use_resource#.use_test<0>"() {
   %"tmp#2##0" = load i64, ptr @"resource#use_resource.count"
   %"tmp#3##0" = add i64 %"tmp#2##0", 1
   %"tmp#5##0" = add i64 %"tmp#3##0", 1
   %"tmp#7##0" = add i64 %"tmp#5##0", 1
   %"tmp#9##0" = add i64 %"tmp#7##0", 1
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#2" to i64 ))
   call ccc void @print_int(i64 %"tmp#9##0")
   call ccc void @putchar(i8 10)
   store i64 %"tmp#3##0", ptr @"resource#use_resource.count"
-  tail call fastcc void @"wybe.string.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
+  tail call fastcc void @"wybe#.string#.print<0>"(i64 ptrtoint( ptr @"string#3" to i64 ))
   call ccc void @print_int(i64 %"tmp#3##0")
   call ccc void @putchar(i8 10)
   ret void
diff --git a/test-cases/final-dump/weird_err_b.exp b/test-cases/final-dump/weird_err_b.exp
index 534b0871..3760bd3a 100644
--- a/test-cases/final-dump/weird_err_b.exp
+++ b/test-cases/final-dump/weird_err_b.exp
@@ -25,12 +25,12 @@ module top-level code > public {inline,semipure} (0 calls)
 ; ModuleID = 'weird_err_b'
 
 source_filename = "!ROOT!/final-dump/weird_err_b.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc void @"weird_err_b.<0>"() {
+define external fastcc void @"weird_err_b#.<0>"() {
   ret void
 }
 
@@ -79,20 +79,20 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'weird_err_d'
 
 source_filename = "!ROOT!/final-dump/weird_err_d.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"weird_err_d.=<0>"() {
+define external fastcc i1 @"weird_err_d#.=<0>"() {
   ret i1 1
 }
 
-define external fastcc void @"weird_err_d.empty<0>"() {
+define external fastcc void @"weird_err_d#.empty<0>"() {
   ret void
 }
 
-define external fastcc i1 @"weird_err_d.~=<0>"() {
+define external fastcc i1 @"weird_err_d#.~=<0>"() {
   ret i1 0
 }
 
@@ -114,7 +114,7 @@ define external fastcc i1 @"weird_err_d.~=<0>"() {
 ; ModuleID = 'weird_err_d.a'
 
 source_filename = "!ROOT!/final-dump/weird_err_d.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -137,7 +137,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'weird_err_d.c'
 
 source_filename = "!ROOT!/final-dump/weird_err_d.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
diff --git a/test-cases/final-dump/weird_err_d.exp b/test-cases/final-dump/weird_err_d.exp
index c0d3edca..8ec80e67 100644
--- a/test-cases/final-dump/weird_err_d.exp
+++ b/test-cases/final-dump/weird_err_d.exp
@@ -47,20 +47,20 @@ proc ~= > public {inline} (0 calls)
 ; ModuleID = 'weird_err_d'
 
 source_filename = "!ROOT!/final-dump/weird_err_d.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 
-define external fastcc i1 @"weird_err_d.=<0>"() {
+define external fastcc i1 @"weird_err_d#.=<0>"() {
   ret i1 1
 }
 
-define external fastcc void @"weird_err_d.empty<0>"() {
+define external fastcc void @"weird_err_d#.empty<0>"() {
   ret void
 }
 
-define external fastcc i1 @"weird_err_d.~=<0>"() {
+define external fastcc i1 @"weird_err_d#.~=<0>"() {
   ret i1 0
 }
 
@@ -82,7 +82,7 @@ define external fastcc i1 @"weird_err_d.~=<0>"() {
 ; ModuleID = 'weird_err_d.a'
 
 source_filename = "!ROOT!/final-dump/weird_err_d.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
@@ -105,7 +105,7 @@ declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)
 ; ModuleID = 'weird_err_d.c'
 
 source_filename = "!ROOT!/final-dump/weird_err_d.wybe"
-target triple    ????
+target triple   = ????
 
 
 declare external ccc void @llvm.memcpy.p0.p0.i64(ptr, ptr, i64, i1)