diff --git a/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
index e2656fb94612807dd7810669096e9d83aebf1549..05d54eb1b3692086427e11ac0c4312ce3b3e97ac 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
@@ -316,7 +316,7 @@ int main(void)
 }
 
 
-[kernel] Parsing tests/stdlib/result/calloc.c (with preprocessing)
+[kernel] Parsing tests/stdlib/result/ocode_calloc.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stdlib.h"
 struct X {
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/free.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/free.res.oracle
index a0671fe0bc81d0cf757f8660830d2cf9ab1898c8..51554abd5d6d303f3f6fd7571c3ff2c23eafc230 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/free.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/free.res.oracle
@@ -139,7 +139,7 @@ void with_incomplete(struct incomplete *t)
 }
 
 
-[kernel] Parsing tests/stdlib/result/free.c (with preprocessing)
+[kernel] Parsing tests/stdlib/result/ocode_free.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stdlib.h"
 struct incomplete;
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
index 5fc593cb30dbecee8f1301238a8e35148decf5a5..e887b486810379137ffe902fac83c8a44a9a4d67 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
@@ -218,7 +218,7 @@ int main(void)
 }
 
 
-[kernel] Parsing tests/stdlib/result/malloc.c (with preprocessing)
+[kernel] Parsing tests/stdlib/result/ocode_malloc.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stdlib.h"
 struct X {
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
index fd611034c64ab0b4253de89eaf7e4e2453515080..6875e220214f55e820a002a08689fd68969d6461 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
@@ -124,7 +124,7 @@ void foo(void)
 }
 
 
-[kernel] Parsing tests/stdlib/result/no_fc_stdlib.c (with preprocessing)
+[kernel] Parsing tests/stdlib/result/ocode_no_fc_stdlib.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 /*@ ghost extern int __fc_heap_status; */
diff --git a/src/plugins/instantiate/tests/stdlib/test_config b/src/plugins/instantiate/tests/stdlib/test_config
index 265a1378a0cfb7cf836f8fbbf2038233b3671810..04017483a6c7c122176673be0c389b6aa68f7148 100644
--- a/src/plugins/instantiate/tests/stdlib/test_config
+++ b/src/plugins/instantiate/tests/stdlib/test_config
@@ -1 +1 @@
-OPT: @PTEST_FILE@ -instantiate -print -check -then -ocode @PTEST_RESULT@/@PTEST_NAME@.c -print -then -no-instantiate @PTEST_RESULT@/@PTEST_NAME@.c -ocode="" -print
+OPT: @PTEST_FILE@ -instantiate -print -check -then -ocode @PTEST_RESULT@/ocode_@PTEST_NAME@.c -print -then -no-instantiate @PTEST_RESULT@/ocode_@PTEST_NAME@.c -ocode="" -print
diff --git a/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle b/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
index 7923384e2abc16bd19a39ce72904917b804c210e..b6b11b24645b9d594a3f7b6d80c740da1a9b13fa 100644
--- a/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
@@ -181,7 +181,7 @@ void with_null_or_int(int p[10])
 }
 
 
-[kernel] Parsing tests/string/result/memcmp.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memcmp.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle b/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
index 994ecf230487fad2663d6d9125543bfef2d762c4..82350dffc1f04e6ffcdd50c0e6d66d4cac9a753c 100644
--- a/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
@@ -195,7 +195,7 @@ void with_null_or_int(int p[10])
 }
 
 
-[kernel] Parsing tests/string/result/memcpy.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memcpy.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle b/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
index 660db18e3fa68b711fcb1904dc37b99d0519436b..d88dce37409d64f2e0c98863a0d3d603d1fe7e49 100644
--- a/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
@@ -182,7 +182,7 @@ void with_null_or_int(int p[10])
 }
 
 
-[kernel] Parsing tests/string/result/memmove.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memmove.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
index e38819902b0aa425449261ceb23c705ae1d4abff..47f2d1af5ddf0ac7074bbc66e68e59d255cefb77 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
@@ -278,7 +278,7 @@ void with_null_or_int(void)
 }
 
 
-[kernel] Parsing tests/string/result/memset_0.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memset_0.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
index ba73c933112f552a9ba3d74d4a72cc6d8b678c30..f9e34dfba076c08df982ad5b01180d5f2ef9fabe 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
@@ -416,7 +416,7 @@ void with_null_or_int(void)
 }
 
 
-[kernel] Parsing tests/string/result/memset_FF.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memset_FF.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_nested_typedef.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_nested_typedef.res.oracle
index c99bbab555ac56acc73b2c2e68315465b5fcd36d..c75e4edc3890b1e6eda0bb72955f678c6b9e5a67 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_nested_typedef.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_nested_typedef.res.oracle
@@ -34,7 +34,7 @@ void test(void)
 }
 
 
-[kernel] Parsing tests/string/result/memset_nested_typedef.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memset_nested_typedef.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_nested_union.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_nested_union.res.oracle
index 7185fe7a66598d4ad182720f927ea6e5f4ed4a8b..f552f8742b468569c9f3b2d7710c6abbb1dbb18e 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_nested_union.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_nested_union.res.oracle
@@ -20,7 +20,7 @@ void test(void)
 }
 
 
-[kernel] Parsing tests/string/result/memset_nested_union.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memset_nested_union.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
index 545f2fa144a4428e2d46374c516fa7f42092a26f..4f82f4a1d43f08612bc4e3739f39aadb40a14ad6 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
@@ -192,7 +192,7 @@ void with_null_or_int(int value)
 }
 
 
-[kernel] Parsing tests/string/result/memset_value.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memset_value.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/test_config b/src/plugins/instantiate/tests/string/test_config
index 1fb66d3b40f88a932dd0d020f29d1f3db05e199e..04017483a6c7c122176673be0c389b6aa68f7148 100644
--- a/src/plugins/instantiate/tests/string/test_config
+++ b/src/plugins/instantiate/tests/string/test_config
@@ -1 +1 @@
-OPT: @PTEST_FILE@ -instantiate -print -check -then -ocode @PTEST_RESULT@/@PTEST_NAME@.c -print -then -no-instantiate @PTEST_RESULT@/@PTEST_NAME@.c -ocode="" -print
\ No newline at end of file
+OPT: @PTEST_FILE@ -instantiate -print -check -then -ocode @PTEST_RESULT@/ocode_@PTEST_NAME@.c -print -then -no-instantiate @PTEST_RESULT@/ocode_@PTEST_NAME@.c -ocode="" -print