diff --git a/lib/lifter/block-ir-builder.cpp b/lib/lifter/block-ir-builder.cpp
index 3224145..6e160f0 100644
--- a/lib/lifter/block-ir-builder.cpp
+++ b/lib/lifter/block-ir-builder.cpp
@@ -132,12 +132,13 @@ void materialize_registers(MachineFunction &mf, Function &func, reg2vals &rmap,
 auto *generate_function_object(Module &m, MachineFunction &mf, reg2vals &rmap,
                                MachineModuleInfo &mmi, StructType &state) {
   auto *ret_type = Type::getIntNTy(m.getContext(), 64);
-  auto &reg_info = mf.getRegInfo();
   auto *func_type = FunctionType::get(
       ret_type, ArrayRef<Type *>{PointerType::getUnqual(m.getContext())},
       /* is var arg */ false);
+  auto name_str = mf.getName().str();
+  mf.getFunction().setName(mf.getName().str() + ".old");
   auto *func =
-      Function::Create(func_type, Function::ExternalLinkage, mf.getName(), m);
+      Function::Create(func_type, Function::ExternalLinkage, name_str, m);
   return func;
 }
 
diff --git a/test/tools/llvm-bleach/ir-addsub.test b/test/tools/llvm-bleach/ir-addsub.test
index 6bfdb19..89ffe28 100644
--- a/test/tools/llvm-bleach/ir-addsub.test
+++ b/test/tools/llvm-bleach/ir-addsub.test
@@ -3,7 +3,7 @@
 
 # CHECK: %register_state = type { [32 x i64] }
 
-# CHECK: define i64 @foo.1(ptr %0) {
+# CHECK: define i64 @foo(ptr %0) {
 # CHECK-NEXT:   %GPRS = getelementptr %register_state, ptr %0, i64 0, i64 0
 # CHECK-NEXT:   %2 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 0
 # CHECK-NEXT:   %X0 = load i64, ptr %2, align 8
diff --git a/test/tools/llvm-bleach/ir-logical-branches.test b/test/tools/llvm-bleach/ir-logical-branches.test
index 84da285..3b8bef7 100644
--- a/test/tools/llvm-bleach/ir-logical-branches.test
+++ b/test/tools/llvm-bleach/ir-logical-branches.test
@@ -1,7 +1,7 @@
 # RUN: %bin/llvm-bleach %S/inputs/logical-branches.mir \
 # RUN:   --instructions=%S/inputs/logical.yaml -noinline-instr | filecheck %s
 
-# CHECK: define i64 @foo.1(ptr %0) {
+# CHECK: define i64 @foo(ptr %0) {
 # CHECK-NEXT:   %GPRS = getelementptr %register_state, ptr %0, i64 0, i64 0
 # CHECK-NEXT:   %2 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 0
 # CHECK-NEXT:   %X0 = load i64, ptr %2, align 8
diff --git a/test/tools/llvm-bleach/ir-logical-cond-branches-no-blocks.test b/test/tools/llvm-bleach/ir-logical-cond-branches-no-blocks.test
index 261f429..4d35795 100644
--- a/test/tools/llvm-bleach/ir-logical-cond-branches-no-blocks.test
+++ b/test/tools/llvm-bleach/ir-logical-cond-branches-no-blocks.test
@@ -1,7 +1,7 @@
 # RUN: %bin/llvm-bleach %S/inputs/logical-cond-branches-no-blocks.mir \
 # RUN:   --instructions=%S/inputs/logical.yaml -noinline-instr | filecheck %s
 
-# CHECK: define i64 @foo.1(ptr %0) {
+# CHECK: define i64 @foo(ptr %0) {
 # CHECK-NEXT:   %GPRS = getelementptr %register_state, ptr %0, i64 0, i64 0
 # CHECK-NEXT:   %2 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 0
 # CHECK-NEXT:   %X0 = load i64, ptr %2, align 8
diff --git a/test/tools/llvm-bleach/ir-logical-cond-branches.test b/test/tools/llvm-bleach/ir-logical-cond-branches.test
index 678fe9f..2c1c178 100644
--- a/test/tools/llvm-bleach/ir-logical-cond-branches.test
+++ b/test/tools/llvm-bleach/ir-logical-cond-branches.test
@@ -1,7 +1,7 @@
 # RUN: %bin/llvm-bleach %S/inputs/logical-cond-branches.mir \
 # RUN:   --instructions=%S/inputs/logical.yaml -noinline-instr | filecheck %s
 
-# CHECK: define i64 @foo.1(ptr %0) {
+# CHECK: define i64 @foo(ptr %0) {
 # CHECK-NEXT:   %GPRS = getelementptr %register_state, ptr %0, i64 0, i64 0
 # CHECK-NEXT:   %2 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 0
 # CHECK-NEXT:   %X0 = load i64, ptr %2, align 8
diff --git a/test/tools/llvm-bleach/ir-logical.test b/test/tools/llvm-bleach/ir-logical.test
index 81e961d..c28ddd2 100644
--- a/test/tools/llvm-bleach/ir-logical.test
+++ b/test/tools/llvm-bleach/ir-logical.test
@@ -1,7 +1,7 @@
 # RUN: %bin/llvm-bleach %S/inputs/logical.mir \
 # RUN:   --instructions=%S/inputs/logical.yaml -noinline-instr | filecheck %s
 
-# CHECK: define i64 @foo.1(ptr %0) {
+# CHECK: define i64 @foo(ptr %0) {
 # CHECK-NEXT:   %GPRS = getelementptr %register_state, ptr %0, i64 0, i64 0
 # CHECK-NEXT:   %2 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 0
 # CHECK-NEXT:   %X0 = load i64, ptr %2, align 8
diff --git a/test/tools/llvm-bleach/many-branches-noinline.test b/test/tools/llvm-bleach/many-branches-noinline.test
index 242c943..fc73558 100644
--- a/test/tools/llvm-bleach/many-branches-noinline.test
+++ b/test/tools/llvm-bleach/many-branches-noinline.test
@@ -1,7 +1,7 @@
 # RUN: %bin/llvm-bleach %S/inputs/many-branches.mir \
 # RUN:   --instructions=%S/inputs/logical.yaml -noinline-instr | filecheck %s
 
-# CHECK: define i64 @SnippyFunction.1(ptr %0) {
+# CHECK: define i64 @SnippyFunction(ptr %0) {
 # CHECK-NEXT:   %GPRS = getelementptr %register_state, ptr %0, i64 0, i64 0
 # CHECK-NEXT:   %2 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 0
 # CHECK-NEXT:   %X0 = load i64, ptr %2, align 8
diff --git a/test/tools/llvm-bleach/many-branches.test b/test/tools/llvm-bleach/many-branches.test
index eff374f..948990d 100644
--- a/test/tools/llvm-bleach/many-branches.test
+++ b/test/tools/llvm-bleach/many-branches.test
@@ -1,7 +1,7 @@
 # RUN: %bin/llvm-bleach %S/inputs/many-branches.mir \
 # RUN:   --instructions=%S/inputs/logical.yaml | filecheck %s
 
-# CHECK: define i64 @SnippyFunction.1(ptr %0) {
+# CHECK: define i64 @SnippyFunction(ptr %0) {
 # CHECK-NEXT:   %GPRS = getelementptr %register_state, ptr %0, i64 0, i64 0
 # CHECK-NEXT:   %2 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 0
 # CHECK-NEXT:   %X0 = load i64, ptr %2, align 8
@@ -59,7 +59,7 @@
 # CHECK-NEXT:   %X26 = load i64, ptr %28, align 8
 # CHECK-NEXT:   %29 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 27
 # CHECK-NEXT:   %X27 = load i64, ptr %29, align 8
-# -NEXT:   %30 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 28
+# CHECK-NEXT:   %30 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 28
 # CHECK-NEXT:   %X28 = load i64, ptr %30, align 8
 # CHECK-NEXT:   %31 = getelementptr inbounds [32 x i64], ptr %GPRS, i64 0, i64 29
 # CHECK-NEXT:   %X29 = load i64, ptr %31, align 8