diff --git a/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace b/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace
index a8274a73..3c093fcc 100644
--- a/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace
+++ b/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace
@@ -1,3 +1,3 @@
 B0($1:ptr)
-	CALL	$2	_ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_08__invokeEPNS_11CustomClassE($1)	:i32
+	CALL	$2	_ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_18__invokeEPNS_11CustomClassE($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/pointer-tests/ir/castCustomClass.trace b/nautilus/test/data/pointer-tests/ir/castCustomClass.trace
index 6cf8c0ca..26e7a5be 100644
--- a/nautilus/test/data/pointer-tests/ir/castCustomClass.trace
+++ b/nautilus/test/data/pointer-tests/ir/castCustomClass.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:ptr):
-	$2 = _ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_08__invokeEPNS_11CustomClassE($1) :i32
+	$2 = _ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_18__invokeEPNS_11CustomClassE($1) :i32
 	return ($2) :i32
 }
 } //NESIR
\ No newline at end of file
diff --git a/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace b/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace
index a8274a73..3c093fcc 100644
--- a/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace
+++ b/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace
@@ -1,3 +1,3 @@
 B0($1:ptr)
-	CALL	$2	_ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_08__invokeEPNS_11CustomClassE($1)	:i32
+	CALL	$2	_ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_18__invokeEPNS_11CustomClassE($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace
index e880bf06..64d59281 100644
--- a/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace
@@ -1,3 +1,3 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($1)	:i32
+	CALL	$2	_ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_28__invokeEi($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace
index 0961767b..ae788cab 100644
--- a/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace
@@ -1,4 +1,4 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_18__invokeEi($1)	:i32
-	CALL	$3	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($2)	:i32
+	CALL	$2	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_48__invokeEi($1)	:i32
+	CALL	$3	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_38__invokeEi($2)	:i32
 	RETURN	$0	$3	:i32
diff --git a/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace
index c036aa6b..0f0859fc 100644
--- a/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:i32):
-	$2 = _ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($1) :i32
+	$2 = _ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_28__invokeEi($1) :i32
 	return ($2) :i32
 }
 } //NESIR
\ No newline at end of file
diff --git a/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace
index 436fba16..3badd1a4 100644
--- a/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace
@@ -1,8 +1,8 @@
 NautilusIr {
 execute() {
 Block_0($1:i32):
-	$2 = _ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_18__invokeEi($1) :i32
-	$3 = _ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($2) :i32
+	$2 = _ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_48__invokeEi($1) :i32
+	$3 = _ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_38__invokeEi($2) :i32
 	return ($3) :i32
 }
 } //NESIR
\ No newline at end of file
diff --git a/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace
index e880bf06..64d59281 100644
--- a/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace
@@ -1,3 +1,3 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($1)	:i32
+	CALL	$2	_ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_28__invokeEi($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace
index 0961767b..ae788cab 100644
--- a/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace
@@ -1,4 +1,4 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_18__invokeEi($1)	:i32
-	CALL	$3	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($2)	:i32
+	CALL	$2	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_48__invokeEi($1)	:i32
+	CALL	$3	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_38__invokeEi($2)	:i32
 	RETURN	$0	$3	:i32