diff --git a/src/plugins/e-acsl/tests/bts/bts1399.c b/src/plugins/e-acsl/tests/bts/bts1399.c
index cc5d1e812f5481c8ea82d24bc52e741d52144e43..c4178e9f841ffe5a259a463475e8abf9b2483af9 100644
--- a/src/plugins/e-acsl/tests/bts/bts1399.c
+++ b/src/plugins/e-acsl/tests/bts/bts1399.c
@@ -1,6 +1,6 @@
 /* run.config
    COMMENT: complex fields and indexes + potential RTE in \initialized
-   STDOPT: +"-val-builtin __malloc:Frama_C_alloc_size -val-builtin __free:Frama_C_free"
+   STDOPT: +"-val-builtin __e_acsl_malloc:Frama_C_alloc_size -val-builtin __e_acsl_free:Frama_C_free"
 */
 
 #include "stdlib.h"
@@ -17,7 +17,7 @@ typedef struct spongeStateStruct spongeState;
 int main(void) {
   spongeState* state = (spongeState*) malloc(sizeof(spongeState));
   state->bitsInQueue = 16;
-  
+
   /*@ assert
       ! \initialized(&state->dataQueue[state->bitsInQueue/(unsigned int)8]);
     */
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1304.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1304.res.oracle
index 8e373e8a1f5834af534dd2197d4bdf7b87164529..3c58299472b698afd8fee9c528aff2c24700b7aa 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1304.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1304.res.oracle
@@ -1,4 +1,4 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
 tests/bts/bts1304.i:23:[value] warning: assertion got status unknown.
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1307.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1307.res.oracle
index 480f069a19ae45ba660168338ac7da8d5cb43889..cfcb4eb5edca2d8028b8d71336c50404b0f41d90 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1307.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1307.res.oracle
@@ -4,6 +4,6 @@ tests/bts/bts1307.i:11:[e-acsl] warning: approximating a real number by a float
 tests/bts/bts1307.i:23:[e-acsl] warning: approximating a real number by a float
 tests/bts/bts1307.i:23:[e-acsl] warning: approximating a real number by a float
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] user error: type long double not implemented. Using double instead
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status invalid.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status invalid.
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1324.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1324.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1324.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1324.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1326.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1326.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1326.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1326.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1390.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1390.res.oracle
index 8a058f7b5ac613a72681bb9da7a575e7beab5360..9f073f5d7095bc8b2c505b23058942df66c7a815 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1390.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1390.res.oracle
@@ -1,6 +1,6 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/bts/bts1390.c:13:[value] warning: function memchr, behavior not_exists: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-tests/bts/bts1390.c:13:[value] warning: function __e_acsl_memchr, behavior not_exists: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+tests/bts/bts1390.c:13:[value] warning: function __gen_e_acsl_memchr, behavior not_exists: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
 tests/bts/bts1390.c:18:[kernel] warning: out of bounds read. assert \valid_read(s);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1399.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1399.res.oracle
index 4837b7a5c45c8daeb940a9158fae49104d0689e9..957b7f57cf8ab7bd70f3c9ba0b26227dc3a1f13a 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1399.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1399.res.oracle
@@ -21,8 +21,8 @@ FRAMAC_SHARE/libc/stdlib.h:177:[e-acsl] warning: E-ACSL construct `assigns claus
                   Ignoring annotation.
 FRAMAC_SHARE/libc/stdlib.h:177:[e-acsl] warning: E-ACSL construct `\allocate' is not yet supported. Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:178:[value] warning: function __e_acsl_free, behavior deallocation: precondition 'freeable' got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:180:[value] warning: function __e_acsl_free, behavior deallocation: postcondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:178:[value] warning: function __gen_e_acsl_free, behavior deallocation: precondition 'freeable' got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:180:[value] warning: function __gen_e_acsl_free, behavior deallocation: postcondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1478.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1478.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1478.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1478.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1700.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1700.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1700.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1700.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1717.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1717.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1717.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1717.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1718.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1718.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1718.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1718.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1837.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1837.res.oracle
index 42f96b384d0c23255fb200f997b8a4f1abc9f599..b151b39e10cf77d06f108e19998a6c830cfb0fb5 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts1837.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts1837.res.oracle
@@ -1,4 +1,4 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/bts/bts1837.i:18:[kernel] warning: signed overflow. assert -2147483648 ≤ i-1;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
index 41db747839a6f1ba1bbe5775fdae81d8af5f6d1a..22a85bfa2ec55aab5063fe6607a850684c35e2f0 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
@@ -17,10 +17,10 @@ union msg {
 };
 void read_sensor_4(unsigned int *m)
 {
-  __store_block((void *)(& m),8UL);
-  __initialize((void *)m,sizeof(unsigned int));
+  __e_acsl_store_block((void *)(& m),8UL);
+  __e_acsl_initialize((void *)m,sizeof(unsigned int));
   *m = (unsigned int)0;
-  __delete_block((void *)(& m));
+  __e_acsl_delete_block((void *)(& m));
   return;
 }
 
@@ -30,7 +30,7 @@ int main(void)
   unsigned char buf[sizeof(union msg)];
   int i;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(buf),16UL);
+  __e_acsl_store_block((void *)(buf),16UL);
   i = 0;
   while ((unsigned long)i < sizeof(buf) / (unsigned long)4) {
     read_sensor_4((unsigned int *)(buf) + i);
@@ -38,14 +38,16 @@ int main(void)
   }
   /*@ assert \initialized((union msg *)((unsigned char *)buf)); */
   {
-    int __e_acsl_initialized;
-    __e_acsl_initialized = __initialized((void *)(buf),sizeof(union msg));
-    __e_acsl_assert(__e_acsl_initialized,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(buf),
+                                                    sizeof(union msg));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\initialized((union msg *)((unsigned char *)buf))",
                     23);
   }
   __retres = 0;
-  __delete_block((void *)(buf));
+  __e_acsl_delete_block((void *)(buf));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c
index 27ae31be343713e9eb13409fc3d6df612d61749a..a17813f8eec7a7244564446b9c5a777584caedbb 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c
@@ -10,15 +10,15 @@
  */
 void foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
 {
-  __store_block((void *)(& Mtmax_in),8UL);
-  __store_block((void *)(& Mwmax),8UL);
-  __store_block((void *)(& Mtmax_out),8UL);
-  __initialize((void *)Mtmax_out,sizeof(float));
+  __e_acsl_store_block((void *)(& Mtmax_in),8UL);
+  __e_acsl_store_block((void *)(& Mwmax),8UL);
+  __e_acsl_store_block((void *)(& Mtmax_out),8UL);
+  __e_acsl_initialize((void *)Mtmax_out,sizeof(float));
   *Mtmax_out = (float)((double)*Mtmax_in + ((double)5 - (double)((float)(
                                                                  5 / 80) * *Mwmax) * 0.4));
-  __delete_block((void *)(& Mtmax_in));
-  __delete_block((void *)(& Mwmax));
-  __delete_block((void *)(& Mtmax_out));
+  __e_acsl_delete_block((void *)(& Mtmax_in));
+  __e_acsl_delete_block((void *)(& Mwmax));
+  __e_acsl_delete_block((void *)(& Mtmax_out));
   return;
 }
 
@@ -31,57 +31,60 @@ void foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
       ensures
         *\old(Mtmax_out) ≡ *\old(Mtmax_in)+(5-((5/80)**\old(Mwmax))*0.4);
  */
-void __e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
+void __gen_e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
 {
-  float *__e_acsl_at_3;
-  float *__e_acsl_at_2;
-  float *__e_acsl_at;
+  float *__gen_e_acsl_at_3;
+  float *__gen_e_acsl_at_2;
+  float *__gen_e_acsl_at;
   {
-    int __e_acsl_valid;
-    int __e_acsl_valid_2;
-    int __e_acsl_valid_3;
-    __store_block((void *)(& Mtmax_in),8UL);
-    __store_block((void *)(& Mwmax),8UL);
-    __store_block((void *)(& Mtmax_out),8UL);
-    __e_acsl_valid = __valid((void *)Mtmax_in,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid,(char *)"Precondition",(char *)"foo",
+    int __gen_e_acsl_valid;
+    int __gen_e_acsl_valid_2;
+    int __gen_e_acsl_valid_3;
+    __e_acsl_store_block((void *)(& Mtmax_in),8UL);
+    __e_acsl_store_block((void *)(& Mwmax),8UL);
+    __e_acsl_store_block((void *)(& Mtmax_out),8UL);
+    __gen_e_acsl_valid = __e_acsl_valid((void *)Mtmax_in,sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Precondition",(char *)"foo",
                     (char *)"\\valid(Mtmax_in)",5);
-    __e_acsl_valid_2 = __valid((void *)Mwmax,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid_2,(char *)"Precondition",(char *)"foo",
-                    (char *)"\\valid(Mwmax)",6);
-    __e_acsl_valid_3 = __valid((void *)Mtmax_out,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid_3,(char *)"Precondition",(char *)"foo",
-                    (char *)"\\valid(Mtmax_out)",7);
-    __store_block((void *)(& __e_acsl_at_3),8UL);
-    __e_acsl_at_3 = Mwmax;
-    __store_block((void *)(& __e_acsl_at_2),8UL);
-    __e_acsl_at_2 = Mtmax_in;
-    __store_block((void *)(& __e_acsl_at),8UL);
-    __e_acsl_at = Mtmax_out;
+    __gen_e_acsl_valid_2 = __e_acsl_valid((void *)Mwmax,sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid_2,(char *)"Precondition",
+                    (char *)"foo",(char *)"\\valid(Mwmax)",6);
+    __gen_e_acsl_valid_3 = __e_acsl_valid((void *)Mtmax_out,sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid_3,(char *)"Precondition",
+                    (char *)"foo",(char *)"\\valid(Mtmax_out)",7);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at_3),8UL);
+    __gen_e_acsl_at_3 = Mwmax;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at_2),8UL);
+    __gen_e_acsl_at_2 = Mtmax_in;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at),8UL);
+    __gen_e_acsl_at = Mtmax_out;
     foo(Mtmax_in,Mwmax,Mtmax_out);
   }
   {
-    int __e_acsl_valid_read;
-    int __e_acsl_valid_read_2;
-    int __e_acsl_valid_read_3;
-    __e_acsl_valid_read = __valid_read((void *)__e_acsl_at_3,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"foo",
-                    (char *)"mem_access: \\valid_read(__e_acsl_at_3)",11);
-    __e_acsl_valid_read_2 = __valid_read((void *)__e_acsl_at_2,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid_read_2,(char *)"RTE",(char *)"foo",
-                    (char *)"mem_access: \\valid_read(__e_acsl_at_2)",11);
-    __e_acsl_valid_read_3 = __valid_read((void *)__e_acsl_at,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid_read_3,(char *)"RTE",(char *)"foo",
-                    (char *)"mem_access: \\valid_read(__e_acsl_at)",11);
-    __e_acsl_assert(*__e_acsl_at == *__e_acsl_at_2 + (long double)((long double)5 - 
-                                                                   ((long double)(
-                                                                    5 / 80) * *__e_acsl_at_3) * 0.4),
+    int __gen_e_acsl_valid_read;
+    int __gen_e_acsl_valid_read_2;
+    int __gen_e_acsl_valid_read_3;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)__gen_e_acsl_at_3,
+                                                  sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"foo",
+                    (char *)"mem_access: \\valid_read(__gen_e_acsl_at_3)",11);
+    __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)__gen_e_acsl_at_2,
+                                                    sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",(char *)"foo",
+                    (char *)"mem_access: \\valid_read(__gen_e_acsl_at_2)",11);
+    __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)__gen_e_acsl_at,
+                                                    sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"RTE",(char *)"foo",
+                    (char *)"mem_access: \\valid_read(__gen_e_acsl_at)",11);
+    __e_acsl_assert(*__gen_e_acsl_at == *__gen_e_acsl_at_2 + (long double)(
+                                        (long double)5 - ((long double)(
+                                                          5 / 80) * *__gen_e_acsl_at_3) * 0.4),
                     (char *)"Postcondition",(char *)"foo",
                     (char *)"*\\old(Mtmax_out) == *\\old(Mtmax_in)+(5-((5/80)**\\old(Mwmax))*0.4)",
                     11);
-    __delete_block((void *)(& Mtmax_in));
-    __delete_block((void *)(& Mwmax));
-    __delete_block((void *)(& Mtmax_out));
+    __e_acsl_delete_block((void *)(& Mtmax_in));
+    __e_acsl_delete_block((void *)(& Mwmax));
+    __e_acsl_delete_block((void *)(& Mtmax_out));
     return;
   }
 }
@@ -99,14 +102,14 @@ void __e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
  */
 void bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out)
 {
-  __store_block((void *)(& Mtmin_in),8UL);
-  __store_block((void *)(& Mwmin),8UL);
-  __store_block((void *)(& Mtmin_out),8UL);
-  __initialize((void *)Mtmin_out,sizeof(float));
+  __e_acsl_store_block((void *)(& Mtmin_in),8UL);
+  __e_acsl_store_block((void *)(& Mwmin),8UL);
+  __e_acsl_store_block((void *)(& Mtmin_out),8UL);
+  __e_acsl_initialize((void *)Mtmin_out,sizeof(float));
   *Mtmin_out = (float)(0.85 * (double)*Mwmin);
-  __delete_block((void *)(& Mtmin_in));
-  __delete_block((void *)(& Mwmin));
-  __delete_block((void *)(& Mtmin_out));
+  __e_acsl_delete_block((void *)(& Mtmin_in));
+  __e_acsl_delete_block((void *)(& Mwmin));
+  __e_acsl_delete_block((void *)(& Mtmin_out));
   return;
 }
 
@@ -121,91 +124,97 @@ void bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out)
           *\old(Mtmin_in) ≢ 0.:
           0.85**\old(Mwmin) ≢ 0.;
  */
-void __e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out)
+void __gen_e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out)
 {
-  float *__e_acsl_at_6;
-  float *__e_acsl_at_5;
-  float *__e_acsl_at_4;
-  float *__e_acsl_at_3;
-  float *__e_acsl_at_2;
-  float *__e_acsl_at;
+  float *__gen_e_acsl_at_6;
+  float *__gen_e_acsl_at_5;
+  float *__gen_e_acsl_at_4;
+  float *__gen_e_acsl_at_3;
+  float *__gen_e_acsl_at_2;
+  float *__gen_e_acsl_at;
   {
-    int __e_acsl_valid;
-    int __e_acsl_valid_2;
-    int __e_acsl_valid_3;
-    __store_block((void *)(& Mtmin_in),8UL);
-    __store_block((void *)(& Mwmin),8UL);
-    __store_block((void *)(& Mtmin_out),8UL);
-    __e_acsl_valid = __valid((void *)Mtmin_in,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid,(char *)"Precondition",(char *)"bar",
+    int __gen_e_acsl_valid;
+    int __gen_e_acsl_valid_2;
+    int __gen_e_acsl_valid_3;
+    __e_acsl_store_block((void *)(& Mtmin_in),8UL);
+    __e_acsl_store_block((void *)(& Mwmin),8UL);
+    __e_acsl_store_block((void *)(& Mtmin_out),8UL);
+    __gen_e_acsl_valid = __e_acsl_valid((void *)Mtmin_in,sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Precondition",(char *)"bar",
                     (char *)"\\valid(Mtmin_in)",17);
-    __e_acsl_valid_2 = __valid((void *)Mwmin,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid_2,(char *)"Precondition",(char *)"bar",
-                    (char *)"\\valid(Mwmin)",18);
-    __e_acsl_valid_3 = __valid((void *)Mtmin_out,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid_3,(char *)"Precondition",(char *)"bar",
-                    (char *)"\\valid(Mtmin_out)",19);
-    __store_block((void *)(& __e_acsl_at_6),8UL);
-    __e_acsl_at_6 = Mwmin;
-    __store_block((void *)(& __e_acsl_at_5),8UL);
-    __e_acsl_at_5 = Mtmin_in;
-    __store_block((void *)(& __e_acsl_at_4),8UL);
-    __e_acsl_at_4 = Mwmin;
-    __store_block((void *)(& __e_acsl_at_3),8UL);
-    __e_acsl_at_3 = Mtmin_in;
-    __store_block((void *)(& __e_acsl_at_2),8UL);
-    __e_acsl_at_2 = Mtmin_in;
-    __store_block((void *)(& __e_acsl_at),8UL);
-    __e_acsl_at = Mtmin_out;
+    __gen_e_acsl_valid_2 = __e_acsl_valid((void *)Mwmin,sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid_2,(char *)"Precondition",
+                    (char *)"bar",(char *)"\\valid(Mwmin)",18);
+    __gen_e_acsl_valid_3 = __e_acsl_valid((void *)Mtmin_out,sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid_3,(char *)"Precondition",
+                    (char *)"bar",(char *)"\\valid(Mtmin_out)",19);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at_6),8UL);
+    __gen_e_acsl_at_6 = Mwmin;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at_5),8UL);
+    __gen_e_acsl_at_5 = Mtmin_in;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at_4),8UL);
+    __gen_e_acsl_at_4 = Mwmin;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at_3),8UL);
+    __gen_e_acsl_at_3 = Mtmin_in;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at_2),8UL);
+    __gen_e_acsl_at_2 = Mtmin_in;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at),8UL);
+    __gen_e_acsl_at = Mtmin_out;
     bar(Mtmin_in,Mwmin,Mtmin_out);
   }
   {
-    int __e_acsl_valid_read;
-    int __e_acsl_valid_read_2;
-    int __e_acsl_and;
-    int __e_acsl_if;
-    __e_acsl_valid_read = __valid_read((void *)__e_acsl_at_2,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"bar",
-                    (char *)"mem_access: \\valid_read(__e_acsl_at_2)",23);
-    __e_acsl_valid_read_2 = __valid_read((void *)__e_acsl_at,sizeof(float));
-    __e_acsl_assert(__e_acsl_valid_read_2,(char *)"RTE",(char *)"bar",
-                    (char *)"mem_access: \\valid_read(__e_acsl_at)",23);
-    if (*__e_acsl_at == *__e_acsl_at_2) {
-      int __e_acsl_valid_read_3;
-      int __e_acsl_valid_read_4;
-      __e_acsl_valid_read_3 = __valid_read((void *)__e_acsl_at_4,
-                                           sizeof(float));
-      __e_acsl_assert(__e_acsl_valid_read_3,(char *)"RTE",(char *)"bar",
-                      (char *)"mem_access: \\valid_read(__e_acsl_at_4)",23);
-      __e_acsl_valid_read_4 = __valid_read((void *)__e_acsl_at_3,
-                                           sizeof(float));
-      __e_acsl_assert(__e_acsl_valid_read_4,(char *)"RTE",(char *)"bar",
-                      (char *)"mem_access: \\valid_read(__e_acsl_at_3)",23);
-      __e_acsl_and = *__e_acsl_at_3 < 0.85 * *__e_acsl_at_4;
+    int __gen_e_acsl_valid_read;
+    int __gen_e_acsl_valid_read_2;
+    int __gen_e_acsl_and;
+    int __gen_e_acsl_if;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)__gen_e_acsl_at_2,
+                                                  sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"bar",
+                    (char *)"mem_access: \\valid_read(__gen_e_acsl_at_2)",23);
+    __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)__gen_e_acsl_at,
+                                                    sizeof(float));
+    __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",(char *)"bar",
+                    (char *)"mem_access: \\valid_read(__gen_e_acsl_at)",23);
+    if (*__gen_e_acsl_at == *__gen_e_acsl_at_2) {
+      int __gen_e_acsl_valid_read_3;
+      int __gen_e_acsl_valid_read_4;
+      __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)__gen_e_acsl_at_4,
+                                                      sizeof(float));
+      __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"RTE",(char *)"bar",
+                      (char *)"mem_access: \\valid_read(__gen_e_acsl_at_4)",
+                      23);
+      __gen_e_acsl_valid_read_4 = __e_acsl_valid_read((void *)__gen_e_acsl_at_3,
+                                                      sizeof(float));
+      __e_acsl_assert(__gen_e_acsl_valid_read_4,(char *)"RTE",(char *)"bar",
+                      (char *)"mem_access: \\valid_read(__gen_e_acsl_at_3)",
+                      23);
+      __gen_e_acsl_and = *__gen_e_acsl_at_3 < 0.85 * *__gen_e_acsl_at_4;
     }
-    else __e_acsl_and = 0;
-    if (__e_acsl_and) {
-      int __e_acsl_valid_read_5;
-      __e_acsl_valid_read_5 = __valid_read((void *)__e_acsl_at_5,
-                                           sizeof(float));
-      __e_acsl_assert(__e_acsl_valid_read_5,(char *)"RTE",(char *)"bar",
-                      (char *)"mem_access: \\valid_read(__e_acsl_at_5)",23);
-      __e_acsl_if = *__e_acsl_at_5 != 0.;
+    else __gen_e_acsl_and = 0;
+    if (__gen_e_acsl_and) {
+      int __gen_e_acsl_valid_read_5;
+      __gen_e_acsl_valid_read_5 = __e_acsl_valid_read((void *)__gen_e_acsl_at_5,
+                                                      sizeof(float));
+      __e_acsl_assert(__gen_e_acsl_valid_read_5,(char *)"RTE",(char *)"bar",
+                      (char *)"mem_access: \\valid_read(__gen_e_acsl_at_5)",
+                      23);
+      __gen_e_acsl_if = *__gen_e_acsl_at_5 != 0.;
     }
     else {
-      int __e_acsl_valid_read_6;
-      __e_acsl_valid_read_6 = __valid_read((void *)__e_acsl_at_6,
-                                           sizeof(float));
-      __e_acsl_assert(__e_acsl_valid_read_6,(char *)"RTE",(char *)"bar",
-                      (char *)"mem_access: \\valid_read(__e_acsl_at_6)",23);
-      __e_acsl_if = 0.85 * *__e_acsl_at_6 != 0.;
+      int __gen_e_acsl_valid_read_6;
+      __gen_e_acsl_valid_read_6 = __e_acsl_valid_read((void *)__gen_e_acsl_at_6,
+                                                      sizeof(float));
+      __e_acsl_assert(__gen_e_acsl_valid_read_6,(char *)"RTE",(char *)"bar",
+                      (char *)"mem_access: \\valid_read(__gen_e_acsl_at_6)",
+                      23);
+      __gen_e_acsl_if = 0.85 * *__gen_e_acsl_at_6 != 0.;
     }
-    __e_acsl_assert(__e_acsl_if,(char *)"Postcondition",(char *)"bar",
+    __e_acsl_assert(__gen_e_acsl_if,(char *)"Postcondition",(char *)"bar",
                     (char *)"*\\old(Mtmin_out) == *\\old(Mtmin_in) < 0.85**\\old(Mwmin)?\n  *\\old(Mtmin_in) != 0.:\n  0.85**\\old(Mwmin) != 0.",
                     23);
-    __delete_block((void *)(& Mtmin_in));
-    __delete_block((void *)(& Mwmin));
-    __delete_block((void *)(& Mtmin_out));
+    __e_acsl_delete_block((void *)(& Mtmin_in));
+    __e_acsl_delete_block((void *)(& Mwmin));
+    __e_acsl_delete_block((void *)(& Mtmin_out));
     return;
   }
 }
@@ -217,19 +226,19 @@ int main(void)
   float g;
   float h;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& h),4UL);
-  __store_block((void *)(& g),4UL);
-  __store_block((void *)(& f),4UL);
-  __full_init((void *)(& f));
+  __e_acsl_store_block((void *)(& h),4UL);
+  __e_acsl_store_block((void *)(& g),4UL);
+  __e_acsl_store_block((void *)(& f),4UL);
+  __e_acsl_full_init((void *)(& f));
   f = (float)1.0;
-  __full_init((void *)(& g));
+  __e_acsl_full_init((void *)(& g));
   g = (float)1.0;
-  __e_acsl_foo(& f,& g,& h);
-  __e_acsl_bar(& f,& g,& h);
+  __gen_e_acsl_foo(& f,& g,& h);
+  __gen_e_acsl_bar(& f,& g,& h);
   __retres = 0;
-  __delete_block((void *)(& h));
-  __delete_block((void *)(& g));
-  __delete_block((void *)(& f));
+  __e_acsl_delete_block((void *)(& h));
+  __e_acsl_delete_block((void *)(& g));
+  __e_acsl_delete_block((void *)(& f));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c
index e218608d3258d688d8ecedf5701fc8b1f8ca410f..500ffb75a67fa4fe785a42292ac8775640bf2a32 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c
@@ -28,52 +28,56 @@ int sorted(int *t, int n)
       assumes ∀ int i; 0 < i < n ⇒ *(t+(i-1)) ≤ *(t+i);
       ensures \result ≡ 1;
  */
-int __e_acsl_sorted(int *t, int n)
+int __gen_e_acsl_sorted(int *t, int n)
 {
-  int __e_acsl_at;
+  int __gen_e_acsl_at;
   int __retres;
-  __store_block((void *)(& t),8UL);
+  __e_acsl_store_block((void *)(& t),8UL);
   {
-    int __e_acsl_forall;
-    int __e_acsl_i;
-    __e_acsl_forall = 1;
-    __e_acsl_i = 0 + 1;
+    int __gen_e_acsl_forall;
+    int __gen_e_acsl_i;
+    __gen_e_acsl_forall = 1;
+    __gen_e_acsl_i = 0 + 1;
     while (1) {
-      if (__e_acsl_i < n) ; else break;
+      if (__gen_e_acsl_i < n) ; else break;
       {
-        int __e_acsl_valid_read;
-        int __e_acsl_valid_read_2;
-        __e_acsl_valid_read = __valid_read((void *)(t + __e_acsl_i),
-                                           sizeof(int));
-        __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"sorted",
-                        (char *)"mem_access: \\valid_read(t+__e_acsl_i)",6);
-        __e_acsl_valid_read_2 = __valid_read((void *)(t + ((long)__e_acsl_i - (long)1)),
-                                             sizeof(int));
-        __e_acsl_assert(__e_acsl_valid_read_2,(char *)"RTE",(char *)"sorted",
-                        (char *)"mem_access: \\valid_read(t+(long)((long)__e_acsl_i-1))",
+        int __gen_e_acsl_valid_read;
+        int __gen_e_acsl_valid_read_2;
+        __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(t + __gen_e_acsl_i),
+                                                      sizeof(int));
+        __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",
+                        (char *)"sorted",
+                        (char *)"mem_access: \\valid_read(t+__gen_e_acsl_i)",
                         6);
-        if (*(t + ((long)__e_acsl_i - (long)1)) <= *(t + __e_acsl_i)) 
+        __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(t + (
+                                                                 (long)__gen_e_acsl_i - (long)1)),
+                                                        sizeof(int));
+        __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",
+                        (char *)"sorted",
+                        (char *)"mem_access: \\valid_read(t+(long)((long)__gen_e_acsl_i-1))",
+                        6);
+        if (*(t + ((long)__gen_e_acsl_i - (long)1)) <= *(t + __gen_e_acsl_i)) 
           ;
         else {
-          __e_acsl_forall = 0;
+          __gen_e_acsl_forall = 0;
           goto e_acsl_end_loop1;
         }
       }
-      __e_acsl_i ++;
+      __gen_e_acsl_i ++;
     }
     e_acsl_end_loop1: ;
-    __e_acsl_at = __e_acsl_forall;
+    __gen_e_acsl_at = __gen_e_acsl_forall;
   }
   __retres = sorted(t,n);
   {
-    int __e_acsl_implies;
-    if (! __e_acsl_at) __e_acsl_implies = 1;
-    else __e_acsl_implies = __retres == 1;
-    __e_acsl_assert(__e_acsl_implies,(char *)"Postcondition",
+    int __gen_e_acsl_implies;
+    if (! __gen_e_acsl_at) __gen_e_acsl_implies = 1;
+    else __gen_e_acsl_implies = __retres == 1;
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Postcondition",
                     (char *)"sorted",
                     (char *)"\\old(\\forall int i; 0 < i < n ==> *(t+(i-1)) <= *(t+i)) ==> \\result == 1",
                     7);
-    __delete_block((void *)(& t));
+    __e_acsl_delete_block((void *)(& t));
     return __retres;
   }
 }
@@ -84,27 +88,27 @@ int main(void)
   int t[7];
   int n;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(t),28UL);
-  __initialize((void *)(t),sizeof(int));
+  __e_acsl_store_block((void *)(t),28UL);
+  __e_acsl_initialize((void *)(t),sizeof(int));
   t[0] = 1;
-  __initialize((void *)(& t[1]),sizeof(int));
+  __e_acsl_initialize((void *)(& t[1]),sizeof(int));
   t[1] = 4;
-  __initialize((void *)(& t[2]),sizeof(int));
+  __e_acsl_initialize((void *)(& t[2]),sizeof(int));
   t[2] = 4;
-  __initialize((void *)(& t[3]),sizeof(int));
+  __e_acsl_initialize((void *)(& t[3]),sizeof(int));
   t[3] = 5;
-  __initialize((void *)(& t[4]),sizeof(int));
+  __e_acsl_initialize((void *)(& t[4]),sizeof(int));
   t[4] = 5;
-  __initialize((void *)(& t[5]),sizeof(int));
+  __e_acsl_initialize((void *)(& t[5]),sizeof(int));
   t[5] = 5;
-  __initialize((void *)(& t[6]),sizeof(int));
+  __e_acsl_initialize((void *)(& t[6]),sizeof(int));
   t[6] = 7;
-  n = __e_acsl_sorted(t,7);
+  n = __gen_e_acsl_sorted(t,7);
   /*@ assert n ≡ 1; */
   __e_acsl_assert(n == 1,(char *)"Assertion",(char *)"main",(char *)"n == 1",
                   23);
   __retres = 0;
-  __delete_block((void *)(t));
+  __e_acsl_delete_block((void *)(t));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c
index 67e2c8d506aa3b139cf16b61737262d73251e61d..d39a561886aa2dcf275fc5099184ecb140b5d754 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c
@@ -8,12 +8,12 @@ typedef int ArrayInt[5];
  */
 void atp_NORMAL_computeAverageAccel(ArrayInt *Accel, int *AverageAccel)
 {
-  __store_block((void *)(& Accel),8UL);
-  __store_block((void *)(& AverageAccel),8UL);
-  __initialize((void *)AverageAccel,sizeof(int));
+  __e_acsl_store_block((void *)(& Accel),8UL);
+  __e_acsl_store_block((void *)(& AverageAccel),8UL);
+  __e_acsl_initialize((void *)AverageAccel,sizeof(int));
   *AverageAccel = (((((*Accel)[4] + (*Accel)[3]) + (*Accel)[2]) + (*Accel)[1]) + (*Accel)[0]) / 5;
-  __delete_block((void *)(& Accel));
-  __delete_block((void *)(& AverageAccel));
+  __e_acsl_delete_block((void *)(& Accel));
+  __e_acsl_delete_block((void *)(& AverageAccel));
   return;
 }
 
@@ -23,77 +23,79 @@ void atp_NORMAL_computeAverageAccel(ArrayInt *Accel, int *AverageAccel)
                                                                     Accel))[1])+(*
         \old(Accel))[0])/5;
  */
-void __e_acsl_atp_NORMAL_computeAverageAccel(ArrayInt *Accel,
-                                             int *AverageAccel)
+void __gen_e_acsl_atp_NORMAL_computeAverageAccel(ArrayInt *Accel,
+                                                 int *AverageAccel)
 {
-  ArrayInt *__e_acsl_at_6;
-  ArrayInt *__e_acsl_at_5;
-  ArrayInt *__e_acsl_at_4;
-  ArrayInt *__e_acsl_at_3;
-  ArrayInt *__e_acsl_at_2;
-  int *__e_acsl_at;
-  __store_block((void *)(& Accel),8UL);
-  __store_block((void *)(& AverageAccel),8UL);
-  __store_block((void *)(& __e_acsl_at_6),8UL);
-  __e_acsl_at_6 = Accel;
-  __store_block((void *)(& __e_acsl_at_5),8UL);
-  __e_acsl_at_5 = Accel;
-  __store_block((void *)(& __e_acsl_at_4),8UL);
-  __e_acsl_at_4 = Accel;
-  __store_block((void *)(& __e_acsl_at_3),8UL);
-  __e_acsl_at_3 = Accel;
-  __store_block((void *)(& __e_acsl_at_2),8UL);
-  __e_acsl_at_2 = Accel;
-  __store_block((void *)(& __e_acsl_at),8UL);
-  __e_acsl_at = AverageAccel;
+  ArrayInt *__gen_e_acsl_at_6;
+  ArrayInt *__gen_e_acsl_at_5;
+  ArrayInt *__gen_e_acsl_at_4;
+  ArrayInt *__gen_e_acsl_at_3;
+  ArrayInt *__gen_e_acsl_at_2;
+  int *__gen_e_acsl_at;
+  __e_acsl_store_block((void *)(& Accel),8UL);
+  __e_acsl_store_block((void *)(& AverageAccel),8UL);
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at_6),8UL);
+  __gen_e_acsl_at_6 = Accel;
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at_5),8UL);
+  __gen_e_acsl_at_5 = Accel;
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at_4),8UL);
+  __gen_e_acsl_at_4 = Accel;
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at_3),8UL);
+  __gen_e_acsl_at_3 = Accel;
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at_2),8UL);
+  __gen_e_acsl_at_2 = Accel;
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at),8UL);
+  __gen_e_acsl_at = AverageAccel;
   atp_NORMAL_computeAverageAccel(Accel,AverageAccel);
   {
-    int __e_acsl_valid_read;
-    int __e_acsl_valid_read_2;
-    int __e_acsl_valid_read_3;
-    int __e_acsl_valid_read_4;
-    int __e_acsl_valid_read_5;
-    int __e_acsl_valid_read_6;
-    __e_acsl_valid_read = __valid_read((void *)(*__e_acsl_at_6),sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",
+    int __gen_e_acsl_valid_read;
+    int __gen_e_acsl_valid_read_2;
+    int __gen_e_acsl_valid_read_3;
+    int __gen_e_acsl_valid_read_4;
+    int __gen_e_acsl_valid_read_5;
+    int __gen_e_acsl_valid_read_6;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(*__gen_e_acsl_at_6),
+                                                  sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",
                     (char *)"atp_NORMAL_computeAverageAccel",
-                    (char *)"mem_access: \\valid_read((int *)*__e_acsl_at_6)",
+                    (char *)"mem_access: \\valid_read((int *)*__gen_e_acsl_at_6)",
                     8);
-    __e_acsl_valid_read_2 = __valid_read((void *)(& (*__e_acsl_at_5)[1]),
-                                         sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_read_2,(char *)"RTE",
+    __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(& (*__gen_e_acsl_at_5)[1]),
+                                                    sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",
                     (char *)"atp_NORMAL_computeAverageAccel",
-                    (char *)"mem_access: \\valid_read(&(*__e_acsl_at_5)[1])",
+                    (char *)"mem_access: \\valid_read(&(*__gen_e_acsl_at_5)[1])",
                     8);
-    __e_acsl_valid_read_3 = __valid_read((void *)(& (*__e_acsl_at_4)[2]),
-                                         sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_read_3,(char *)"RTE",
+    __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)(& (*__gen_e_acsl_at_4)[2]),
+                                                    sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"RTE",
                     (char *)"atp_NORMAL_computeAverageAccel",
-                    (char *)"mem_access: \\valid_read(&(*__e_acsl_at_4)[2])",
+                    (char *)"mem_access: \\valid_read(&(*__gen_e_acsl_at_4)[2])",
                     8);
-    __e_acsl_valid_read_4 = __valid_read((void *)(& (*__e_acsl_at_3)[3]),
-                                         sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_read_4,(char *)"RTE",
+    __gen_e_acsl_valid_read_4 = __e_acsl_valid_read((void *)(& (*__gen_e_acsl_at_3)[3]),
+                                                    sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_read_4,(char *)"RTE",
                     (char *)"atp_NORMAL_computeAverageAccel",
-                    (char *)"mem_access: \\valid_read(&(*__e_acsl_at_3)[3])",
+                    (char *)"mem_access: \\valid_read(&(*__gen_e_acsl_at_3)[3])",
                     8);
-    __e_acsl_valid_read_5 = __valid_read((void *)(& (*__e_acsl_at_2)[4]),
-                                         sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_read_5,(char *)"RTE",
+    __gen_e_acsl_valid_read_5 = __e_acsl_valid_read((void *)(& (*__gen_e_acsl_at_2)[4]),
+                                                    sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_read_5,(char *)"RTE",
                     (char *)"atp_NORMAL_computeAverageAccel",
-                    (char *)"mem_access: \\valid_read(&(*__e_acsl_at_2)[4])",
+                    (char *)"mem_access: \\valid_read(&(*__gen_e_acsl_at_2)[4])",
                     8);
-    __e_acsl_valid_read_6 = __valid_read((void *)__e_acsl_at,sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_read_6,(char *)"RTE",
+    __gen_e_acsl_valid_read_6 = __e_acsl_valid_read((void *)__gen_e_acsl_at,
+                                                    sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_read_6,(char *)"RTE",
                     (char *)"atp_NORMAL_computeAverageAccel",
-                    (char *)"mem_access: \\valid_read(__e_acsl_at)",8);
-    __e_acsl_assert(*__e_acsl_at == (((((long)(*__e_acsl_at_2)[4] + (long)(*__e_acsl_at_3)[3]) + (long)(*__e_acsl_at_4)[2]) + (long)(*__e_acsl_at_5)[1]) + (long)(*__e_acsl_at_6)[0]) / (long)5,
+                    (char *)"mem_access: \\valid_read(__gen_e_acsl_at)",8);
+    __e_acsl_assert(*__gen_e_acsl_at == (((((long)(*__gen_e_acsl_at_2)[4] + (long)(*__gen_e_acsl_at_3)[3]) + (long)(*__gen_e_acsl_at_4)[2]) + (long)(*__gen_e_acsl_at_5)[1]) + (long)(*__gen_e_acsl_at_6)[0]) / (long)5,
                     (char *)"Postcondition",
                     (char *)"atp_NORMAL_computeAverageAccel",
                     (char *)"*\\old(AverageAccel) ==\n(((((*\\old(Accel))[4]+(*\\old(Accel))[3])+(*\\old(Accel))[2])+(*\\old(Accel))[1])+(*\n  \\old(Accel))[0])/5",
                     8);
-    __delete_block((void *)(& Accel));
-    __delete_block((void *)(& AverageAccel));
+    __e_acsl_delete_block((void *)(& Accel));
+    __e_acsl_delete_block((void *)(& AverageAccel));
     return;
   }
 }
@@ -104,22 +106,22 @@ int main(void)
   ArrayInt Accel;
   int av;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& av),4UL);
-  __store_block((void *)(Accel),20UL);
-  __initialize((void *)(Accel),sizeof(int));
+  __e_acsl_store_block((void *)(& av),4UL);
+  __e_acsl_store_block((void *)(Accel),20UL);
+  __e_acsl_initialize((void *)(Accel),sizeof(int));
   Accel[0] = 1;
-  __initialize((void *)(& Accel[1]),sizeof(int));
+  __e_acsl_initialize((void *)(& Accel[1]),sizeof(int));
   Accel[1] = 2;
-  __initialize((void *)(& Accel[2]),sizeof(int));
+  __e_acsl_initialize((void *)(& Accel[2]),sizeof(int));
   Accel[2] = 3;
-  __initialize((void *)(& Accel[3]),sizeof(int));
+  __e_acsl_initialize((void *)(& Accel[3]),sizeof(int));
   Accel[3] = 4;
-  __initialize((void *)(& Accel[4]),sizeof(int));
+  __e_acsl_initialize((void *)(& Accel[4]),sizeof(int));
   Accel[4] = 5;
-  __e_acsl_atp_NORMAL_computeAverageAccel(& Accel,& av);
+  __gen_e_acsl_atp_NORMAL_computeAverageAccel(& Accel,& av);
   __retres = 0;
-  __delete_block((void *)(& av));
-  __delete_block((void *)(Accel));
+  __e_acsl_delete_block((void *)(& av));
+  __e_acsl_delete_block((void *)(Accel));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
index 028b1f687bf38263f2439fe55300d7fd763088c9..7224b8101cb0651f8750c4b80369ef62a508451c 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
@@ -1,6 +1,6 @@
 /* Generated by Frama-C */
-char *__e_acsl_literal_string;
-char *__e_acsl_literal_string_2;
+char *__gen_e_acsl_literal_string;
+char *__gen_e_acsl_literal_string_2;
 /*@ behavior exists:
       assumes ∃ ℤ i; 0 ≤ i < n ∧ (int)*((char *)buf+i) ≡ c;
       ensures
@@ -17,29 +17,29 @@ void *memchr(void const *buf, int c, size_t n)
   void *__retres;
   int i;
   char *s;
-  __store_block((void *)(& s),8UL);
-  __store_block((void *)(& __retres),8UL);
-  __store_block((void *)(& buf),8UL);
-  __full_init((void *)(& s));
+  __e_acsl_store_block((void *)(& s),8UL);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& buf),8UL);
+  __e_acsl_full_init((void *)(& s));
   s = (char *)buf;
   i = 0;
   while ((size_t)i < n) {
     /*@ assert Value: mem_access: \valid_read(s); */
     if ((int)*s == c) {
-      __full_init((void *)(& __retres));
+      __e_acsl_full_init((void *)(& __retres));
       __retres = (void *)s;
       goto return_label;
     }
-    __full_init((void *)(& s));
+    __e_acsl_full_init((void *)(& s));
     s ++;
     i ++;
   }
-  __full_init((void *)(& __retres));
+  __e_acsl_full_init((void *)(& __retres));
   __retres = (void *)0;
   return_label:
-    __delete_block((void *)(& buf));
-    __delete_block((void *)(& s));
-    __delete_block((void *)(& __retres));
+    __e_acsl_delete_block((void *)(& buf));
+    __e_acsl_delete_block((void *)(& s));
+    __e_acsl_delete_block((void *)(& __retres));
     return __retres;
 }
 
@@ -54,130 +54,133 @@ void *memchr(void const *buf, int c, size_t n)
       assumes ∀ ℤ k; 0 ≤ k < n ⇒ (int)*((char *)buf+k) ≢ c;
       ensures \result ≡ (void *)0;
  */
-void *__e_acsl_memchr(void const *buf, int c, size_t n)
+void *__gen_e_acsl_memchr(void const *buf, int c, size_t n)
 {
-  int __e_acsl_at_4;
-  int __e_acsl_at_3;
-  void const *__e_acsl_at_2;
-  int __e_acsl_at;
+  int __gen_e_acsl_at_4;
+  int __gen_e_acsl_at_3;
+  void const *__gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
   void *__retres;
-  __store_block((void *)(& __retres),8UL);
-  __store_block((void *)(& buf),8UL);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& buf),8UL);
   {
-    int __e_acsl_forall_2;
-    unsigned long __e_acsl_k;
-    __e_acsl_forall_2 = 1;
-    __e_acsl_k = (unsigned long)0;
+    int __gen_e_acsl_forall_2;
+    unsigned long __gen_e_acsl_k;
+    __gen_e_acsl_forall_2 = 1;
+    __gen_e_acsl_k = (unsigned long)0;
     while (1) {
-      if (__e_acsl_k < n) ; else break;
+      if (__gen_e_acsl_k < n) ; else break;
       {
-        int __e_acsl_valid_read_3;
-        __e_acsl_valid_read_3 = __valid_read((void *)((char *)buf + __e_acsl_k),
-                                             sizeof(char));
-        __e_acsl_assert(__e_acsl_valid_read_3,(char *)"RTE",(char *)"memchr",
-                        (char *)"mem_access: \\valid_read((char *)buf+__e_acsl_k)",
+        int __gen_e_acsl_valid_read_3;
+        __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)((char *)buf + __gen_e_acsl_k),
+                                                        sizeof(char));
+        __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"RTE",
+                        (char *)"memchr",
+                        (char *)"mem_access: \\valid_read((char *)buf+__gen_e_acsl_k)",
                         12);
-        if ((int)*((char *)buf + __e_acsl_k) != c) ;
+        if ((int)*((char *)buf + __gen_e_acsl_k) != c) ;
         else {
-          __e_acsl_forall_2 = 0;
+          __gen_e_acsl_forall_2 = 0;
           goto e_acsl_end_loop3;
         }
       }
-      __e_acsl_k ++;
+      __gen_e_acsl_k ++;
     }
     e_acsl_end_loop3: ;
-    __e_acsl_at_4 = __e_acsl_forall_2;
+    __gen_e_acsl_at_4 = __gen_e_acsl_forall_2;
   }
-  __e_acsl_at_3 = c;
-  __store_block((void *)(& __e_acsl_at_2),8UL);
-  __e_acsl_at_2 = buf;
+  __gen_e_acsl_at_3 = c;
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at_2),8UL);
+  __gen_e_acsl_at_2 = buf;
   {
-    int __e_acsl_exists;
-    unsigned long __e_acsl_i;
-    __e_acsl_exists = 0;
-    __e_acsl_i = (unsigned long)0;
+    int __gen_e_acsl_exists;
+    unsigned long __gen_e_acsl_i;
+    __gen_e_acsl_exists = 0;
+    __gen_e_acsl_i = (unsigned long)0;
     while (1) {
-      if (__e_acsl_i < n) ; else break;
+      if (__gen_e_acsl_i < n) ; else break;
       {
-        int __e_acsl_valid_read;
-        __e_acsl_valid_read = __valid_read((void *)((char *)buf + __e_acsl_i),
-                                           sizeof(char));
-        __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"memchr",
-                        (char *)"mem_access: \\valid_read((char *)buf+__e_acsl_i)",
+        int __gen_e_acsl_valid_read;
+        __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)((char *)buf + __gen_e_acsl_i),
+                                                      sizeof(char));
+        __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",
+                        (char *)"memchr",
+                        (char *)"mem_access: \\valid_read((char *)buf+__gen_e_acsl_i)",
                         8);
-        if (! ((int)*((char *)buf + __e_acsl_i) == c)) ;
+        if (! ((int)*((char *)buf + __gen_e_acsl_i) == c)) ;
         else {
-          __e_acsl_exists = 1;
+          __gen_e_acsl_exists = 1;
           goto e_acsl_end_loop1;
         }
       }
-      __e_acsl_i ++;
+      __gen_e_acsl_i ++;
     }
     e_acsl_end_loop1: ;
-    __e_acsl_at = __e_acsl_exists;
+    __gen_e_acsl_at = __gen_e_acsl_exists;
   }
   __retres = memchr(buf,c,n);
   {
-    int __e_acsl_implies;
-    int __e_acsl_implies_2;
-    if (! __e_acsl_at) __e_acsl_implies = 1;
+    int __gen_e_acsl_implies;
+    int __gen_e_acsl_implies_2;
+    if (! __gen_e_acsl_at) __gen_e_acsl_implies = 1;
     else {
-      int __e_acsl_forall;
-      unsigned long __e_acsl_j;
-      __e_acsl_forall = 1;
-      __e_acsl_j = (unsigned long)0;
+      int __gen_e_acsl_forall;
+      unsigned long __gen_e_acsl_j;
+      __gen_e_acsl_forall = 1;
+      __gen_e_acsl_j = (unsigned long)0;
       while (1) {
         {
-          int __e_acsl_offset;
-          __e_acsl_offset = __offset(__retres);
-          if (__e_acsl_j < (unsigned long)__e_acsl_offset) ; else break;
+          int __gen_e_acsl_offset;
+          __gen_e_acsl_offset = __e_acsl_offset(__retres);
+          if (__gen_e_acsl_j < (unsigned long)__gen_e_acsl_offset) ;
+          else break;
         }
         {
-          int __e_acsl_valid_read_2;
-          __e_acsl_valid_read_2 = __valid_read((void *)((char *)__e_acsl_at_2 + __e_acsl_j),
-                                               sizeof(char));
-          __e_acsl_assert(__e_acsl_valid_read_2,(char *)"RTE",
+          int __gen_e_acsl_valid_read_2;
+          __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)((char *)__gen_e_acsl_at_2 + __gen_e_acsl_j),
+                                                          sizeof(char));
+          __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",
                           (char *)"memchr",
-                          (char *)"mem_access: \\valid_read((char *)__e_acsl_at_2+__e_acsl_j)",
+                          (char *)"mem_access: \\valid_read((char *)__gen_e_acsl_at_2+__gen_e_acsl_j)",
                           10);
-          if ((int)*((char *)__e_acsl_at_2 + __e_acsl_j) != __e_acsl_at_3) 
+          if ((int)*((char *)__gen_e_acsl_at_2 + __gen_e_acsl_j) != __gen_e_acsl_at_3) 
             ;
           else {
-            __e_acsl_forall = 0;
+            __gen_e_acsl_forall = 0;
             goto e_acsl_end_loop2;
           }
         }
-        __e_acsl_j ++;
+        __gen_e_acsl_j ++;
       }
       e_acsl_end_loop2: ;
-      __e_acsl_implies = __e_acsl_forall;
+      __gen_e_acsl_implies = __gen_e_acsl_forall;
     }
-    __e_acsl_assert(__e_acsl_implies,(char *)"Postcondition",
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Postcondition",
                     (char *)"memchr",
                     (char *)"\\old(\\exists integer i; 0 <= i < n && (int)*((char *)buf+i) == c) ==>\n(\\forall int j;\n   0 <= j < \\offset((char *)\\result) ==>\n   (int)*((char *)\\old(buf)+j) != \\old(c))",
                     10);
-    if (! __e_acsl_at_4) __e_acsl_implies_2 = 1;
-    else __e_acsl_implies_2 = __retres == (void *)0;
-    __e_acsl_assert(__e_acsl_implies_2,(char *)"Postcondition",
+    if (! __gen_e_acsl_at_4) __gen_e_acsl_implies_2 = 1;
+    else __gen_e_acsl_implies_2 = __retres == (void *)0;
+    __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Postcondition",
                     (char *)"memchr",
                     (char *)"\\old(\\forall integer k; 0 <= k < n ==> (int)*((char *)buf+k) != c) ==>\n\\result == (void *)0",
                     13);
-    __delete_block((void *)(& buf));
-    __delete_block((void *)(& __retres));
+    __e_acsl_delete_block((void *)(& buf));
+    __e_acsl_delete_block((void *)(& __retres));
     return __retres;
   }
 }
 
 void __e_acsl_globals_init(void)
 {
-  __e_acsl_literal_string = "toto";
-  __store_block((void *)__e_acsl_literal_string,sizeof("toto"));
-  __full_init((void *)__e_acsl_literal_string);
-  __readonly((void *)__e_acsl_literal_string);
-  __e_acsl_literal_string_2 = "tata";
-  __store_block((void *)__e_acsl_literal_string_2,sizeof("tata"));
-  __full_init((void *)__e_acsl_literal_string_2);
-  __readonly((void *)__e_acsl_literal_string_2);
+  __gen_e_acsl_literal_string = "toto";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string,sizeof("toto"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string);
+  __gen_e_acsl_literal_string_2 = "tata";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_2,sizeof("tata"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_2);
   return;
 }
 
@@ -186,9 +189,10 @@ int main(void)
   int __retres;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_memchr((void const *)__e_acsl_literal_string,'o',(unsigned long)4);
-  __e_acsl_memchr((void const *)__e_acsl_literal_string_2,'o',
-                  (unsigned long)4);
+  __gen_e_acsl_memchr((void const *)__gen_e_acsl_literal_string,'o',
+                      (unsigned long)4);
+  __gen_e_acsl_memchr((void const *)__gen_e_acsl_literal_string_2,'o',
+                      (unsigned long)4);
   __retres = 0;
   __e_acsl_memory_clean();
   return __retres;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c
index 8a94ba5b38d6586721c144c19a04cfc5622f46d5..233878777882dc8f0c131b34d5bb0ed4db0cd2ab 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c
@@ -10,32 +10,32 @@ int main(void)
   int __retres;
   spongeState *state;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& state),8UL);
-  __full_init((void *)(& state));
-  state = (spongeState *)__e_acsl_malloc(sizeof(spongeState));
-  __initialize((void *)(& state->bitsInQueue),sizeof(unsigned int));
+  __e_acsl_store_block((void *)(& state),8UL);
+  __e_acsl_full_init((void *)(& state));
+  state = (spongeState *)__gen_e_acsl_malloc(sizeof(spongeState));
+  __e_acsl_initialize((void *)(& state->bitsInQueue),sizeof(unsigned int));
   state->bitsInQueue = (unsigned int)16;
   /*@ assert ¬\initialized(&state->dataQueue[state->bitsInQueue/8]); */
   {
-    int __e_acsl_valid_read;
-    int __e_acsl_initialized;
-    __e_acsl_valid_read = __valid_read((void *)(& state->bitsInQueue),
-                                       sizeof(unsigned int));
-    __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"main",
+    int __gen_e_acsl_valid_read;
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(& state->bitsInQueue),
+                                                  sizeof(unsigned int));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"main",
                     (char *)"mem_access: \\valid_read(&state->bitsInQueue)",
                     22);
-    __e_acsl_initialized = __initialized((void *)(& state->dataQueue[
-                                         state->bitsInQueue / (unsigned int)8]),
-                                         sizeof(unsigned char __attribute__((
-                                         __aligned__(32)))));
-    __e_acsl_assert(! __e_acsl_initialized,(char *)"Assertion",
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& state->dataQueue[
+                                                    state->bitsInQueue / (unsigned int)8]),
+                                                    sizeof(unsigned char __attribute__((
+                                                    __aligned__(32)))));
+    __e_acsl_assert(! __gen_e_acsl_initialized,(char *)"Assertion",
                     (char *)"main",
                     (char *)"!\\initialized(&state->dataQueue[state->bitsInQueue/8])",
                     22);
   }
-  __e_acsl_free((void *)state);
+  __gen_e_acsl_free((void *)state);
   __retres = 0;
-  __delete_block((void *)(& state));
+  __e_acsl_delete_block((void *)(& state));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c
index b36de9b0ede568e37d44f07e8accb1cbe45b91b5..2f59e51e4e11af6a3b41d530ce459f400702d5b2 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c
@@ -16,14 +16,14 @@ void loop(void)
     requires \valid(global_i_ptr);
     requires global_i_ptr ≡ &global_i;
  */
-void __e_acsl_loop(void)
+void __gen_e_acsl_loop(void)
 {
   {
-    int __e_acsl_valid;
+    int __gen_e_acsl_valid;
     __e_acsl_assert(global_i == 0,(char *)"Precondition",(char *)"loop",
                     (char *)"global_i == 0",9);
-    __e_acsl_valid = __valid((void *)global_i_ptr,sizeof(int));
-    __e_acsl_assert(__e_acsl_valid,(char *)"Precondition",(char *)"loop",
+    __gen_e_acsl_valid = __e_acsl_valid((void *)global_i_ptr,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Precondition",(char *)"loop",
                     (char *)"\\valid(global_i_ptr)",10);
     __e_acsl_assert(global_i_ptr == & global_i,(char *)"Precondition",
                     (char *)"loop",(char *)"global_i_ptr == &global_i",11);
@@ -34,10 +34,10 @@ void __e_acsl_loop(void)
 
 void __e_acsl_globals_init(void)
 {
-  __store_block((void *)(& global_i_ptr),8UL);
-  __full_init((void *)(& global_i_ptr));
-  __store_block((void *)(& global_i),4UL);
-  __full_init((void *)(& global_i));
+  __e_acsl_store_block((void *)(& global_i_ptr),8UL);
+  __e_acsl_full_init((void *)(& global_i_ptr));
+  __e_acsl_store_block((void *)(& global_i),4UL);
+  __e_acsl_full_init((void *)(& global_i));
   return;
 }
 
@@ -46,10 +46,10 @@ int main(void)
   int __retres;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_loop();
+  __gen_e_acsl_loop();
   __retres = 0;
-  __delete_block((void *)(& global_i_ptr));
-  __delete_block((void *)(& global_i));
+  __e_acsl_delete_block((void *)(& global_i_ptr));
+  __e_acsl_delete_block((void *)(& global_i));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
index 1f7dcd91b0373d4e3f956ba15596cf84491d3257..f2027aa6a56a0de6ba676f43adf4fb0df9c8bab2 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
@@ -8,34 +8,35 @@ int main(void)
   struct toto s;
   struct toto *p;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& s),0UL);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& s),0UL);
   /*@ assert \valid(&s); */
   {
-    int __e_acsl_valid;
-    __e_acsl_valid = __valid((void *)(& s),sizeof(struct toto));
-    __e_acsl_assert(__e_acsl_valid,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_valid;
+    __gen_e_acsl_valid = __e_acsl_valid((void *)(& s),sizeof(struct toto));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(&s)",9);
   }
-  __full_init((void *)(& p));
+  __e_acsl_full_init((void *)(& p));
   p = & s;
   /*@ assert \valid(p); */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and;
-    __e_acsl_initialized = __initialized((void *)(& p),sizeof(struct toto *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_valid_2;
-      __e_acsl_valid_2 = __valid((void *)p,sizeof(struct toto));
-      __e_acsl_and = __e_acsl_valid_2;
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
+                                                    sizeof(struct toto *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_2;
+      __gen_e_acsl_valid_2 = __e_acsl_valid((void *)p,sizeof(struct toto));
+      __gen_e_acsl_and = __gen_e_acsl_valid_2;
     }
-    else __e_acsl_and = 0;
-    __e_acsl_assert(__e_acsl_and,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(p)",12);
   }
   __retres = 0;
-  __delete_block((void *)(& p));
-  __delete_block((void *)(& s));
+  __e_acsl_delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(& s));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
index f925f71a738d55176ad79545741961ac8e82735d..7a4d037a6c36b6c0ad4b436150422786c06bab33 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
@@ -5,34 +5,35 @@ int main(void)
   int a;
   int *p;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& a),4UL);
-  __full_init((void *)(& a));
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& a),4UL);
+  __e_acsl_full_init((void *)(& a));
   a = 10;
   goto lbl_1;
   lbl_2:
     /*@ assert \valid(p); */
     {
-      int __e_acsl_initialized;
-      int __e_acsl_and;
-      __e_acsl_initialized = __initialized((void *)(& p),sizeof(int *));
-      if (__e_acsl_initialized) {
-        int __e_acsl_valid;
-        __e_acsl_valid = __valid((void *)p,sizeof(int));
-        __e_acsl_and = __e_acsl_valid;
+      int __gen_e_acsl_initialized;
+      int __gen_e_acsl_and;
+      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
+                                                      sizeof(int *));
+      if (__gen_e_acsl_initialized) {
+        int __gen_e_acsl_valid;
+        __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(int));
+        __gen_e_acsl_and = __gen_e_acsl_valid;
       }
-      else __e_acsl_and = 0;
-      __e_acsl_assert(__e_acsl_and,(char *)"Assertion",(char *)"main",
+      else __gen_e_acsl_and = 0;
+      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
                       (char *)"\\valid(p)",10);
     }
     __retres = 0;
     goto return_label;
-  lbl_1: __full_init((void *)(& p));
+  lbl_1: __e_acsl_full_init((void *)(& p));
   p = & a;
   goto lbl_2;
   return_label:
-    __delete_block((void *)(& p));
-    __delete_block((void *)(& a));
+    __e_acsl_delete_block((void *)(& p));
+    __e_acsl_delete_block((void *)(& a));
     __e_acsl_memory_clean();
     return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
index 947d3ff3898b3cf86070b9a18fabf87284478ebe..abc1a197f25e1e808e8bf978b1ca5477b5679dc9 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
@@ -5,34 +5,35 @@ int main(void)
   int a;
   int *p;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& a),4UL);
-  __full_init((void *)(& a));
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& a),4UL);
+  __e_acsl_full_init((void *)(& a));
   a = 10;
   goto lbl_1;
   lbl_2:
     /*@ assert \valid(p); */
     {
-      int __e_acsl_initialized;
-      int __e_acsl_and;
-      __e_acsl_initialized = __initialized((void *)(& p),sizeof(int *));
-      if (__e_acsl_initialized) {
-        int __e_acsl_valid;
-        __e_acsl_valid = __valid((void *)p,sizeof(int));
-        __e_acsl_and = __e_acsl_valid;
+      int __gen_e_acsl_initialized;
+      int __gen_e_acsl_and;
+      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
+                                                      sizeof(int *));
+      if (__gen_e_acsl_initialized) {
+        int __gen_e_acsl_valid;
+        __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(int));
+        __gen_e_acsl_and = __gen_e_acsl_valid;
       }
-      else __e_acsl_and = 0;
-      __e_acsl_assert(__e_acsl_and,(char *)"Assertion",(char *)"main",
+      else __gen_e_acsl_and = 0;
+      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
                       (char *)"\\valid(p)",13);
     }
     __retres = 0;
     goto return_label;
-  lbl_1: __full_init((void *)(& p));
+  lbl_1: __e_acsl_full_init((void *)(& p));
   p = & a;
   goto lbl_2;
   return_label:
-    __delete_block((void *)(& p));
-    __delete_block((void *)(& a));
+    __e_acsl_delete_block((void *)(& p));
+    __e_acsl_delete_block((void *)(& a));
     __e_acsl_memory_clean();
     return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
index cfc0d20a49646971cbae0e15edb15e70d28c7c08..8b6897bf1304d49b640293c2f3119e4fb705c84c 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
@@ -1,76 +1,80 @@
 /* Generated by Frama-C */
-char *__e_acsl_literal_string_3;
-char *__e_acsl_literal_string;
-char *__e_acsl_literal_string_2;
+char *__gen_e_acsl_literal_string_3;
+char *__gen_e_acsl_literal_string;
+char *__gen_e_acsl_literal_string_2;
 char *S = (char *)"foo";
 int f(void)
 {
   int __retres;
   char *s1;
   char *s2;
-  __store_block((void *)(& s2),8UL);
-  __store_block((void *)(& s1),8UL);
-  __full_init((void *)(& s1));
-  s1 = (char *)__e_acsl_literal_string;
-  __full_init((void *)(& s2));
-  s2 = (char *)__e_acsl_literal_string_2;
+  __e_acsl_store_block((void *)(& s2),8UL);
+  __e_acsl_store_block((void *)(& s1),8UL);
+  __e_acsl_full_init((void *)(& s1));
+  s1 = (char *)__gen_e_acsl_literal_string;
+  __e_acsl_full_init((void *)(& s2));
+  s2 = (char *)__gen_e_acsl_literal_string_2;
   /*@ assert \valid_read(S); */
   {
-    int __e_acsl_valid_read;
-    __e_acsl_valid_read = __valid_read((void *)S,sizeof(char));
-    __e_acsl_assert(__e_acsl_valid_read,(char *)"Assertion",(char *)"f",
+    int __gen_e_acsl_valid_read;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)S,sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"Assertion",(char *)"f",
                     (char *)"\\valid_read(S)",10);
   }
   /*@ assert \valid_read(s1); */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and;
-    __e_acsl_initialized = __initialized((void *)(& s1),sizeof(char *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_valid_read_2;
-      __e_acsl_valid_read_2 = __valid_read((void *)s1,sizeof(char));
-      __e_acsl_and = __e_acsl_valid_read_2;
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& s1),
+                                                    sizeof(char *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_read_2;
+      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)s1,
+                                                      sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid_read_2;
     }
-    else __e_acsl_and = 0;
-    __e_acsl_assert(__e_acsl_and,(char *)"Assertion",(char *)"f",
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"f",
                     (char *)"\\valid_read(s1)",11);
   }
   /*@ assert \valid_read(s2); */
   {
-    int __e_acsl_initialized_2;
-    int __e_acsl_and_2;
-    __e_acsl_initialized_2 = __initialized((void *)(& s2),sizeof(char *));
-    if (__e_acsl_initialized_2) {
-      int __e_acsl_valid_read_3;
-      __e_acsl_valid_read_3 = __valid_read((void *)s2,sizeof(char));
-      __e_acsl_and_2 = __e_acsl_valid_read_3;
+    int __gen_e_acsl_initialized_2;
+    int __gen_e_acsl_and_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& s2),
+                                                      sizeof(char *));
+    if (__gen_e_acsl_initialized_2) {
+      int __gen_e_acsl_valid_read_3;
+      __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)s2,
+                                                      sizeof(char));
+      __gen_e_acsl_and_2 = __gen_e_acsl_valid_read_3;
     }
-    else __e_acsl_and_2 = 0;
-    __e_acsl_assert(__e_acsl_and_2,(char *)"Assertion",(char *)"f",
+    else __gen_e_acsl_and_2 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Assertion",(char *)"f",
                     (char *)"\\valid_read(s2)",12);
   }
   __retres = 0;
-  __delete_block((void *)(& s2));
-  __delete_block((void *)(& s1));
+  __e_acsl_delete_block((void *)(& s2));
+  __e_acsl_delete_block((void *)(& s1));
   return __retres;
 }
 
 void __e_acsl_globals_init(void)
 {
-  __e_acsl_literal_string_3 = "toto";
-  __store_block((void *)__e_acsl_literal_string_3,sizeof("toto"));
-  __full_init((void *)__e_acsl_literal_string_3);
-  __readonly((void *)__e_acsl_literal_string_3);
-  __e_acsl_literal_string = "foo";
-  __store_block((void *)__e_acsl_literal_string,sizeof("foo"));
-  __full_init((void *)__e_acsl_literal_string);
-  __readonly((void *)__e_acsl_literal_string);
-  __e_acsl_literal_string_2 = "bar";
-  __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
-  __full_init((void *)__e_acsl_literal_string_2);
-  __readonly((void *)__e_acsl_literal_string_2);
-  __store_block((void *)(& S),8UL);
-  __full_init((void *)(& S));
+  __gen_e_acsl_literal_string_3 = "toto";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_3,sizeof("toto"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_3);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_3);
+  __gen_e_acsl_literal_string = "foo";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string,sizeof("foo"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string);
+  __gen_e_acsl_literal_string_2 = "bar";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_2,sizeof("bar"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_2);
+  __e_acsl_store_block((void *)(& S),8UL);
+  __e_acsl_full_init((void *)(& S));
   return;
 }
 
@@ -92,43 +96,46 @@ int main(void)
     if (! tmp) break;
     {
       char *s;
-      __store_block((void *)(& s),8UL);
-      __full_init((void *)(& s));
-      s = (char *)__e_acsl_literal_string_3;
+      __e_acsl_store_block((void *)(& s),8UL);
+      __e_acsl_full_init((void *)(& s));
+      s = (char *)__gen_e_acsl_literal_string_3;
       /*@ assert \valid_read(s); */
       {
-        int __e_acsl_initialized;
-        int __e_acsl_and;
-        __e_acsl_initialized = __initialized((void *)(& s),sizeof(char *));
-        if (__e_acsl_initialized) {
-          int __e_acsl_valid_read;
-          __e_acsl_valid_read = __valid_read((void *)s,sizeof(char));
-          __e_acsl_and = __e_acsl_valid_read;
+        int __gen_e_acsl_initialized;
+        int __gen_e_acsl_and;
+        __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& s),
+                                                        sizeof(char *));
+        if (__gen_e_acsl_initialized) {
+          int __gen_e_acsl_valid_read;
+          __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)s,
+                                                        sizeof(char));
+          __gen_e_acsl_and = __gen_e_acsl_valid_read;
         }
-        else __e_acsl_and = 0;
-        __e_acsl_assert(__e_acsl_and,(char *)"Assertion",(char *)"main",
+        else __gen_e_acsl_and = 0;
+        __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
                         (char *)"\\valid_read(s)",20);
       }
       /*@ assert ¬\valid(s); */
       {
-        int __e_acsl_initialized_2;
-        int __e_acsl_and_2;
-        __e_acsl_initialized_2 = __initialized((void *)(& s),sizeof(char *));
-        if (__e_acsl_initialized_2) {
-          int __e_acsl_valid;
-          __e_acsl_valid = __valid((void *)s,sizeof(char));
-          __e_acsl_and_2 = __e_acsl_valid;
+        int __gen_e_acsl_initialized_2;
+        int __gen_e_acsl_and_2;
+        __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& s),
+                                                          sizeof(char *));
+        if (__gen_e_acsl_initialized_2) {
+          int __gen_e_acsl_valid;
+          __gen_e_acsl_valid = __e_acsl_valid((void *)s,sizeof(char));
+          __gen_e_acsl_and_2 = __gen_e_acsl_valid;
         }
-        else __e_acsl_and_2 = 0;
-        __e_acsl_assert(! __e_acsl_and_2,(char *)"Assertion",(char *)"main",
-                        (char *)"!\\valid(s)",21);
-        __delete_block((void *)(& s));
+        else __gen_e_acsl_and_2 = 0;
+        __e_acsl_assert(! __gen_e_acsl_and_2,(char *)"Assertion",
+                        (char *)"main",(char *)"!\\valid(s)",21);
+        __e_acsl_delete_block((void *)(& s));
       }
     }
   }
   f();
   __retres = 0;
-  __delete_block((void *)(& S));
+  __e_acsl_delete_block((void *)(& S));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/call.c b/src/plugins/e-acsl/tests/e-acsl-runtime/call.c
index 322370938d0c0d8eb0f7678bdedf889349b49510..31791edbbd85fb59f677121395fe74ff5672ffc9 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/call.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/call.c
@@ -1,6 +1,6 @@
 /* run.config
    COMMENT: function call
-   STDOPT: +"-val-builtin __malloc:Frama_C_alloc_size -val-builtin __free:Frama_C_free"
+   STDOPT: +"-val-builtin __e_acsl_malloc:Frama_C_alloc_size -val-builtin __e_acsl_free:Frama_C_free"
 */
 
 #include <stdlib.h>
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/freeable.c b/src/plugins/e-acsl/tests/e-acsl-runtime/freeable.c
index 3eeb429e6f0fd2e83b2b4287d0f570bcd2630408..451b910b745b5fb8b282c320b48ff1388dff845a 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/freeable.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/freeable.c
@@ -1,6 +1,6 @@
 /* run.config
    COMMENT: \freeable
-   STDOPT: +"-val-builtin __malloc:Frama_C_alloc_size -val-builtin __free:Frama_C_free"
+   STDOPT: +"-val-builtin __e_acsl_malloc:Frama_C_alloc_size -val-builtin __e_acsl_free:Frama_C_free"
 */
 
 #include <stdlib.h>
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/ghost.i b/src/plugins/e-acsl/tests/e-acsl-runtime/ghost.i
index 5eeadfd89eb866168e82b7d170cb14ce7961cf5d..25bac0977ca40adfb09424b6690a89d483094a50 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/ghost.i
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/ghost.i
@@ -1,6 +1,6 @@
 /* run.config
    COMMENT: ghost code
-   STDOPT: +"-val-builtin __malloc:Frama_C_alloc_size -val-builtin __free:Frama_C_free"
+   STDOPT: +"-val-builtin __e_acsl_malloc:Frama_C_alloc_size -val-builtin __e_acsl_free:Frama_C_free"
 */
 
 /*@ ghost int G = 0; */
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/localvar.c b/src/plugins/e-acsl/tests/e-acsl-runtime/localvar.c
index b5a3aae483b25df30e1815b3880da5915968174e..94288a257058bb8eca53dbc36cabff7db1cad82b 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/localvar.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/localvar.c
@@ -1,6 +1,6 @@
 /* run.config
    COMMENT: allocation and de-allocation of local variables
-   STDOPT: +"-val-builtin __malloc:Frama_C_alloc_size -val-builtin __free:Frama_C_free"
+   STDOPT: +"-val-builtin __e_acsl_malloc:Frama_C_alloc_size -val-builtin __e_acsl_free:Frama_C_free"
 */
 
 #include <stdlib.h>
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/memsize.c b/src/plugins/e-acsl/tests/e-acsl-runtime/memsize.c
index 8322d7982c10ed13c355d7977f2b2b69a809b86c..06095dee47a96f2533d37d21558ab2d76cbd7374 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/memsize.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/memsize.c
@@ -14,58 +14,58 @@
 # endif
 # endif
 
-extern size_t __heap_size;
+extern size_t __e_acsl_heap_size;
 
 int main(int argc, char **argv) {
     // Allocation increases
     char *a = malloc(7);
-    /*@assert (__heap_size == 7);  */
+    /*@assert (__e_acsl_heap_size == 7);  */
     char *b = malloc(14);
-    /*@assert (__heap_size == 21);  */
+    /*@assert (__e_acsl_heap_size == 21);  */
 
     // Allocation decreases
     free(a);
-    /*@assert (__heap_size == 14);  */
+    /*@assert (__e_acsl_heap_size == 14);  */
 
     // Make sure that free with NULL behaves and does not affect allocation
     a = NULL;
     free(a);
-    /*@assert (__heap_size == 14);  */
+    /*@assert (__e_acsl_heap_size == 14);  */
 
     // Realloc decreases allocation
     b = realloc(b, 9);
-    /*@assert (__heap_size == 9);  */
+    /*@assert (__e_acsl_heap_size == 9);  */
 
     // Realloc increases allocation
     b = realloc(b, 18);
-    /*@assert (__heap_size == 18);  */
+    /*@assert (__e_acsl_heap_size == 18);  */
 
     // Realloc with 0 is equivalent to free
     b = realloc(b, 0);
     b = NULL;
-    /*@assert (__heap_size == 0);  */
+    /*@assert (__e_acsl_heap_size == 0);  */
 
     // realloc with 0 is equivalent to malloc
     b = realloc(b, 8);
-    /*@assert (__heap_size == 8);  */
+    /*@assert (__e_acsl_heap_size == 8);  */
 
     // Abandon b and behave like malloc again
     b = realloc(NULL, 8);
-    /*@assert (__heap_size == 16);  */
+    /*@assert (__e_acsl_heap_size == 16);  */
 
     // Make realloc fail by supplying a huge number
     b = realloc(NULL, UINTPTR_MAX);
-    /*@assert (__heap_size == 16);  */
+    /*@assert (__e_acsl_heap_size == 16);  */
     /*@assert (b == NULL);  */
 
     // Same as test for calloc ...
     b = calloc(UINTPTR_MAX,UINTPTR_MAX);
-    /*@assert (__heap_size == 16);  */
+    /*@assert (__e_acsl_heap_size == 16);  */
     /*@assert (b == NULL);  */
 
     // ... and for malloc
     b = malloc(UINTPTR_MAX);
-    /*@assert (__heap_size == 16);  */
+    /*@assert (__e_acsl_heap_size == 16);  */
     /*@assert (b == NULL);  */
     return 0;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/addrOf.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/alias.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/alias.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/alias.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/alias.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/base_addr.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/base_addr.res.oracle
index 2879f19b5f84717a4e15786946db32e32c141c46..83c7478e6cf6ed78092aa99c5cbae115d9b0d06f 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/base_addr.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/base_addr.res.oracle
@@ -13,10 +13,10 @@ FRAMAC_SHARE/libc/stdlib.h:160:[e-acsl] warning: E-ACSL construct `assigns claus
 FRAMAC_SHARE/libc/stdlib.h:165:[e-acsl] warning: E-ACSL construct `logic function application' is not yet supported.
                   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
 tests/e-acsl-runtime/base_addr.c:44:[value] warning: assertion got status unknown.
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/base_addr.c:45:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/base_addr.c:46:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/base_addr.c:48:[value] warning: assertion got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/block_length.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/block_length.res.oracle
index 49f3ff5f2987d0c2c433e7027dad0aeb2bbc084e..aaf253be42065e89d565bca11354ec2e93ec65fe 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/block_length.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/block_length.res.oracle
@@ -13,9 +13,9 @@ FRAMAC_SHARE/libc/stdlib.h:160:[e-acsl] warning: E-ACSL construct `assigns claus
 FRAMAC_SHARE/libc/stdlib.h:165:[e-acsl] warning: E-ACSL construct `logic function application' is not yet supported.
                   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
 tests/e-acsl-runtime/block_length.c:45:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/block_length.c:46:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/block_length.c:48:[value] warning: assertion got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/call.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/call.res.oracle
index 16c5a8010d2ecce24525cab50cd91999d8b095f7..37dcefb337d66f1f39bf4a4dfc18e21c4cb5735a 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/call.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/call.res.oracle
@@ -13,6 +13,6 @@ FRAMAC_SHARE/libc/stdlib.h:160:[e-acsl] warning: E-ACSL construct `assigns claus
 FRAMAC_SHARE/libc/stdlib.h:165:[e-acsl] warning: E-ACSL construct `logic function application' is not yet supported.
                   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/compound_initializers.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/compound_initializers.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/compound_initializers.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/compound_initializers.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf.c
index 71eb9845e69428bd287f67a9890fd0e2c178d6c6..27863938989bbf2eb9d98e2482c7415e676862d5 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_addrOf.c
@@ -4,25 +4,25 @@ void f(void)
   int m;
   int *u;
   int *p;
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& u),8UL);
-  __store_block((void *)(& m),4UL);
-  __full_init((void *)(& u));
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& u),8UL);
+  __e_acsl_store_block((void *)(& m),4UL);
+  __e_acsl_full_init((void *)(& u));
   u = & m;
-  __full_init((void *)(& p));
+  __e_acsl_full_init((void *)(& p));
   p = u;
-  __full_init((void *)(& m));
+  __e_acsl_full_init((void *)(& m));
   m = 123;
   /*@ assert \initialized(p); */
   {
-    int __e_acsl_initialized;
-    __e_acsl_initialized = __initialized((void *)p,sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized,(char *)"Assertion",(char *)"f",
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",(char *)"f",
                     (char *)"\\initialized(p)",10);
   }
-  __delete_block((void *)(& p));
-  __delete_block((void *)(& u));
-  __delete_block((void *)(& m));
+  __e_acsl_delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(& u));
+  __e_acsl_delete_block((void *)(& m));
   return;
 }
 
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_alias.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_alias.c
index 4b3a9dd00736060482a81a064c6518fdb928ca1e..ff07e8528e0a62481d81216fa3eca3dcd2994cab 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_alias.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_alias.c
@@ -2,14 +2,14 @@
 void f(int *dest, int val)
 {
   int *ptr;
-  __store_block((void *)(& ptr),8UL);
-  __store_block((void *)(& dest),8UL);
-  __full_init((void *)(& ptr));
+  __e_acsl_store_block((void *)(& ptr),8UL);
+  __e_acsl_store_block((void *)(& dest),8UL);
+  __e_acsl_full_init((void *)(& ptr));
   ptr = dest;
-  __initialize((void *)ptr,sizeof(int));
+  __e_acsl_initialize((void *)ptr,sizeof(int));
   *ptr = val;
-  __delete_block((void *)(& dest));
-  __delete_block((void *)(& ptr));
+  __e_acsl_delete_block((void *)(& dest));
+  __e_acsl_delete_block((void *)(& ptr));
   return;
 }
 
@@ -18,17 +18,18 @@ int main(void)
   int __retres;
   int i;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& i),4UL);
+  __e_acsl_store_block((void *)(& i),4UL);
   f(& i,255);
   /*@ assert \initialized(&i); */
   {
-    int __e_acsl_initialized;
-    __e_acsl_initialized = __initialized((void *)(& i),sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized,(char *)"Assertion",(char *)"main",
-                    (char *)"\\initialized(&i)",14);
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& i),
+                                                    sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(&i)",14);
   }
   __retres = 0;
-  __delete_block((void *)(& i));
+  __e_acsl_delete_block((void *)(& i));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_base_addr.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_base_addr.c
index 5a3004d842bb5da18197643d068020520aaaf457..8363cb460ba289cab38856923fa012437eb58d0d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_base_addr.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_base_addr.c
@@ -3,10 +3,10 @@ int A[4] = {1, 2, 3, 4};
 int *PA;
 void __e_acsl_globals_init(void)
 {
-  __store_block((void *)(& PA),8UL);
-  __full_init((void *)(& PA));
-  __store_block((void *)(A),16UL);
-  __full_init((void *)(& A));
+  __e_acsl_store_block((void *)(& PA),8UL);
+  __e_acsl_full_init((void *)(& PA));
+  __e_acsl_store_block((void *)(A),16UL);
+  __e_acsl_full_init((void *)(& A));
   return;
 }
 
@@ -24,277 +24,277 @@ int main(void)
   long *qd;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(& qd),8UL);
-  __store_block((void *)(& q),8UL);
-  __store_block((void *)(& pd),8UL);
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& pi),8UL);
-  __store_block((void *)(& pl),8UL);
-  __store_block((void *)(& l),8UL);
-  __store_block((void *)(& pa),8UL);
-  __store_block((void *)(a),16UL);
+  __e_acsl_store_block((void *)(& qd),8UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& pd),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& pi),8UL);
+  __e_acsl_store_block((void *)(& pl),8UL);
+  __e_acsl_store_block((void *)(& l),8UL);
+  __e_acsl_store_block((void *)(& pa),8UL);
+  __e_acsl_store_block((void *)(a),16UL);
   PA = (int *)(& A);
   /*@ assert \base_addr((int *)A) ≡ \base_addr(PA); */
   {
-    void *__e_acsl_base_addr;
-    void *__e_acsl_base_addr_2;
-    __e_acsl_base_addr = __base_addr((void *)(A));
-    __e_acsl_base_addr_2 = __base_addr((void *)PA);
-    __e_acsl_assert(__e_acsl_base_addr == __e_acsl_base_addr_2,
+    void *__gen_e_acsl_base_addr;
+    void *__gen_e_acsl_base_addr_2;
+    __gen_e_acsl_base_addr = __e_acsl_base_addr((void *)(A));
+    __gen_e_acsl_base_addr_2 = __e_acsl_base_addr((void *)PA);
+    __e_acsl_assert(__gen_e_acsl_base_addr == __gen_e_acsl_base_addr_2,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr((int *)A) == \\base_addr(PA)",13);
   }
   /*@ assert \base_addr(&A[3]) ≡ \base_addr(PA); */
   {
-    void *__e_acsl_base_addr_3;
-    void *__e_acsl_base_addr_4;
-    __e_acsl_base_addr_3 = __base_addr((void *)(& A[3]));
-    __e_acsl_base_addr_4 = __base_addr((void *)PA);
-    __e_acsl_assert(__e_acsl_base_addr_3 == __e_acsl_base_addr_4,
+    void *__gen_e_acsl_base_addr_3;
+    void *__gen_e_acsl_base_addr_4;
+    __gen_e_acsl_base_addr_3 = __e_acsl_base_addr((void *)(& A[3]));
+    __gen_e_acsl_base_addr_4 = __e_acsl_base_addr((void *)PA);
+    __e_acsl_assert(__gen_e_acsl_base_addr_3 == __gen_e_acsl_base_addr_4,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(&A[3]) == \\base_addr(PA)",14);
   }
   PA ++;
   /*@ assert \base_addr(PA) ≡ \base_addr((int *)A); */
   {
-    void *__e_acsl_base_addr_5;
-    void *__e_acsl_base_addr_6;
-    __e_acsl_base_addr_5 = __base_addr((void *)PA);
-    __e_acsl_base_addr_6 = __base_addr((void *)(A));
-    __e_acsl_assert(__e_acsl_base_addr_5 == __e_acsl_base_addr_6,
+    void *__gen_e_acsl_base_addr_5;
+    void *__gen_e_acsl_base_addr_6;
+    __gen_e_acsl_base_addr_5 = __e_acsl_base_addr((void *)PA);
+    __gen_e_acsl_base_addr_6 = __e_acsl_base_addr((void *)(A));
+    __e_acsl_assert(__gen_e_acsl_base_addr_5 == __gen_e_acsl_base_addr_6,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(PA) == \\base_addr((int *)A)",16);
   }
   /*@ assert \base_addr(PA+2) ≡ \base_addr(&A[3]); */
   {
-    void *__e_acsl_base_addr_7;
-    void *__e_acsl_base_addr_8;
-    __e_acsl_base_addr_7 = __base_addr((void *)(PA + 2));
-    __e_acsl_base_addr_8 = __base_addr((void *)(& A[3]));
-    __e_acsl_assert(__e_acsl_base_addr_7 == __e_acsl_base_addr_8,
+    void *__gen_e_acsl_base_addr_7;
+    void *__gen_e_acsl_base_addr_8;
+    __gen_e_acsl_base_addr_7 = __e_acsl_base_addr((void *)(PA + 2));
+    __gen_e_acsl_base_addr_8 = __e_acsl_base_addr((void *)(& A[3]));
+    __e_acsl_assert(__gen_e_acsl_base_addr_7 == __gen_e_acsl_base_addr_8,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(PA+2) == \\base_addr(&A[3])",17);
   }
-  __initialize((void *)(a),sizeof(int));
+  __e_acsl_initialize((void *)(a),sizeof(int));
   a[0] = 1;
-  __initialize((void *)(& a[1]),sizeof(int));
+  __e_acsl_initialize((void *)(& a[1]),sizeof(int));
   a[1] = 2;
-  __initialize((void *)(& a[2]),sizeof(int));
+  __e_acsl_initialize((void *)(& a[2]),sizeof(int));
   a[2] = 3;
-  __initialize((void *)(& a[3]),sizeof(int));
+  __e_acsl_initialize((void *)(& a[3]),sizeof(int));
   a[3] = 4;
-  __full_init((void *)(& pa));
+  __e_acsl_full_init((void *)(& pa));
   pa = (int *)(& a);
   /*@ assert \base_addr((int *)a) ≡ \base_addr(pa); */
   {
-    void *__e_acsl_base_addr_9;
-    void *__e_acsl_base_addr_10;
-    __e_acsl_base_addr_9 = __base_addr((void *)(a));
-    __e_acsl_base_addr_10 = __base_addr((void *)pa);
-    __e_acsl_assert(__e_acsl_base_addr_9 == __e_acsl_base_addr_10,
+    void *__gen_e_acsl_base_addr_9;
+    void *__gen_e_acsl_base_addr_10;
+    __gen_e_acsl_base_addr_9 = __e_acsl_base_addr((void *)(a));
+    __gen_e_acsl_base_addr_10 = __e_acsl_base_addr((void *)pa);
+    __e_acsl_assert(__gen_e_acsl_base_addr_9 == __gen_e_acsl_base_addr_10,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr((int *)a) == \\base_addr(pa)",24);
   }
   /*@ assert \base_addr(&a[3]) ≡ \base_addr(pa); */
   {
-    void *__e_acsl_base_addr_11;
-    void *__e_acsl_base_addr_12;
-    __e_acsl_base_addr_11 = __base_addr((void *)(& a[3]));
-    __e_acsl_base_addr_12 = __base_addr((void *)pa);
-    __e_acsl_assert(__e_acsl_base_addr_11 == __e_acsl_base_addr_12,
+    void *__gen_e_acsl_base_addr_11;
+    void *__gen_e_acsl_base_addr_12;
+    __gen_e_acsl_base_addr_11 = __e_acsl_base_addr((void *)(& a[3]));
+    __gen_e_acsl_base_addr_12 = __e_acsl_base_addr((void *)pa);
+    __e_acsl_assert(__gen_e_acsl_base_addr_11 == __gen_e_acsl_base_addr_12,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(&a[3]) == \\base_addr(pa)",25);
   }
-  __full_init((void *)(& pa));
+  __e_acsl_full_init((void *)(& pa));
   pa ++;
   /*@ assert \base_addr(pa) ≡ \base_addr((int *)a); */
   {
-    void *__e_acsl_base_addr_13;
-    void *__e_acsl_base_addr_14;
-    __e_acsl_base_addr_13 = __base_addr((void *)pa);
-    __e_acsl_base_addr_14 = __base_addr((void *)(a));
-    __e_acsl_assert(__e_acsl_base_addr_13 == __e_acsl_base_addr_14,
+    void *__gen_e_acsl_base_addr_13;
+    void *__gen_e_acsl_base_addr_14;
+    __gen_e_acsl_base_addr_13 = __e_acsl_base_addr((void *)pa);
+    __gen_e_acsl_base_addr_14 = __e_acsl_base_addr((void *)(a));
+    __e_acsl_assert(__gen_e_acsl_base_addr_13 == __gen_e_acsl_base_addr_14,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(pa) == \\base_addr((int *)a)",27);
   }
   /*@ assert \base_addr(pa+2) ≡ \base_addr((int *)a); */
   {
-    void *__e_acsl_base_addr_15;
-    void *__e_acsl_base_addr_16;
-    __e_acsl_base_addr_15 = __base_addr((void *)(pa + 2));
-    __e_acsl_base_addr_16 = __base_addr((void *)(a));
-    __e_acsl_assert(__e_acsl_base_addr_15 == __e_acsl_base_addr_16,
+    void *__gen_e_acsl_base_addr_15;
+    void *__gen_e_acsl_base_addr_16;
+    __gen_e_acsl_base_addr_15 = __e_acsl_base_addr((void *)(pa + 2));
+    __gen_e_acsl_base_addr_16 = __e_acsl_base_addr((void *)(a));
+    __e_acsl_assert(__gen_e_acsl_base_addr_15 == __gen_e_acsl_base_addr_16,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(pa+2) == \\base_addr((int *)a)",28);
   }
-  __full_init((void *)(& l));
+  __e_acsl_full_init((void *)(& l));
   l = (long)4;
-  __full_init((void *)(& pl));
+  __e_acsl_full_init((void *)(& pl));
   pl = (char *)(& l);
   /*@ assert \base_addr(&l) ≡ \base_addr(pl); */
   {
-    void *__e_acsl_base_addr_17;
-    void *__e_acsl_base_addr_18;
-    __e_acsl_base_addr_17 = __base_addr((void *)(& l));
-    __e_acsl_base_addr_18 = __base_addr((void *)pl);
-    __e_acsl_assert(__e_acsl_base_addr_17 == __e_acsl_base_addr_18,
+    void *__gen_e_acsl_base_addr_17;
+    void *__gen_e_acsl_base_addr_18;
+    __gen_e_acsl_base_addr_17 = __e_acsl_base_addr((void *)(& l));
+    __gen_e_acsl_base_addr_18 = __e_acsl_base_addr((void *)pl);
+    __e_acsl_assert(__gen_e_acsl_base_addr_17 == __gen_e_acsl_base_addr_18,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(&l) == \\base_addr(pl)",33);
   }
   /*@ assert \base_addr(pl+2) ≡ \base_addr(&l); */
   {
-    void *__e_acsl_base_addr_19;
-    void *__e_acsl_base_addr_20;
-    __e_acsl_base_addr_19 = __base_addr((void *)(pl + 2));
-    __e_acsl_base_addr_20 = __base_addr((void *)(& l));
-    __e_acsl_assert(__e_acsl_base_addr_19 == __e_acsl_base_addr_20,
+    void *__gen_e_acsl_base_addr_19;
+    void *__gen_e_acsl_base_addr_20;
+    __gen_e_acsl_base_addr_19 = __e_acsl_base_addr((void *)(pl + 2));
+    __gen_e_acsl_base_addr_20 = __e_acsl_base_addr((void *)(& l));
+    __e_acsl_assert(__gen_e_acsl_base_addr_19 == __gen_e_acsl_base_addr_20,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(pl+2) == \\base_addr(&l)",34);
   }
-  __full_init((void *)(& pi));
+  __e_acsl_full_init((void *)(& pi));
   pi = (short *)(& l);
-  __full_init((void *)(& pi));
+  __e_acsl_full_init((void *)(& pi));
   pi ++;
-  __full_init((void *)(& pl));
+  __e_acsl_full_init((void *)(& pl));
   pl ++;
   /*@ assert \base_addr(pi) ≡ \base_addr(pl); */
   {
-    void *__e_acsl_base_addr_21;
-    void *__e_acsl_base_addr_22;
-    __e_acsl_base_addr_21 = __base_addr((void *)pi);
-    __e_acsl_base_addr_22 = __base_addr((void *)pl);
-    __e_acsl_assert(__e_acsl_base_addr_21 == __e_acsl_base_addr_22,
+    void *__gen_e_acsl_base_addr_21;
+    void *__gen_e_acsl_base_addr_22;
+    __gen_e_acsl_base_addr_21 = __e_acsl_base_addr((void *)pi);
+    __gen_e_acsl_base_addr_22 = __e_acsl_base_addr((void *)pl);
+    __e_acsl_assert(__gen_e_acsl_base_addr_21 == __gen_e_acsl_base_addr_22,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(pi) == \\base_addr(pl)",38);
   }
   /*@ assert \base_addr(pl) ≡ \base_addr(&l); */
   {
-    void *__e_acsl_base_addr_23;
-    void *__e_acsl_base_addr_24;
-    __e_acsl_base_addr_23 = __base_addr((void *)pl);
-    __e_acsl_base_addr_24 = __base_addr((void *)(& l));
-    __e_acsl_assert(__e_acsl_base_addr_23 == __e_acsl_base_addr_24,
+    void *__gen_e_acsl_base_addr_23;
+    void *__gen_e_acsl_base_addr_24;
+    __gen_e_acsl_base_addr_23 = __e_acsl_base_addr((void *)pl);
+    __gen_e_acsl_base_addr_24 = __e_acsl_base_addr((void *)(& l));
+    __e_acsl_assert(__gen_e_acsl_base_addr_23 == __gen_e_acsl_base_addr_24,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(pl) == \\base_addr(&l)",39);
   }
-  __full_init((void *)(& p));
-  p = (char *)__e_acsl_malloc((unsigned long)12);
-  __full_init((void *)(& pd));
+  __e_acsl_full_init((void *)(& p));
+  p = (char *)__gen_e_acsl_malloc((unsigned long)12);
+  __e_acsl_full_init((void *)(& pd));
   pd = p;
   /*@ assert \base_addr(p) ≡ \base_addr(pd); */
   {
-    void *__e_acsl_base_addr_25;
-    void *__e_acsl_base_addr_26;
-    __e_acsl_base_addr_25 = __base_addr((void *)p);
-    __e_acsl_base_addr_26 = __base_addr((void *)pd);
-    __e_acsl_assert(__e_acsl_base_addr_25 == __e_acsl_base_addr_26,
+    void *__gen_e_acsl_base_addr_25;
+    void *__gen_e_acsl_base_addr_26;
+    __gen_e_acsl_base_addr_25 = __e_acsl_base_addr((void *)p);
+    __gen_e_acsl_base_addr_26 = __e_acsl_base_addr((void *)pd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_25 == __gen_e_acsl_base_addr_26,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(p) == \\base_addr(pd)",44);
   }
   /*@ assert \base_addr(p+1) ≡ \base_addr(pd+5); */
   {
-    void *__e_acsl_base_addr_27;
-    void *__e_acsl_base_addr_28;
-    __e_acsl_base_addr_27 = __base_addr((void *)(p + 1));
-    __e_acsl_base_addr_28 = __base_addr((void *)(pd + 5));
-    __e_acsl_assert(__e_acsl_base_addr_27 == __e_acsl_base_addr_28,
+    void *__gen_e_acsl_base_addr_27;
+    void *__gen_e_acsl_base_addr_28;
+    __gen_e_acsl_base_addr_27 = __e_acsl_base_addr((void *)(p + 1));
+    __gen_e_acsl_base_addr_28 = __e_acsl_base_addr((void *)(pd + 5));
+    __e_acsl_assert(__gen_e_acsl_base_addr_27 == __gen_e_acsl_base_addr_28,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(p+1) == \\base_addr(pd+5)",45);
   }
   /*@ assert \base_addr(p+11) ≡ \base_addr(pd+1); */
   {
-    void *__e_acsl_base_addr_29;
-    void *__e_acsl_base_addr_30;
-    __e_acsl_base_addr_29 = __base_addr((void *)(p + 11));
-    __e_acsl_base_addr_30 = __base_addr((void *)(pd + 1));
-    __e_acsl_assert(__e_acsl_base_addr_29 == __e_acsl_base_addr_30,
+    void *__gen_e_acsl_base_addr_29;
+    void *__gen_e_acsl_base_addr_30;
+    __gen_e_acsl_base_addr_29 = __e_acsl_base_addr((void *)(p + 11));
+    __gen_e_acsl_base_addr_30 = __e_acsl_base_addr((void *)(pd + 1));
+    __e_acsl_assert(__gen_e_acsl_base_addr_29 == __gen_e_acsl_base_addr_30,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(p+11) == \\base_addr(pd+1)",46);
   }
-  __full_init((void *)(& p));
+  __e_acsl_full_init((void *)(& p));
   p += 5;
   /*@ assert \base_addr(p+5) ≡ \base_addr(pd); */
   {
-    void *__e_acsl_base_addr_31;
-    void *__e_acsl_base_addr_32;
-    __e_acsl_base_addr_31 = __base_addr((void *)(p + 5));
-    __e_acsl_base_addr_32 = __base_addr((void *)pd);
-    __e_acsl_assert(__e_acsl_base_addr_31 == __e_acsl_base_addr_32,
+    void *__gen_e_acsl_base_addr_31;
+    void *__gen_e_acsl_base_addr_32;
+    __gen_e_acsl_base_addr_31 = __e_acsl_base_addr((void *)(p + 5));
+    __gen_e_acsl_base_addr_32 = __e_acsl_base_addr((void *)pd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_31 == __gen_e_acsl_base_addr_32,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(p+5) == \\base_addr(pd)",48);
   }
   /*@ assert \base_addr(p-5) ≡ \base_addr(pd); */
   {
-    void *__e_acsl_base_addr_33;
-    void *__e_acsl_base_addr_34;
-    __e_acsl_base_addr_33 = __base_addr((void *)(p - 5));
-    __e_acsl_base_addr_34 = __base_addr((void *)pd);
-    __e_acsl_assert(__e_acsl_base_addr_33 == __e_acsl_base_addr_34,
+    void *__gen_e_acsl_base_addr_33;
+    void *__gen_e_acsl_base_addr_34;
+    __gen_e_acsl_base_addr_33 = __e_acsl_base_addr((void *)(p - 5));
+    __gen_e_acsl_base_addr_34 = __e_acsl_base_addr((void *)pd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_33 == __gen_e_acsl_base_addr_34,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(p-5) == \\base_addr(pd)",49);
   }
-  __full_init((void *)(& q));
-  q = (long *)__e_acsl_malloc((unsigned long)30 * sizeof(long));
-  __full_init((void *)(& qd));
+  __e_acsl_full_init((void *)(& q));
+  q = (long *)__gen_e_acsl_malloc((unsigned long)30 * sizeof(long));
+  __e_acsl_full_init((void *)(& qd));
   qd = q;
   /*@ assert \base_addr(q) ≡ \base_addr(qd); */
   {
-    void *__e_acsl_base_addr_35;
-    void *__e_acsl_base_addr_36;
-    __e_acsl_base_addr_35 = __base_addr((void *)q);
-    __e_acsl_base_addr_36 = __base_addr((void *)qd);
-    __e_acsl_assert(__e_acsl_base_addr_35 == __e_acsl_base_addr_36,
+    void *__gen_e_acsl_base_addr_35;
+    void *__gen_e_acsl_base_addr_36;
+    __gen_e_acsl_base_addr_35 = __e_acsl_base_addr((void *)q);
+    __gen_e_acsl_base_addr_36 = __e_acsl_base_addr((void *)qd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_35 == __gen_e_acsl_base_addr_36,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(q) == \\base_addr(qd)",55);
   }
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q ++;
   /*@ assert \base_addr(q) ≡ \base_addr(qd); */
   {
-    void *__e_acsl_base_addr_37;
-    void *__e_acsl_base_addr_38;
-    __e_acsl_base_addr_37 = __base_addr((void *)q);
-    __e_acsl_base_addr_38 = __base_addr((void *)qd);
-    __e_acsl_assert(__e_acsl_base_addr_37 == __e_acsl_base_addr_38,
+    void *__gen_e_acsl_base_addr_37;
+    void *__gen_e_acsl_base_addr_38;
+    __gen_e_acsl_base_addr_37 = __e_acsl_base_addr((void *)q);
+    __gen_e_acsl_base_addr_38 = __e_acsl_base_addr((void *)qd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_37 == __gen_e_acsl_base_addr_38,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(q) == \\base_addr(qd)",57);
   }
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q += 2;
   /*@ assert \base_addr(q) ≡ \base_addr(qd); */
   {
-    void *__e_acsl_base_addr_39;
-    void *__e_acsl_base_addr_40;
-    __e_acsl_base_addr_39 = __base_addr((void *)q);
-    __e_acsl_base_addr_40 = __base_addr((void *)qd);
-    __e_acsl_assert(__e_acsl_base_addr_39 == __e_acsl_base_addr_40,
+    void *__gen_e_acsl_base_addr_39;
+    void *__gen_e_acsl_base_addr_40;
+    __gen_e_acsl_base_addr_39 = __e_acsl_base_addr((void *)q);
+    __gen_e_acsl_base_addr_40 = __e_acsl_base_addr((void *)qd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_39 == __gen_e_acsl_base_addr_40,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(q) == \\base_addr(qd)",59);
   }
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q += 4;
   /*@ assert \base_addr(q) ≡ \base_addr(qd); */
   {
-    void *__e_acsl_base_addr_41;
-    void *__e_acsl_base_addr_42;
-    __e_acsl_base_addr_41 = __base_addr((void *)q);
-    __e_acsl_base_addr_42 = __base_addr((void *)qd);
-    __e_acsl_assert(__e_acsl_base_addr_41 == __e_acsl_base_addr_42,
+    void *__gen_e_acsl_base_addr_41;
+    void *__gen_e_acsl_base_addr_42;
+    __gen_e_acsl_base_addr_41 = __e_acsl_base_addr((void *)q);
+    __gen_e_acsl_base_addr_42 = __e_acsl_base_addr((void *)qd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_41 == __gen_e_acsl_base_addr_42,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\base_addr(q) == \\base_addr(qd)",61);
   }
   __retres = 0;
-  __delete_block((void *)(& PA));
-  __delete_block((void *)(A));
-  __delete_block((void *)(& qd));
-  __delete_block((void *)(& q));
-  __delete_block((void *)(& pd));
-  __delete_block((void *)(& p));
-  __delete_block((void *)(& pi));
-  __delete_block((void *)(& pl));
-  __delete_block((void *)(& l));
-  __delete_block((void *)(& pa));
-  __delete_block((void *)(a));
+  __e_acsl_delete_block((void *)(& PA));
+  __e_acsl_delete_block((void *)(A));
+  __e_acsl_delete_block((void *)(& qd));
+  __e_acsl_delete_block((void *)(& q));
+  __e_acsl_delete_block((void *)(& pd));
+  __e_acsl_delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(& pi));
+  __e_acsl_delete_block((void *)(& pl));
+  __e_acsl_delete_block((void *)(& l));
+  __e_acsl_delete_block((void *)(& pa));
+  __e_acsl_delete_block((void *)(a));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_block_length.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_block_length.c
index 41fd1e98e531b2ec3e626c3cdd0f52d945d99c40..151a794d210f668e57845d1debd05e613afd5f2c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_block_length.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_block_length.c
@@ -7,12 +7,12 @@ int *PA;
 struct Zero ZERO;
 void __e_acsl_globals_init(void)
 {
-  __store_block((void *)(& ZERO),0UL);
-  __full_init((void *)(& ZERO));
-  __store_block((void *)(& PA),8UL);
-  __full_init((void *)(& PA));
-  __store_block((void *)(A),16UL);
-  __full_init((void *)(& A));
+  __e_acsl_store_block((void *)(& ZERO),0UL);
+  __e_acsl_full_init((void *)(& ZERO));
+  __e_acsl_store_block((void *)(& PA),8UL);
+  __e_acsl_full_init((void *)(& PA));
+  __e_acsl_store_block((void *)(A),16UL);
+  __e_acsl_full_init((void *)(& A));
   return;
 }
 
@@ -30,390 +30,427 @@ int main(void)
   struct Zero zero;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(& zero),0UL);
-  __store_block((void *)(& q),8UL);
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& pi),8UL);
-  __store_block((void *)(& pl),8UL);
-  __store_block((void *)(& l),8UL);
-  __store_block((void *)(& pa),8UL);
-  __store_block((void *)(a),16UL);
+  __e_acsl_store_block((void *)(& zero),0UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& pi),8UL);
+  __e_acsl_store_block((void *)(& pl),8UL);
+  __e_acsl_store_block((void *)(& l),8UL);
+  __e_acsl_store_block((void *)(& pa),8UL);
+  __e_acsl_store_block((void *)(a),16UL);
   PA = (int *)(& A);
   /*@ assert \block_length((int *)A) ≡ sizeof(A); */
   {
-    unsigned long __e_acsl_block_length;
-    mpz_t __e_acsl_block_length_2;
-    mpz_t __e_acsl_sizeof;
-    int __e_acsl_eq;
-    __e_acsl_block_length = __block_length((void *)(A));
-    __gmpz_init_set_ui(__e_acsl_block_length_2,__e_acsl_block_length);
-    __gmpz_init_set_si(__e_acsl_sizeof,16L);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_2),
-                             (__mpz_struct const *)(__e_acsl_sizeof));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length;
+    mpz_t __gen_e_acsl_block_length_2;
+    mpz_t __gen_e_acsl_sizeof;
+    int __gen_e_acsl_eq;
+    __gen_e_acsl_block_length = __e_acsl_block_length((void *)(A));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_2,__gen_e_acsl_block_length);
+    __gmpz_init_set_si(__gen_e_acsl_sizeof,16L);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_2),
+                                 (__mpz_struct const *)(__gen_e_acsl_sizeof));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"\\block_length((int *)A) == sizeof(A)",15);
-    __gmpz_clear(__e_acsl_block_length_2);
-    __gmpz_clear(__e_acsl_sizeof);
+    __gmpz_clear(__gen_e_acsl_block_length_2);
+    __gmpz_clear(__gen_e_acsl_sizeof);
   }
   /*@ assert \block_length(&A[3]) ≡ sizeof(A); */
   {
-    unsigned long __e_acsl_block_length_3;
-    mpz_t __e_acsl_block_length_4;
-    mpz_t __e_acsl_sizeof_2;
-    int __e_acsl_eq_2;
-    __e_acsl_block_length_3 = __block_length((void *)(& A[3]));
-    __gmpz_init_set_ui(__e_acsl_block_length_4,__e_acsl_block_length_3);
-    __gmpz_init_set_si(__e_acsl_sizeof_2,16L);
-    __e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_4),
-                               (__mpz_struct const *)(__e_acsl_sizeof_2));
-    __e_acsl_assert(__e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_3;
+    mpz_t __gen_e_acsl_block_length_4;
+    mpz_t __gen_e_acsl_sizeof_2;
+    int __gen_e_acsl_eq_2;
+    __gen_e_acsl_block_length_3 = __e_acsl_block_length((void *)(& A[3]));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_4,
+                       __gen_e_acsl_block_length_3);
+    __gmpz_init_set_si(__gen_e_acsl_sizeof_2,16L);
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_4),
+                                   (__mpz_struct const *)(__gen_e_acsl_sizeof_2));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length(&A[3]) == sizeof(A)",16);
-    __gmpz_clear(__e_acsl_block_length_4);
-    __gmpz_clear(__e_acsl_sizeof_2);
+    __gmpz_clear(__gen_e_acsl_block_length_4);
+    __gmpz_clear(__gen_e_acsl_sizeof_2);
   }
   /*@ assert \block_length(PA) ≡ sizeof(A); */
   {
-    unsigned long __e_acsl_block_length_5;
-    mpz_t __e_acsl_block_length_6;
-    mpz_t __e_acsl_sizeof_3;
-    int __e_acsl_eq_3;
-    __e_acsl_block_length_5 = __block_length((void *)PA);
-    __gmpz_init_set_ui(__e_acsl_block_length_6,__e_acsl_block_length_5);
-    __gmpz_init_set_si(__e_acsl_sizeof_3,16L);
-    __e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_6),
-                               (__mpz_struct const *)(__e_acsl_sizeof_3));
-    __e_acsl_assert(__e_acsl_eq_3 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\block_length(PA) == sizeof(A)",17);
-    __gmpz_clear(__e_acsl_block_length_6);
-    __gmpz_clear(__e_acsl_sizeof_3);
+    unsigned long __gen_e_acsl_block_length_5;
+    mpz_t __gen_e_acsl_block_length_6;
+    mpz_t __gen_e_acsl_sizeof_3;
+    int __gen_e_acsl_eq_3;
+    __gen_e_acsl_block_length_5 = __e_acsl_block_length((void *)PA);
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_6,
+                       __gen_e_acsl_block_length_5);
+    __gmpz_init_set_si(__gen_e_acsl_sizeof_3,16L);
+    __gen_e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_6),
+                                   (__mpz_struct const *)(__gen_e_acsl_sizeof_3));
+    __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(PA) == sizeof(A)",
+                    17);
+    __gmpz_clear(__gen_e_acsl_block_length_6);
+    __gmpz_clear(__gen_e_acsl_sizeof_3);
   }
   PA ++;
   /*@ assert \block_length(PA+1) ≡ \block_length(&A[1]); */
   {
-    unsigned long __e_acsl_block_length_7;
-    mpz_t __e_acsl_block_length_8;
-    unsigned long __e_acsl_block_length_9;
-    mpz_t __e_acsl_block_length_10;
-    int __e_acsl_eq_4;
-    __e_acsl_block_length_7 = __block_length((void *)(PA + 1));
-    __gmpz_init_set_ui(__e_acsl_block_length_8,__e_acsl_block_length_7);
-    __e_acsl_block_length_9 = __block_length((void *)(& A[1]));
-    __gmpz_init_set_ui(__e_acsl_block_length_10,__e_acsl_block_length_9);
-    __e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_8),
-                               (__mpz_struct const *)(__e_acsl_block_length_10));
-    __e_acsl_assert(__e_acsl_eq_4 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_7;
+    mpz_t __gen_e_acsl_block_length_8;
+    unsigned long __gen_e_acsl_block_length_9;
+    mpz_t __gen_e_acsl_block_length_10;
+    int __gen_e_acsl_eq_4;
+    __gen_e_acsl_block_length_7 = __e_acsl_block_length((void *)(PA + 1));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_8,
+                       __gen_e_acsl_block_length_7);
+    __gen_e_acsl_block_length_9 = __e_acsl_block_length((void *)(& A[1]));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_10,
+                       __gen_e_acsl_block_length_9);
+    __gen_e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_8),
+                                   (__mpz_struct const *)(__gen_e_acsl_block_length_10));
+    __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length(PA+1) == \\block_length(&A[1])",
                     19);
-    __gmpz_clear(__e_acsl_block_length_8);
-    __gmpz_clear(__e_acsl_block_length_10);
+    __gmpz_clear(__gen_e_acsl_block_length_8);
+    __gmpz_clear(__gen_e_acsl_block_length_10);
   }
-  __initialize((void *)(a),sizeof(int));
+  __e_acsl_initialize((void *)(a),sizeof(int));
   a[0] = 1;
-  __initialize((void *)(& a[1]),sizeof(int));
+  __e_acsl_initialize((void *)(& a[1]),sizeof(int));
   a[1] = 2;
-  __initialize((void *)(& a[2]),sizeof(int));
+  __e_acsl_initialize((void *)(& a[2]),sizeof(int));
   a[2] = 3;
-  __initialize((void *)(& a[3]),sizeof(int));
+  __e_acsl_initialize((void *)(& a[3]),sizeof(int));
   a[3] = 4;
-  __full_init((void *)(& pa));
+  __e_acsl_full_init((void *)(& pa));
   pa = (int *)(& a);
   /*@ assert \block_length((int *)a) ≡ sizeof(a); */
   {
-    unsigned long __e_acsl_block_length_11;
-    mpz_t __e_acsl_block_length_12;
-    mpz_t __e_acsl_sizeof_4;
-    int __e_acsl_eq_5;
-    __e_acsl_block_length_11 = __block_length((void *)(a));
-    __gmpz_init_set_ui(__e_acsl_block_length_12,__e_acsl_block_length_11);
-    __gmpz_init_set_si(__e_acsl_sizeof_4,16L);
-    __e_acsl_eq_5 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_12),
-                               (__mpz_struct const *)(__e_acsl_sizeof_4));
-    __e_acsl_assert(__e_acsl_eq_5 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_11;
+    mpz_t __gen_e_acsl_block_length_12;
+    mpz_t __gen_e_acsl_sizeof_4;
+    int __gen_e_acsl_eq_5;
+    __gen_e_acsl_block_length_11 = __e_acsl_block_length((void *)(a));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_12,
+                       __gen_e_acsl_block_length_11);
+    __gmpz_init_set_si(__gen_e_acsl_sizeof_4,16L);
+    __gen_e_acsl_eq_5 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_12),
+                                   (__mpz_struct const *)(__gen_e_acsl_sizeof_4));
+    __e_acsl_assert(__gen_e_acsl_eq_5 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length((int *)a) == sizeof(a)",24);
-    __gmpz_clear(__e_acsl_block_length_12);
-    __gmpz_clear(__e_acsl_sizeof_4);
+    __gmpz_clear(__gen_e_acsl_block_length_12);
+    __gmpz_clear(__gen_e_acsl_sizeof_4);
   }
   /*@ assert \block_length(&a[3]) ≡ sizeof(a); */
   {
-    unsigned long __e_acsl_block_length_13;
-    mpz_t __e_acsl_block_length_14;
-    mpz_t __e_acsl_sizeof_5;
-    int __e_acsl_eq_6;
-    __e_acsl_block_length_13 = __block_length((void *)(& a[3]));
-    __gmpz_init_set_ui(__e_acsl_block_length_14,__e_acsl_block_length_13);
-    __gmpz_init_set_si(__e_acsl_sizeof_5,16L);
-    __e_acsl_eq_6 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_14),
-                               (__mpz_struct const *)(__e_acsl_sizeof_5));
-    __e_acsl_assert(__e_acsl_eq_6 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_13;
+    mpz_t __gen_e_acsl_block_length_14;
+    mpz_t __gen_e_acsl_sizeof_5;
+    int __gen_e_acsl_eq_6;
+    __gen_e_acsl_block_length_13 = __e_acsl_block_length((void *)(& a[3]));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_14,
+                       __gen_e_acsl_block_length_13);
+    __gmpz_init_set_si(__gen_e_acsl_sizeof_5,16L);
+    __gen_e_acsl_eq_6 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_14),
+                                   (__mpz_struct const *)(__gen_e_acsl_sizeof_5));
+    __e_acsl_assert(__gen_e_acsl_eq_6 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length(&a[3]) == sizeof(a)",25);
-    __gmpz_clear(__e_acsl_block_length_14);
-    __gmpz_clear(__e_acsl_sizeof_5);
+    __gmpz_clear(__gen_e_acsl_block_length_14);
+    __gmpz_clear(__gen_e_acsl_sizeof_5);
   }
   /*@ assert \block_length(pa) ≡ sizeof(a); */
   {
-    unsigned long __e_acsl_block_length_15;
-    mpz_t __e_acsl_block_length_16;
-    mpz_t __e_acsl_sizeof_6;
-    int __e_acsl_eq_7;
-    __e_acsl_block_length_15 = __block_length((void *)pa);
-    __gmpz_init_set_ui(__e_acsl_block_length_16,__e_acsl_block_length_15);
-    __gmpz_init_set_si(__e_acsl_sizeof_6,16L);
-    __e_acsl_eq_7 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_16),
-                               (__mpz_struct const *)(__e_acsl_sizeof_6));
-    __e_acsl_assert(__e_acsl_eq_7 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\block_length(pa) == sizeof(a)",26);
-    __gmpz_clear(__e_acsl_block_length_16);
-    __gmpz_clear(__e_acsl_sizeof_6);
+    unsigned long __gen_e_acsl_block_length_15;
+    mpz_t __gen_e_acsl_block_length_16;
+    mpz_t __gen_e_acsl_sizeof_6;
+    int __gen_e_acsl_eq_7;
+    __gen_e_acsl_block_length_15 = __e_acsl_block_length((void *)pa);
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_16,
+                       __gen_e_acsl_block_length_15);
+    __gmpz_init_set_si(__gen_e_acsl_sizeof_6,16L);
+    __gen_e_acsl_eq_7 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_16),
+                                   (__mpz_struct const *)(__gen_e_acsl_sizeof_6));
+    __e_acsl_assert(__gen_e_acsl_eq_7 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(pa) == sizeof(a)",
+                    26);
+    __gmpz_clear(__gen_e_acsl_block_length_16);
+    __gmpz_clear(__gen_e_acsl_sizeof_6);
   }
-  __full_init((void *)(& pa));
+  __e_acsl_full_init((void *)(& pa));
   pa ++;
   /*@ assert \block_length(pa+1) ≡ \block_length(&a[1]); */
   {
-    unsigned long __e_acsl_block_length_17;
-    mpz_t __e_acsl_block_length_18;
-    unsigned long __e_acsl_block_length_19;
-    mpz_t __e_acsl_block_length_20;
-    int __e_acsl_eq_8;
-    __e_acsl_block_length_17 = __block_length((void *)(pa + 1));
-    __gmpz_init_set_ui(__e_acsl_block_length_18,__e_acsl_block_length_17);
-    __e_acsl_block_length_19 = __block_length((void *)(& a[1]));
-    __gmpz_init_set_ui(__e_acsl_block_length_20,__e_acsl_block_length_19);
-    __e_acsl_eq_8 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_18),
-                               (__mpz_struct const *)(__e_acsl_block_length_20));
-    __e_acsl_assert(__e_acsl_eq_8 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_17;
+    mpz_t __gen_e_acsl_block_length_18;
+    unsigned long __gen_e_acsl_block_length_19;
+    mpz_t __gen_e_acsl_block_length_20;
+    int __gen_e_acsl_eq_8;
+    __gen_e_acsl_block_length_17 = __e_acsl_block_length((void *)(pa + 1));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_18,
+                       __gen_e_acsl_block_length_17);
+    __gen_e_acsl_block_length_19 = __e_acsl_block_length((void *)(& a[1]));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_20,
+                       __gen_e_acsl_block_length_19);
+    __gen_e_acsl_eq_8 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_18),
+                                   (__mpz_struct const *)(__gen_e_acsl_block_length_20));
+    __e_acsl_assert(__gen_e_acsl_eq_8 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length(pa+1) == \\block_length(&a[1])",
                     28);
-    __gmpz_clear(__e_acsl_block_length_18);
-    __gmpz_clear(__e_acsl_block_length_20);
+    __gmpz_clear(__gen_e_acsl_block_length_18);
+    __gmpz_clear(__gen_e_acsl_block_length_20);
   }
-  __full_init((void *)(& l));
+  __e_acsl_full_init((void *)(& l));
   l = (long)4;
-  __full_init((void *)(& pl));
+  __e_acsl_full_init((void *)(& pl));
   pl = (char *)(& l);
   /*@ assert \block_length(&l) ≡ sizeof(long); */
   {
-    unsigned long __e_acsl_block_length_21;
-    mpz_t __e_acsl_block_length_22;
-    mpz_t __e_acsl_sizeof_7;
-    int __e_acsl_eq_9;
-    __e_acsl_block_length_21 = __block_length((void *)(& l));
-    __gmpz_init_set_ui(__e_acsl_block_length_22,__e_acsl_block_length_21);
-    __gmpz_init_set_si(__e_acsl_sizeof_7,8L);
-    __e_acsl_eq_9 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_22),
-                               (__mpz_struct const *)(__e_acsl_sizeof_7));
-    __e_acsl_assert(__e_acsl_eq_9 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_21;
+    mpz_t __gen_e_acsl_block_length_22;
+    mpz_t __gen_e_acsl_sizeof_7;
+    int __gen_e_acsl_eq_9;
+    __gen_e_acsl_block_length_21 = __e_acsl_block_length((void *)(& l));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_22,
+                       __gen_e_acsl_block_length_21);
+    __gmpz_init_set_si(__gen_e_acsl_sizeof_7,8L);
+    __gen_e_acsl_eq_9 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_22),
+                                   (__mpz_struct const *)(__gen_e_acsl_sizeof_7));
+    __e_acsl_assert(__gen_e_acsl_eq_9 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length(&l) == sizeof(long)",34);
-    __gmpz_clear(__e_acsl_block_length_22);
-    __gmpz_clear(__e_acsl_sizeof_7);
+    __gmpz_clear(__gen_e_acsl_block_length_22);
+    __gmpz_clear(__gen_e_acsl_sizeof_7);
   }
   /*@ assert \block_length(pl) ≡ sizeof(long); */
   {
-    unsigned long __e_acsl_block_length_23;
-    mpz_t __e_acsl_block_length_24;
-    mpz_t __e_acsl_sizeof_8;
-    int __e_acsl_eq_10;
-    __e_acsl_block_length_23 = __block_length((void *)pl);
-    __gmpz_init_set_ui(__e_acsl_block_length_24,__e_acsl_block_length_23);
-    __gmpz_init_set_si(__e_acsl_sizeof_8,8L);
-    __e_acsl_eq_10 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_24),
-                                (__mpz_struct const *)(__e_acsl_sizeof_8));
-    __e_acsl_assert(__e_acsl_eq_10 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_23;
+    mpz_t __gen_e_acsl_block_length_24;
+    mpz_t __gen_e_acsl_sizeof_8;
+    int __gen_e_acsl_eq_10;
+    __gen_e_acsl_block_length_23 = __e_acsl_block_length((void *)pl);
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_24,
+                       __gen_e_acsl_block_length_23);
+    __gmpz_init_set_si(__gen_e_acsl_sizeof_8,8L);
+    __gen_e_acsl_eq_10 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_24),
+                                    (__mpz_struct const *)(__gen_e_acsl_sizeof_8));
+    __e_acsl_assert(__gen_e_acsl_eq_10 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length(pl) == sizeof(long)",35);
-    __gmpz_clear(__e_acsl_block_length_24);
-    __gmpz_clear(__e_acsl_sizeof_8);
+    __gmpz_clear(__gen_e_acsl_block_length_24);
+    __gmpz_clear(__gen_e_acsl_sizeof_8);
   }
   /*@ assert \block_length(pl+7) ≡ sizeof(long); */
   {
-    unsigned long __e_acsl_block_length_25;
-    mpz_t __e_acsl_block_length_26;
-    mpz_t __e_acsl_sizeof_9;
-    int __e_acsl_eq_11;
-    __e_acsl_block_length_25 = __block_length((void *)(pl + 7));
-    __gmpz_init_set_ui(__e_acsl_block_length_26,__e_acsl_block_length_25);
-    __gmpz_init_set_si(__e_acsl_sizeof_9,8L);
-    __e_acsl_eq_11 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_26),
-                                (__mpz_struct const *)(__e_acsl_sizeof_9));
-    __e_acsl_assert(__e_acsl_eq_11 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_25;
+    mpz_t __gen_e_acsl_block_length_26;
+    mpz_t __gen_e_acsl_sizeof_9;
+    int __gen_e_acsl_eq_11;
+    __gen_e_acsl_block_length_25 = __e_acsl_block_length((void *)(pl + 7));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_26,
+                       __gen_e_acsl_block_length_25);
+    __gmpz_init_set_si(__gen_e_acsl_sizeof_9,8L);
+    __gen_e_acsl_eq_11 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_26),
+                                    (__mpz_struct const *)(__gen_e_acsl_sizeof_9));
+    __e_acsl_assert(__gen_e_acsl_eq_11 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length(pl+7) == sizeof(long)",36);
-    __gmpz_clear(__e_acsl_block_length_26);
-    __gmpz_clear(__e_acsl_sizeof_9);
+    __gmpz_clear(__gen_e_acsl_block_length_26);
+    __gmpz_clear(__gen_e_acsl_sizeof_9);
   }
-  __full_init((void *)(& pi));
+  __e_acsl_full_init((void *)(& pi));
   pi = (int *)(& l);
   /*@ assert \block_length(pi) ≡ \block_length(&l); */
   {
-    unsigned long __e_acsl_block_length_27;
-    mpz_t __e_acsl_block_length_28;
-    unsigned long __e_acsl_block_length_29;
-    mpz_t __e_acsl_block_length_30;
-    int __e_acsl_eq_12;
-    __e_acsl_block_length_27 = __block_length((void *)pi);
-    __gmpz_init_set_ui(__e_acsl_block_length_28,__e_acsl_block_length_27);
-    __e_acsl_block_length_29 = __block_length((void *)(& l));
-    __gmpz_init_set_ui(__e_acsl_block_length_30,__e_acsl_block_length_29);
-    __e_acsl_eq_12 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_28),
-                                (__mpz_struct const *)(__e_acsl_block_length_30));
-    __e_acsl_assert(__e_acsl_eq_12 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_27;
+    mpz_t __gen_e_acsl_block_length_28;
+    unsigned long __gen_e_acsl_block_length_29;
+    mpz_t __gen_e_acsl_block_length_30;
+    int __gen_e_acsl_eq_12;
+    __gen_e_acsl_block_length_27 = __e_acsl_block_length((void *)pi);
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_28,
+                       __gen_e_acsl_block_length_27);
+    __gen_e_acsl_block_length_29 = __e_acsl_block_length((void *)(& l));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_30,
+                       __gen_e_acsl_block_length_29);
+    __gen_e_acsl_eq_12 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_28),
+                                    (__mpz_struct const *)(__gen_e_acsl_block_length_30));
+    __e_acsl_assert(__gen_e_acsl_eq_12 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length(pi) == \\block_length(&l)",38);
-    __gmpz_clear(__e_acsl_block_length_28);
-    __gmpz_clear(__e_acsl_block_length_30);
+    __gmpz_clear(__gen_e_acsl_block_length_28);
+    __gmpz_clear(__gen_e_acsl_block_length_30);
   }
-  __full_init((void *)(& pi));
+  __e_acsl_full_init((void *)(& pi));
   pi ++;
   /*@ assert \block_length(pi) ≡ \block_length(&l); */
   {
-    unsigned long __e_acsl_block_length_31;
-    mpz_t __e_acsl_block_length_32;
-    unsigned long __e_acsl_block_length_33;
-    mpz_t __e_acsl_block_length_34;
-    int __e_acsl_eq_13;
-    __e_acsl_block_length_31 = __block_length((void *)pi);
-    __gmpz_init_set_ui(__e_acsl_block_length_32,__e_acsl_block_length_31);
-    __e_acsl_block_length_33 = __block_length((void *)(& l));
-    __gmpz_init_set_ui(__e_acsl_block_length_34,__e_acsl_block_length_33);
-    __e_acsl_eq_13 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_32),
-                                (__mpz_struct const *)(__e_acsl_block_length_34));
-    __e_acsl_assert(__e_acsl_eq_13 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_31;
+    mpz_t __gen_e_acsl_block_length_32;
+    unsigned long __gen_e_acsl_block_length_33;
+    mpz_t __gen_e_acsl_block_length_34;
+    int __gen_e_acsl_eq_13;
+    __gen_e_acsl_block_length_31 = __e_acsl_block_length((void *)pi);
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_32,
+                       __gen_e_acsl_block_length_31);
+    __gen_e_acsl_block_length_33 = __e_acsl_block_length((void *)(& l));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_34,
+                       __gen_e_acsl_block_length_33);
+    __gen_e_acsl_eq_13 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_32),
+                                    (__mpz_struct const *)(__gen_e_acsl_block_length_34));
+    __e_acsl_assert(__gen_e_acsl_eq_13 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length(pi) == \\block_length(&l)",40);
-    __gmpz_clear(__e_acsl_block_length_32);
-    __gmpz_clear(__e_acsl_block_length_34);
+    __gmpz_clear(__gen_e_acsl_block_length_32);
+    __gmpz_clear(__gen_e_acsl_block_length_34);
   }
   size = (unsigned long)12;
-  __full_init((void *)(& p));
-  p = (char *)__e_acsl_malloc(size);
+  __e_acsl_full_init((void *)(& p));
+  p = (char *)__gen_e_acsl_malloc(size);
   /*@ assert \block_length(p) ≡ size; */
   {
-    unsigned long __e_acsl_block_length_35;
-    mpz_t __e_acsl_block_length_36;
-    mpz_t __e_acsl_size;
-    int __e_acsl_eq_14;
-    __e_acsl_block_length_35 = __block_length((void *)p);
-    __gmpz_init_set_ui(__e_acsl_block_length_36,__e_acsl_block_length_35);
-    __gmpz_init_set_ui(__e_acsl_size,size);
-    __e_acsl_eq_14 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_36),
-                                (__mpz_struct const *)(__e_acsl_size));
-    __e_acsl_assert(__e_acsl_eq_14 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\block_length(p) == size",45);
-    __gmpz_clear(__e_acsl_block_length_36);
-    __gmpz_clear(__e_acsl_size);
+    unsigned long __gen_e_acsl_block_length_35;
+    mpz_t __gen_e_acsl_block_length_36;
+    mpz_t __gen_e_acsl_size;
+    int __gen_e_acsl_eq_14;
+    __gen_e_acsl_block_length_35 = __e_acsl_block_length((void *)p);
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_36,
+                       __gen_e_acsl_block_length_35);
+    __gmpz_init_set_ui(__gen_e_acsl_size,size);
+    __gen_e_acsl_eq_14 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_36),
+                                    (__mpz_struct const *)(__gen_e_acsl_size));
+    __e_acsl_assert(__gen_e_acsl_eq_14 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(p) == size",45);
+    __gmpz_clear(__gen_e_acsl_block_length_36);
+    __gmpz_clear(__gen_e_acsl_size);
   }
   /*@ assert \block_length(p+11) ≡ size; */
   {
-    unsigned long __e_acsl_block_length_37;
-    mpz_t __e_acsl_block_length_38;
-    mpz_t __e_acsl_size_2;
-    int __e_acsl_eq_15;
-    __e_acsl_block_length_37 = __block_length((void *)(p + 11));
-    __gmpz_init_set_ui(__e_acsl_block_length_38,__e_acsl_block_length_37);
-    __gmpz_init_set_ui(__e_acsl_size_2,size);
-    __e_acsl_eq_15 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_38),
-                                (__mpz_struct const *)(__e_acsl_size_2));
-    __e_acsl_assert(__e_acsl_eq_15 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\block_length(p+11) == size",46);
-    __gmpz_clear(__e_acsl_block_length_38);
-    __gmpz_clear(__e_acsl_size_2);
+    unsigned long __gen_e_acsl_block_length_37;
+    mpz_t __gen_e_acsl_block_length_38;
+    mpz_t __gen_e_acsl_size_2;
+    int __gen_e_acsl_eq_15;
+    __gen_e_acsl_block_length_37 = __e_acsl_block_length((void *)(p + 11));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_38,
+                       __gen_e_acsl_block_length_37);
+    __gmpz_init_set_ui(__gen_e_acsl_size_2,size);
+    __gen_e_acsl_eq_15 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_38),
+                                    (__mpz_struct const *)(__gen_e_acsl_size_2));
+    __e_acsl_assert(__gen_e_acsl_eq_15 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(p+11) == size",46);
+    __gmpz_clear(__gen_e_acsl_block_length_38);
+    __gmpz_clear(__gen_e_acsl_size_2);
   }
-  __full_init((void *)(& p));
+  __e_acsl_full_init((void *)(& p));
   p += 5;
   /*@ assert \block_length(p+5) ≡ \block_length(p-5); */
   {
-    unsigned long __e_acsl_block_length_39;
-    mpz_t __e_acsl_block_length_40;
-    unsigned long __e_acsl_block_length_41;
-    mpz_t __e_acsl_block_length_42;
-    int __e_acsl_eq_16;
-    __e_acsl_block_length_39 = __block_length((void *)(p + 5));
-    __gmpz_init_set_ui(__e_acsl_block_length_40,__e_acsl_block_length_39);
-    __e_acsl_block_length_41 = __block_length((void *)(p - 5));
-    __gmpz_init_set_ui(__e_acsl_block_length_42,__e_acsl_block_length_41);
-    __e_acsl_eq_16 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_40),
-                                (__mpz_struct const *)(__e_acsl_block_length_42));
-    __e_acsl_assert(__e_acsl_eq_16 == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length_39;
+    mpz_t __gen_e_acsl_block_length_40;
+    unsigned long __gen_e_acsl_block_length_41;
+    mpz_t __gen_e_acsl_block_length_42;
+    int __gen_e_acsl_eq_16;
+    __gen_e_acsl_block_length_39 = __e_acsl_block_length((void *)(p + 5));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_40,
+                       __gen_e_acsl_block_length_39);
+    __gen_e_acsl_block_length_41 = __e_acsl_block_length((void *)(p - 5));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_42,
+                       __gen_e_acsl_block_length_41);
+    __gen_e_acsl_eq_16 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_40),
+                                    (__mpz_struct const *)(__gen_e_acsl_block_length_42));
+    __e_acsl_assert(__gen_e_acsl_eq_16 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"\\block_length(p+5) == \\block_length(p-5)",48);
-    __gmpz_clear(__e_acsl_block_length_40);
-    __gmpz_clear(__e_acsl_block_length_42);
+    __gmpz_clear(__gen_e_acsl_block_length_40);
+    __gmpz_clear(__gen_e_acsl_block_length_42);
   }
   size = (unsigned long)30 * sizeof(long);
-  __full_init((void *)(& q));
-  q = (long *)__e_acsl_malloc(size);
+  __e_acsl_full_init((void *)(& q));
+  q = (long *)__gen_e_acsl_malloc(size);
   /*@ assert \block_length(q) ≡ size; */
   {
-    unsigned long __e_acsl_block_length_43;
-    mpz_t __e_acsl_block_length_44;
-    mpz_t __e_acsl_size_3;
-    int __e_acsl_eq_17;
-    __e_acsl_block_length_43 = __block_length((void *)q);
-    __gmpz_init_set_ui(__e_acsl_block_length_44,__e_acsl_block_length_43);
-    __gmpz_init_set_ui(__e_acsl_size_3,size);
-    __e_acsl_eq_17 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_44),
-                                (__mpz_struct const *)(__e_acsl_size_3));
-    __e_acsl_assert(__e_acsl_eq_17 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\block_length(q) == size",54);
-    __gmpz_clear(__e_acsl_block_length_44);
-    __gmpz_clear(__e_acsl_size_3);
+    unsigned long __gen_e_acsl_block_length_43;
+    mpz_t __gen_e_acsl_block_length_44;
+    mpz_t __gen_e_acsl_size_3;
+    int __gen_e_acsl_eq_17;
+    __gen_e_acsl_block_length_43 = __e_acsl_block_length((void *)q);
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_44,
+                       __gen_e_acsl_block_length_43);
+    __gmpz_init_set_ui(__gen_e_acsl_size_3,size);
+    __gen_e_acsl_eq_17 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_44),
+                                    (__mpz_struct const *)(__gen_e_acsl_size_3));
+    __e_acsl_assert(__gen_e_acsl_eq_17 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(q) == size",54);
+    __gmpz_clear(__gen_e_acsl_block_length_44);
+    __gmpz_clear(__gen_e_acsl_size_3);
   }
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q += 4;
   /*@ assert \block_length(q) ≡ size; */
   {
-    unsigned long __e_acsl_block_length_45;
-    mpz_t __e_acsl_block_length_46;
-    mpz_t __e_acsl_size_4;
-    int __e_acsl_eq_18;
-    __e_acsl_block_length_45 = __block_length((void *)q);
-    __gmpz_init_set_ui(__e_acsl_block_length_46,__e_acsl_block_length_45);
-    __gmpz_init_set_ui(__e_acsl_size_4,size);
-    __e_acsl_eq_18 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_46),
-                                (__mpz_struct const *)(__e_acsl_size_4));
-    __e_acsl_assert(__e_acsl_eq_18 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\block_length(q) == size",56);
-    __gmpz_clear(__e_acsl_block_length_46);
-    __gmpz_clear(__e_acsl_size_4);
+    unsigned long __gen_e_acsl_block_length_45;
+    mpz_t __gen_e_acsl_block_length_46;
+    mpz_t __gen_e_acsl_size_4;
+    int __gen_e_acsl_eq_18;
+    __gen_e_acsl_block_length_45 = __e_acsl_block_length((void *)q);
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_46,
+                       __gen_e_acsl_block_length_45);
+    __gmpz_init_set_ui(__gen_e_acsl_size_4,size);
+    __gen_e_acsl_eq_18 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_46),
+                                    (__mpz_struct const *)(__gen_e_acsl_size_4));
+    __e_acsl_assert(__gen_e_acsl_eq_18 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(q) == size",56);
+    __gmpz_clear(__gen_e_acsl_block_length_46);
+    __gmpz_clear(__gen_e_acsl_size_4);
   }
   /*@ assert \block_length(&ZERO) ≡ 0; */
   {
-    unsigned long __e_acsl_block_length_47;
-    mpz_t __e_acsl_block_length_48;
-    mpz_t __e_acsl;
-    int __e_acsl_eq_19;
-    __e_acsl_block_length_47 = __block_length((void *)(& ZERO));
-    __gmpz_init_set_ui(__e_acsl_block_length_48,__e_acsl_block_length_47);
-    __gmpz_init_set_si(__e_acsl,(long)0);
-    __e_acsl_eq_19 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_48),
-                                (__mpz_struct const *)(__e_acsl));
-    __e_acsl_assert(__e_acsl_eq_19 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\block_length(&ZERO) == 0",60);
-    __gmpz_clear(__e_acsl_block_length_48);
-    __gmpz_clear(__e_acsl);
+    unsigned long __gen_e_acsl_block_length_47;
+    mpz_t __gen_e_acsl_block_length_48;
+    mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq_19;
+    __gen_e_acsl_block_length_47 = __e_acsl_block_length((void *)(& ZERO));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_48,
+                       __gen_e_acsl_block_length_47);
+    __gmpz_init_set_si(__gen_e_acsl_,(long)0);
+    __gen_e_acsl_eq_19 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_48),
+                                    (__mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq_19 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(&ZERO) == 0",60);
+    __gmpz_clear(__gen_e_acsl_block_length_48);
+    __gmpz_clear(__gen_e_acsl_);
   }
   /*@ assert \block_length(&zero) ≡ 0; */
   {
-    unsigned long __e_acsl_block_length_49;
-    mpz_t __e_acsl_block_length_50;
-    mpz_t __e_acsl_2;
-    int __e_acsl_eq_20;
-    __e_acsl_block_length_49 = __block_length((void *)(& zero));
-    __gmpz_init_set_ui(__e_acsl_block_length_50,__e_acsl_block_length_49);
-    __gmpz_init_set_si(__e_acsl_2,(long)0);
-    __e_acsl_eq_20 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_50),
-                                (__mpz_struct const *)(__e_acsl_2));
-    __e_acsl_assert(__e_acsl_eq_20 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\block_length(&zero) == 0",61);
-    __gmpz_clear(__e_acsl_block_length_50);
-    __gmpz_clear(__e_acsl_2);
+    unsigned long __gen_e_acsl_block_length_49;
+    mpz_t __gen_e_acsl_block_length_50;
+    mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_eq_20;
+    __gen_e_acsl_block_length_49 = __e_acsl_block_length((void *)(& zero));
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_50,
+                       __gen_e_acsl_block_length_49);
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)0);
+    __gen_e_acsl_eq_20 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_50),
+                                    (__mpz_struct const *)(__gen_e_acsl__2));
+    __e_acsl_assert(__gen_e_acsl_eq_20 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(&zero) == 0",61);
+    __gmpz_clear(__gen_e_acsl_block_length_50);
+    __gmpz_clear(__gen_e_acsl__2);
   }
   __retres = 0;
-  __delete_block((void *)(& ZERO));
-  __delete_block((void *)(& PA));
-  __delete_block((void *)(A));
-  __delete_block((void *)(& zero));
-  __delete_block((void *)(& q));
-  __delete_block((void *)(& p));
-  __delete_block((void *)(& pi));
-  __delete_block((void *)(& pl));
-  __delete_block((void *)(& l));
-  __delete_block((void *)(& pa));
-  __delete_block((void *)(a));
+  __e_acsl_delete_block((void *)(& ZERO));
+  __e_acsl_delete_block((void *)(& PA));
+  __e_acsl_delete_block((void *)(A));
+  __e_acsl_delete_block((void *)(& zero));
+  __e_acsl_delete_block((void *)(& q));
+  __e_acsl_delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(& pi));
+  __e_acsl_delete_block((void *)(& pl));
+  __e_acsl_delete_block((void *)(& l));
+  __e_acsl_delete_block((void *)(& pa));
+  __e_acsl_delete_block((void *)(a));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_call.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_call.c
index 11d16adfb95a3cb347ea8c506d44c5e19fa0a63b..c93d124df956e8ace69689cab6a599dc68dd8e78 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_call.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_call.c
@@ -2,31 +2,31 @@
 /*@ ensures \valid(\result); */
 int *f(int *x, int *y)
 {
-  __store_block((void *)(& x),8UL);
-  __store_block((void *)(& y),8UL);
-  __initialize((void *)y,sizeof(int));
+  __e_acsl_store_block((void *)(& x),8UL);
+  __e_acsl_store_block((void *)(& y),8UL);
+  __e_acsl_initialize((void *)y,sizeof(int));
   *y = 1;
-  __delete_block((void *)(& x));
-  __delete_block((void *)(& y));
+  __e_acsl_delete_block((void *)(& x));
+  __e_acsl_delete_block((void *)(& y));
   return x;
 }
 
 /*@ ensures \valid(\result); */
-int *__e_acsl_f(int *x, int *y)
+int *__gen_e_acsl_f(int *x, int *y)
 {
   int *__retres;
-  __store_block((void *)(& __retres),8UL);
-  __store_block((void *)(& x),8UL);
-  __store_block((void *)(& y),8UL);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& x),8UL);
+  __e_acsl_store_block((void *)(& y),8UL);
   __retres = f(x,y);
   {
-    int __e_acsl_valid;
-    __e_acsl_valid = __valid((void *)__retres,sizeof(int));
-    __e_acsl_assert(__e_acsl_valid,(char *)"Postcondition",(char *)"f",
+    int __gen_e_acsl_valid;
+    __gen_e_acsl_valid = __e_acsl_valid((void *)__retres,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Postcondition",(char *)"f",
                     (char *)"\\valid(\\result)",10);
-    __delete_block((void *)(& x));
-    __delete_block((void *)(& y));
-    __delete_block((void *)(& __retres));
+    __e_acsl_delete_block((void *)(& x));
+    __e_acsl_delete_block((void *)(& y));
+    __e_acsl_delete_block((void *)(& __retres));
     return __retres;
   }
 }
@@ -39,22 +39,22 @@ int main(void)
   int *q;
   int *r;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& q),8UL);
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& x),4UL);
-  __full_init((void *)(& x));
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& x),4UL);
+  __e_acsl_full_init((void *)(& x));
   x = 0;
-  __full_init((void *)(& q));
-  q = (int *)__e_acsl_malloc(sizeof(int));
-  r = (int *)__e_acsl_malloc(sizeof(int));
-  __full_init((void *)(& p));
-  p = __e_acsl_f(& x,q);
-  __full_init((void *)(& q));
-  q = __e_acsl_f(& x,r);
+  __e_acsl_full_init((void *)(& q));
+  q = (int *)__gen_e_acsl_malloc(sizeof(int));
+  r = (int *)__gen_e_acsl_malloc(sizeof(int));
+  __e_acsl_full_init((void *)(& p));
+  p = __gen_e_acsl_f(& x,q);
+  __e_acsl_full_init((void *)(& q));
+  q = __gen_e_acsl_f(& x,r);
   __retres = 0;
-  __delete_block((void *)(& q));
-  __delete_block((void *)(& p));
-  __delete_block((void *)(& x));
+  __e_acsl_delete_block((void *)(& q));
+  __e_acsl_delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(& x));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_compound_initializers.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_compound_initializers.c
index c543120ba0d1f7c9632516262b0e752338a54675..41873f0f48f0e3c981556b96a3b6184398da43f4 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_compound_initializers.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_compound_initializers.c
@@ -1,9 +1,9 @@
 /* Generated by Frama-C */
-char *__e_acsl_literal_string_3;
-char *__e_acsl_literal_string;
-char *__e_acsl_literal_string_2;
-char *__e_acsl_literal_string_4;
-char *__e_acsl_literal_string_5;
+char *__gen_e_acsl_literal_string_3;
+char *__gen_e_acsl_literal_string;
+char *__gen_e_acsl_literal_string_2;
+char *__gen_e_acsl_literal_string_4;
+char *__gen_e_acsl_literal_string_5;
 struct ST {
    char *str ;
    int num ;
@@ -20,40 +20,41 @@ struct ST _G[2] =
   {{.str = (char *)"First", .num = 99}, {.str = (char *)"Second", .num = 147}};
 void __e_acsl_globals_init(void)
 {
-  __e_acsl_literal_string_3 = "ZZ";
-  __store_block((void *)__e_acsl_literal_string_3,sizeof("ZZ"));
-  __full_init((void *)__e_acsl_literal_string_3);
-  __readonly((void *)__e_acsl_literal_string_3);
-  __e_acsl_literal_string = "YY";
-  __store_block((void *)__e_acsl_literal_string,sizeof("YY"));
-  __full_init((void *)__e_acsl_literal_string);
-  __readonly((void *)__e_acsl_literal_string);
-  __e_acsl_literal_string_2 = "XX";
-  __store_block((void *)__e_acsl_literal_string_2,sizeof("XX"));
-  __full_init((void *)__e_acsl_literal_string_2);
-  __readonly((void *)__e_acsl_literal_string_2);
-  __e_acsl_literal_string_4 = "Second";
-  __store_block((void *)__e_acsl_literal_string_4,sizeof("Second"));
-  __full_init((void *)__e_acsl_literal_string_4);
-  __readonly((void *)__e_acsl_literal_string_4);
-  __e_acsl_literal_string_5 = "First";
-  __store_block((void *)__e_acsl_literal_string_5,sizeof("First"));
-  __full_init((void *)__e_acsl_literal_string_5);
-  __readonly((void *)__e_acsl_literal_string_5);
-  __store_block((void *)(_G),32UL);
-  __full_init((void *)(& _G));
-  __store_block((void *)(& _E),4UL);
-  __full_init((void *)(& _E));
-  __store_block((void *)(_D),8UL);
-  __full_init((void *)(& _D));
-  __store_block((void *)(& _C),8UL);
-  __full_init((void *)(& _C));
-  __store_block((void *)(& _B),8UL);
-  __full_init((void *)(& _B));
-  __store_block((void *)(_A),16UL);
-  __full_init((void *)(& _A));
-  __store_block((void *)(& _F),4UL);
-  __full_init((void *)(& _F));
+  __gen_e_acsl_literal_string_3 = "ZZ";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_3,sizeof("ZZ"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_3);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_3);
+  __gen_e_acsl_literal_string = "YY";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string,sizeof("YY"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string);
+  __gen_e_acsl_literal_string_2 = "XX";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_2,sizeof("XX"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_2);
+  __gen_e_acsl_literal_string_4 = "Second";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_4,
+                       sizeof("Second"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_4);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_4);
+  __gen_e_acsl_literal_string_5 = "First";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_5,sizeof("First"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_5);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_5);
+  __e_acsl_store_block((void *)(_G),32UL);
+  __e_acsl_full_init((void *)(& _G));
+  __e_acsl_store_block((void *)(& _E),4UL);
+  __e_acsl_full_init((void *)(& _E));
+  __e_acsl_store_block((void *)(_D),8UL);
+  __e_acsl_full_init((void *)(& _D));
+  __e_acsl_store_block((void *)(& _C),8UL);
+  __e_acsl_full_init((void *)(& _C));
+  __e_acsl_store_block((void *)(& _B),8UL);
+  __e_acsl_full_init((void *)(& _B));
+  __e_acsl_store_block((void *)(_A),16UL);
+  __e_acsl_full_init((void *)(& _A));
+  __e_acsl_store_block((void *)(& _F),4UL);
+  __e_acsl_full_init((void *)(& _F));
   return;
 }
 
@@ -64,72 +65,76 @@ int main(int argc, char **argv)
   __e_acsl_globals_init();
   /*@ assert \valid((char **)_A); */
   {
-    int __e_acsl_valid;
-    __e_acsl_valid = __valid((void *)(_A),sizeof(char *));
-    __e_acsl_assert(__e_acsl_valid,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_valid;
+    __gen_e_acsl_valid = __e_acsl_valid((void *)(_A),sizeof(char *));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid((char **)_A)",33);
   }
   /*@ assert \valid_read(_A[0]); */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and;
-    __e_acsl_initialized = __initialized((void *)(_A),sizeof(char *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_valid_read;
-      __e_acsl_valid_read = __valid_read((void *)_A[0],sizeof(char));
-      __e_acsl_and = __e_acsl_valid_read;
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(_A),
+                                                    sizeof(char *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_read;
+      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)_A[0],
+                                                    sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid_read;
     }
-    else __e_acsl_and = 0;
-    __e_acsl_assert(__e_acsl_and,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid_read(_A[0])",34);
   }
   /*@ assert \valid_read(_A[1]); */
   {
-    int __e_acsl_initialized_2;
-    int __e_acsl_and_2;
-    __e_acsl_initialized_2 = __initialized((void *)(& _A[1]),sizeof(char *));
-    if (__e_acsl_initialized_2) {
-      int __e_acsl_valid_read_2;
-      __e_acsl_valid_read_2 = __valid_read((void *)_A[1],sizeof(char));
-      __e_acsl_and_2 = __e_acsl_valid_read_2;
+    int __gen_e_acsl_initialized_2;
+    int __gen_e_acsl_and_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& _A[1]),
+                                                      sizeof(char *));
+    if (__gen_e_acsl_initialized_2) {
+      int __gen_e_acsl_valid_read_2;
+      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)_A[1],
+                                                      sizeof(char));
+      __gen_e_acsl_and_2 = __gen_e_acsl_valid_read_2;
     }
-    else __e_acsl_and_2 = 0;
-    __e_acsl_assert(__e_acsl_and_2,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_2 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid_read(_A[1])",35);
   }
   /*@ assert \valid_read(_B); */
   {
-    int __e_acsl_valid_read_3;
-    __e_acsl_valid_read_3 = __valid_read((void *)_B,sizeof(char));
-    __e_acsl_assert(__e_acsl_valid_read_3,(char *)"Assertion",(char *)"main",
-                    (char *)"\\valid_read(_B)",36);
+    int __gen_e_acsl_valid_read_3;
+    __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)_B,sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"Assertion",
+                    (char *)"main",(char *)"\\valid_read(_B)",36);
   }
   /*@ assert \valid(&_C); */
   {
-    int __e_acsl_valid_2;
-    __e_acsl_valid_2 = __valid((void *)(& _C),sizeof(char *));
-    __e_acsl_assert(__e_acsl_valid_2,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_valid_2;
+    __gen_e_acsl_valid_2 = __e_acsl_valid((void *)(& _C),sizeof(char *));
+    __e_acsl_assert(__gen_e_acsl_valid_2,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(&_C)",37);
   }
   /*@ assert \valid((int *)_D); */
   {
-    int __e_acsl_valid_3;
-    __e_acsl_valid_3 = __valid((void *)(_D),sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_3,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_valid_3;
+    __gen_e_acsl_valid_3 = __e_acsl_valid((void *)(_D),sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_3,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid((int *)_D)",38);
   }
   /*@ assert \valid(&_E); */
   {
-    int __e_acsl_valid_4;
-    __e_acsl_valid_4 = __valid((void *)(& _E),sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_4,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_valid_4;
+    __gen_e_acsl_valid_4 = __e_acsl_valid((void *)(& _E),sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_4,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(&_E)",39);
   }
   /*@ assert \valid(&_F); */
   {
-    int __e_acsl_valid_5;
-    __e_acsl_valid_5 = __valid((void *)(& _F),sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_5,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_valid_5;
+    __gen_e_acsl_valid_5 = __e_acsl_valid((void *)(& _F),sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_5,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(&_F)",40);
   }
   /*@ assert _E ≡ 44; */
@@ -137,22 +142,23 @@ int main(int argc, char **argv)
                   (char *)"_E == 44",41);
   /*@ assert \valid(&_G); */
   {
-    int __e_acsl_valid_6;
-    __e_acsl_valid_6 = __valid((void *)(& _G),sizeof(struct ST [2]));
-    __e_acsl_assert(__e_acsl_valid_6,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_valid_6;
+    __gen_e_acsl_valid_6 = __e_acsl_valid((void *)(& _G),
+                                          sizeof(struct ST [2]));
+    __e_acsl_assert(__gen_e_acsl_valid_6,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(&_G)",42);
   }
   /*@ assert _G[0].num ≡ 99; */
   __e_acsl_assert(_G[0].num == 99,(char *)"Assertion",(char *)"main",
                   (char *)"_G[0].num == 99",43);
   __retres = 0;
-  __delete_block((void *)(_G));
-  __delete_block((void *)(& _E));
-  __delete_block((void *)(_D));
-  __delete_block((void *)(& _C));
-  __delete_block((void *)(& _B));
-  __delete_block((void *)(_A));
-  __delete_block((void *)(& _F));
+  __e_acsl_delete_block((void *)(_G));
+  __e_acsl_delete_block((void *)(& _E));
+  __e_acsl_delete_block((void *)(_D));
+  __e_acsl_delete_block((void *)(& _C));
+  __e_acsl_delete_block((void *)(& _B));
+  __e_acsl_delete_block((void *)(_A));
+  __e_acsl_delete_block((void *)(& _F));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_freeable.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_freeable.c
index e648aba7240f9e4e6947fc90e9ea2c08a09011c0..9292547138fd27eaacddded42dcf3c67f3ee1755 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_freeable.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_freeable.c
@@ -2,8 +2,8 @@
 char array[1024];
 void __e_acsl_globals_init(void)
 {
-  __store_block((void *)(array),1024UL);
-  __full_init((void *)(& array));
+  __e_acsl_store_block((void *)(array),1024UL);
+  __e_acsl_full_init((void *)(& array));
   return;
 }
 
@@ -13,63 +13,63 @@ int main(void)
   int *p;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   /*@ assert ¬\freeable(p); */
   {
-    int __e_acsl_freeable;
+    int __gen_e_acsl_freeable;
     /*@ assert Value: initialisation: \initialized(&p); */
-    __e_acsl_freeable = __freeable((void *)p);
-    __e_acsl_assert(! __e_acsl_freeable,(char *)"Assertion",(char *)"main",
-                    (char *)"!\\freeable(p)",15);
+    __gen_e_acsl_freeable = __e_acsl_freeable((void *)p);
+    __e_acsl_assert(! __gen_e_acsl_freeable,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\freeable(p)",15);
   }
   /*@ assert ¬\freeable((void *)0); */
   {
-    int __e_acsl_freeable_2;
-    __e_acsl_freeable_2 = __freeable((void *)0);
-    __e_acsl_assert(! __e_acsl_freeable_2,(char *)"Assertion",(char *)"main",
-                    (char *)"!\\freeable((void *)0)",16);
+    int __gen_e_acsl_freeable_2;
+    __gen_e_acsl_freeable_2 = __e_acsl_freeable((void *)0);
+    __e_acsl_assert(! __gen_e_acsl_freeable_2,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\freeable((void *)0)",16);
   }
-  __full_init((void *)(& p));
-  p = (int *)__e_acsl_malloc((unsigned long)4 * sizeof(int));
+  __e_acsl_full_init((void *)(& p));
+  p = (int *)__gen_e_acsl_malloc((unsigned long)4 * sizeof(int));
   /*@ assert ¬\freeable(p+1); */
   {
-    int __e_acsl_freeable_3;
-    __e_acsl_freeable_3 = __freeable((void *)(p + 1));
-    __e_acsl_assert(! __e_acsl_freeable_3,(char *)"Assertion",(char *)"main",
-                    (char *)"!\\freeable(p+1)",18);
+    int __gen_e_acsl_freeable_3;
+    __gen_e_acsl_freeable_3 = __e_acsl_freeable((void *)(p + 1));
+    __e_acsl_assert(! __gen_e_acsl_freeable_3,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\freeable(p+1)",18);
   }
   /*@ assert \freeable(p); */
   {
-    int __e_acsl_freeable_4;
-    __e_acsl_freeable_4 = __freeable((void *)p);
-    __e_acsl_assert(__e_acsl_freeable_4,(char *)"Assertion",(char *)"main",
-                    (char *)"\\freeable(p)",19);
+    int __gen_e_acsl_freeable_4;
+    __gen_e_acsl_freeable_4 = __e_acsl_freeable((void *)p);
+    __e_acsl_assert(__gen_e_acsl_freeable_4,(char *)"Assertion",
+                    (char *)"main",(char *)"\\freeable(p)",19);
   }
-  __e_acsl_free((void *)p);
+  __gen_e_acsl_free((void *)p);
   /*@ assert ¬\freeable(p); */
   {
-    int __e_acsl_freeable_5;
-    __e_acsl_freeable_5 = __freeable((void *)p);
-    __e_acsl_assert(! __e_acsl_freeable_5,(char *)"Assertion",(char *)"main",
-                    (char *)"!\\freeable(p)",21);
+    int __gen_e_acsl_freeable_5;
+    __gen_e_acsl_freeable_5 = __e_acsl_freeable((void *)p);
+    __e_acsl_assert(! __gen_e_acsl_freeable_5,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\freeable(p)",21);
   }
   /*@ assert ¬\freeable((char *)array); */
   {
-    int __e_acsl_freeable_6;
-    __e_acsl_freeable_6 = __freeable((void *)(array));
-    __e_acsl_assert(! __e_acsl_freeable_6,(char *)"Assertion",(char *)"main",
-                    (char *)"!\\freeable((char *)array)",24);
+    int __gen_e_acsl_freeable_6;
+    __gen_e_acsl_freeable_6 = __e_acsl_freeable((void *)(array));
+    __e_acsl_assert(! __gen_e_acsl_freeable_6,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\freeable((char *)array)",24);
   }
   /*@ assert ¬\freeable(&array[5]); */
   {
-    int __e_acsl_freeable_7;
-    __e_acsl_freeable_7 = __freeable((void *)(& array[5]));
-    __e_acsl_assert(! __e_acsl_freeable_7,(char *)"Assertion",(char *)"main",
-                    (char *)"!\\freeable(&array[5])",25);
+    int __gen_e_acsl_freeable_7;
+    __gen_e_acsl_freeable_7 = __e_acsl_freeable((void *)(& array[5]));
+    __e_acsl_assert(! __gen_e_acsl_freeable_7,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\freeable(&array[5])",25);
   }
   __retres = 0;
-  __delete_block((void *)(array));
-  __delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(array));
+  __e_acsl_delete_block((void *)(& p));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract.c
index 83e0f47ee457972a5e7d0711b53f3d5cc7f3705f..eef5c27e687b43a0ba7be444ba78276a01481d91 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_function_contract.c
@@ -9,7 +9,7 @@ void f(void)
 }
 
 /*@ ensures X ≡ 1; */
-void __e_acsl_f(void)
+void __gen_e_acsl_f(void)
 {
   f();
   __e_acsl_assert(X == 1,(char *)"Postcondition",(char *)"f",
@@ -27,7 +27,7 @@ void g(void)
 
 /*@ ensures X ≡ 2;
     ensures Y ≡ 2; */
-void __e_acsl_g(void)
+void __gen_e_acsl_g(void)
 {
   g();
   __e_acsl_assert(X == 2,(char *)"Postcondition",(char *)"g",
@@ -45,7 +45,7 @@ void h(void)
 }
 
 /*@ requires X ≡ 2; */
-void __e_acsl_h(void)
+void __gen_e_acsl_h(void)
 {
   __e_acsl_assert(X == 2,(char *)"Precondition",(char *)"h",(char *)"X == 2",
                   17);
@@ -63,7 +63,7 @@ void i(void)
 
 /*@ requires X ≡ 3;
     requires Y ≡ 2; */
-void __e_acsl_i(void)
+void __gen_e_acsl_i(void)
 {
   __e_acsl_assert(X == 3,(char *)"Precondition",(char *)"i",(char *)"X == 3",
                   21);
@@ -97,7 +97,7 @@ void j(void)
       requires Y ≡ 2;
       ensures X ≡ Y+1;
  */
-void __e_acsl_j(void)
+void __gen_e_acsl_j(void)
 {
   __e_acsl_assert(X == 5,(char *)"Precondition",(char *)"j",(char *)"X == 5",
                   27);
@@ -139,27 +139,28 @@ void k(void)
       requires X ≡ 3;
       requires X+Y ≡ 5;
  */
-void __e_acsl_k(void)
+void __gen_e_acsl_k(void)
 {
   {
-    int __e_acsl_implies;
-    int __e_acsl_and;
-    int __e_acsl_implies_2;
-    int __e_acsl_and_2;
-    int __e_acsl_implies_3;
-    if (! (X == 1)) __e_acsl_implies = 1; else __e_acsl_implies = X == 0;
-    __e_acsl_assert(__e_acsl_implies,(char *)"Precondition",(char *)"k",
+    int __gen_e_acsl_implies;
+    int __gen_e_acsl_and;
+    int __gen_e_acsl_implies_2;
+    int __gen_e_acsl_and_2;
+    int __gen_e_acsl_implies_3;
+    if (! (X == 1)) __gen_e_acsl_implies = 1;
+    else __gen_e_acsl_implies = X == 0;
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Precondition",(char *)"k",
                     (char *)"X == 1 ==> X == 0",38);
-    if (X == 3) __e_acsl_and = Y == 2; else __e_acsl_and = 0;
-    if (! __e_acsl_and) __e_acsl_implies_2 = 1;
-    else __e_acsl_implies_2 = X == 3;
-    __e_acsl_assert(__e_acsl_implies_2,(char *)"Precondition",(char *)"k",
-                    (char *)"X == 3 && Y == 2 ==> X == 3",42);
-    if (X == 3) __e_acsl_and_2 = Y == 2; else __e_acsl_and_2 = 0;
-    if (! __e_acsl_and_2) __e_acsl_implies_3 = 1;
-    else __e_acsl_implies_3 = (long)X + (long)Y == (long)5;
-    __e_acsl_assert(__e_acsl_implies_3,(char *)"Precondition",(char *)"k",
-                    (char *)"X == 3 && Y == 2 ==> X+Y == 5",43);
+    if (X == 3) __gen_e_acsl_and = Y == 2; else __gen_e_acsl_and = 0;
+    if (! __gen_e_acsl_and) __gen_e_acsl_implies_2 = 1;
+    else __gen_e_acsl_implies_2 = X == 3;
+    __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Precondition",
+                    (char *)"k",(char *)"X == 3 && Y == 2 ==> X == 3",42);
+    if (X == 3) __gen_e_acsl_and_2 = Y == 2; else __gen_e_acsl_and_2 = 0;
+    if (! __gen_e_acsl_and_2) __gen_e_acsl_implies_3 = 1;
+    else __gen_e_acsl_implies_3 = (long)X + (long)Y == (long)5;
+    __e_acsl_assert(__gen_e_acsl_implies_3,(char *)"Precondition",
+                    (char *)"k",(char *)"X == 3 && Y == 2 ==> X+Y == 5",43);
     k();
   }
   return;
@@ -174,7 +175,7 @@ int l(void)
 }
 
 /*@ ensures X ≡ 5; */
-int __e_acsl_l(void)
+int __gen_e_acsl_l(void)
 {
   int __retres;
   __retres = l();
@@ -209,39 +210,42 @@ void m(void)
       ensures X ≡ 7;
       ensures X ≡ \old(X)+Y;
  */
-void __e_acsl_m(void)
+void __gen_e_acsl_m(void)
 {
-  int __e_acsl_at_4;
-  int __e_acsl_at_3;
-  int __e_acsl_at_2;
-  int __e_acsl_at;
-  __e_acsl_at_4 = X;
+  int __gen_e_acsl_at_4;
+  int __gen_e_acsl_at_3;
+  int __gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
+  __gen_e_acsl_at_4 = X;
   {
-    int __e_acsl_and_2;
-    if (X == 5) __e_acsl_and_2 = Y == 2; else __e_acsl_and_2 = 0;
-    __e_acsl_at_3 = __e_acsl_and_2;
+    int __gen_e_acsl_and_2;
+    if (X == 5) __gen_e_acsl_and_2 = Y == 2; else __gen_e_acsl_and_2 = 0;
+    __gen_e_acsl_at_3 = __gen_e_acsl_and_2;
   }
   {
-    int __e_acsl_and;
-    if (X == 5) __e_acsl_and = Y == 2; else __e_acsl_and = 0;
-    __e_acsl_at_2 = __e_acsl_and;
+    int __gen_e_acsl_and;
+    if (X == 5) __gen_e_acsl_and = Y == 2; else __gen_e_acsl_and = 0;
+    __gen_e_acsl_at_2 = __gen_e_acsl_and;
   }
-  __e_acsl_at = X == 7;
+  __gen_e_acsl_at = X == 7;
   m();
   {
-    int __e_acsl_implies;
-    int __e_acsl_implies_2;
-    int __e_acsl_implies_3;
-    if (! __e_acsl_at) __e_acsl_implies = 1; else __e_acsl_implies = X == 95;
-    __e_acsl_assert(__e_acsl_implies,(char *)"Postcondition",(char *)"m",
+    int __gen_e_acsl_implies;
+    int __gen_e_acsl_implies_2;
+    int __gen_e_acsl_implies_3;
+    if (! __gen_e_acsl_at) __gen_e_acsl_implies = 1;
+    else __gen_e_acsl_implies = X == 95;
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Postcondition",(char *)"m",
                     (char *)"\\old(X == 7) ==> X == 95",56);
-    if (! __e_acsl_at_2) __e_acsl_implies_2 = 1;
-    else __e_acsl_implies_2 = X == 7;
-    __e_acsl_assert(__e_acsl_implies_2,(char *)"Postcondition",(char *)"m",
-                    (char *)"\\old(X == 5 && Y == 2) ==> X == 7",60);
-    if (! __e_acsl_at_3) __e_acsl_implies_3 = 1;
-    else __e_acsl_implies_3 = (long)X == (long)__e_acsl_at_4 + (long)Y;
-    __e_acsl_assert(__e_acsl_implies_3,(char *)"Postcondition",(char *)"m",
+    if (! __gen_e_acsl_at_2) __gen_e_acsl_implies_2 = 1;
+    else __gen_e_acsl_implies_2 = X == 7;
+    __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Postcondition",
+                    (char *)"m",(char *)"\\old(X == 5 && Y == 2) ==> X == 7",
+                    60);
+    if (! __gen_e_acsl_at_3) __gen_e_acsl_implies_3 = 1;
+    else __gen_e_acsl_implies_3 = (long)X == (long)__gen_e_acsl_at_4 + (long)Y;
+    __e_acsl_assert(__gen_e_acsl_implies_3,(char *)"Postcondition",
+                    (char *)"m",
                     (char *)"\\old(X == 5 && Y == 2) ==> X == \\old(X)+Y",61);
     return;
   }
@@ -275,27 +279,28 @@ void n(void)
       assumes X ≡ 5;
       ensures X ≡ 98;
  */
-void __e_acsl_n(void)
+void __gen_e_acsl_n(void)
 {
-  int __e_acsl_at_2;
-  int __e_acsl_at;
+  int __gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
   __e_acsl_assert(X > 0,(char *)"Precondition",(char *)"n",(char *)"X > 0",
                   65);
   __e_acsl_assert(X < 10,(char *)"Precondition",(char *)"n",(char *)"X < 10",
                   66);
-  __e_acsl_at_2 = X == 5;
-  __e_acsl_at = X == 7;
+  __gen_e_acsl_at_2 = X == 5;
+  __gen_e_acsl_at = X == 7;
   n();
   {
-    int __e_acsl_implies;
-    int __e_acsl_implies_2;
-    if (! __e_acsl_at) __e_acsl_implies = 1; else __e_acsl_implies = X == 8;
-    __e_acsl_assert(__e_acsl_implies,(char *)"Postcondition",(char *)"n",
+    int __gen_e_acsl_implies;
+    int __gen_e_acsl_implies_2;
+    if (! __gen_e_acsl_at) __gen_e_acsl_implies = 1;
+    else __gen_e_acsl_implies = X == 8;
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Postcondition",(char *)"n",
                     (char *)"\\old(X == 7) ==> X == 8",69);
-    if (! __e_acsl_at_2) __e_acsl_implies_2 = 1;
-    else __e_acsl_implies_2 = X == 98;
-    __e_acsl_assert(__e_acsl_implies_2,(char *)"Postcondition",(char *)"n",
-                    (char *)"\\old(X == 5) ==> X == 98",72);
+    if (! __gen_e_acsl_at_2) __gen_e_acsl_implies_2 = 1;
+    else __gen_e_acsl_implies_2 = X == 98;
+    __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Postcondition",
+                    (char *)"n",(char *)"\\old(X == 5) ==> X == 98",72);
     return;
   }
 }
@@ -303,15 +308,15 @@ void __e_acsl_n(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_f();
-  __e_acsl_g();
-  __e_acsl_h();
-  __e_acsl_i();
-  __e_acsl_j();
-  __e_acsl_k();
-  __e_acsl_l();
-  __e_acsl_m();
-  __e_acsl_n();
+  __gen_e_acsl_f();
+  __gen_e_acsl_g();
+  __gen_e_acsl_h();
+  __gen_e_acsl_i();
+  __gen_e_acsl_j();
+  __gen_e_acsl_k();
+  __gen_e_acsl_l();
+  __gen_e_acsl_m();
+  __gen_e_acsl_n();
   __retres = 0;
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost.c
index 7ebafbc24c1c6bf2fe7709a0a3e58a8e94127cf0..16a1a33e734fa6f7da1a5a0f22cbd2cb3a42ad7c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ghost.c
@@ -3,10 +3,10 @@ int G = 0;
 int *P;
 void __e_acsl_globals_init(void)
 {
-  __store_block((void *)(& P),8UL);
-  __full_init((void *)(& P));
-  __store_block((void *)(& G),4UL);
-  __full_init((void *)(& G));
+  __e_acsl_store_block((void *)(& P),8UL);
+  __e_acsl_full_init((void *)(& P));
+  __e_acsl_store_block((void *)(& G),4UL);
+  __e_acsl_full_init((void *)(& G));
   return;
 }
 
@@ -16,42 +16,43 @@ int main(void)
   int *q;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& q),8UL);
   P = & G;
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q = P;
   {
-    int __e_acsl_valid_read;
-    int __e_acsl_valid;
-    __initialize((void *)P,sizeof(int));
-    __e_acsl_valid_read = __valid_read((void *)P,sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"main",
+    int __gen_e_acsl_valid_read;
+    int __gen_e_acsl_valid;
+    __e_acsl_initialize((void *)P,sizeof(int));
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)P,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"main",
                     (char *)"mem_access: \\valid_read(P)",14);
-    __e_acsl_valid = __valid((void *)P,sizeof(int));
-    __e_acsl_assert(__e_acsl_valid,(char *)"RTE",(char *)"main",
+    __gen_e_acsl_valid = __e_acsl_valid((void *)P,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"RTE",(char *)"main",
                     (char *)"mem_access: \\valid(P)",14);
     (*P) ++;
   }
   /*@ assert *q ≡ G; */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and;
-    __e_acsl_initialized = __initialized((void *)(& q),sizeof(int *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_valid_read_2;
-      __e_acsl_valid_read_2 = __valid_read((void *)q,sizeof(int));
-      __e_acsl_and = __e_acsl_valid_read_2;
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& q),
+                                                    sizeof(int *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_read_2;
+      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)q,sizeof(int));
+      __gen_e_acsl_and = __gen_e_acsl_valid_read_2;
     }
-    else __e_acsl_and = 0;
-    __e_acsl_assert(__e_acsl_and,(char *)"RTE",(char *)"main",
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"RTE",(char *)"main",
                     (char *)"mem_access: \\valid_read(q)",15);
     __e_acsl_assert(*q == G,(char *)"Assertion",(char *)"main",
                     (char *)"*q == G",15);
   }
   __retres = 0;
-  __delete_block((void *)(& P));
-  __delete_block((void *)(& G));
-  __delete_block((void *)(& q));
+  __e_acsl_delete_block((void *)(& P));
+  __e_acsl_delete_block((void *)(& G));
+  __e_acsl_delete_block((void *)(& q));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_init.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_init.c
index 509bb30af842cbf1fb16ef1090c92d6476137110..ea0f4fc3c475f0302dd5c8c0201715994fda1076 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_init.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_init.c
@@ -3,10 +3,10 @@ int a = 0;
 int b;
 void __e_acsl_globals_init(void)
 {
-  __store_block((void *)(& b),4UL);
-  __full_init((void *)(& b));
-  __store_block((void *)(& a),4UL);
-  __full_init((void *)(& a));
+  __e_acsl_store_block((void *)(& b),4UL);
+  __e_acsl_full_init((void *)(& b));
+  __e_acsl_store_block((void *)(& a),4UL);
+  __e_acsl_full_init((void *)(& a));
   return;
 }
 
@@ -17,34 +17,34 @@ int main(void)
   int *q;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(& q),8UL);
-  __store_block((void *)(& p),8UL);
-  __full_init((void *)(& p));
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_full_init((void *)(& p));
   p = & a;
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q = & b;
   /*@ assert \initialized(&b); */
   __e_acsl_assert(1,(char *)"Assertion",(char *)"main",
                   (char *)"\\initialized(&b)",9);
   /*@ assert \initialized(q); */
   {
-    int __e_acsl_initialized;
-    __e_acsl_initialized = __initialized((void *)q,sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized,(char *)"Assertion",(char *)"main",
-                    (char *)"\\initialized(q)",10);
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(q)",10);
   }
   /*@ assert \initialized(p); */
   {
-    int __e_acsl_initialized_2;
-    __e_acsl_initialized_2 = __initialized((void *)p,sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized_2,(char *)"Assertion",
+    int __gen_e_acsl_initialized_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_2,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(p)",11);
   }
   __retres = 0;
-  __delete_block((void *)(& b));
-  __delete_block((void *)(& a));
-  __delete_block((void *)(& q));
-  __delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(& b));
+  __e_acsl_delete_block((void *)(& a));
+  __e_acsl_delete_block((void *)(& q));
+  __e_acsl_delete_block((void *)(& p));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_init_function.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_init_function.c
index 1f5265a8a201c8654d5732ae77dcdb74738d971d..c72177b544488c552e9f3d109ea3f0b1c342390a 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_init_function.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_init_function.c
@@ -4,7 +4,7 @@ int main(void)
   int __retres;
   char *a;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  a = (char *)__e_acsl_malloc((unsigned long)7);
+  a = (char *)__gen_e_acsl_malloc((unsigned long)7);
   __retres = 0;
   __e_acsl_memory_clean();
   return __retres;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_initialized.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_initialized.c
index e0be4e27e9ccd835e398e9470652c6ea849c940a..bece9f7196a10089d1f9bced2783be1bc86160a5 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_initialized.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_initialized.c
@@ -3,10 +3,10 @@ int A = 0;
 int B;
 void __e_acsl_globals_init(void)
 {
-  __store_block((void *)(& B),4UL);
-  __full_init((void *)(& B));
-  __store_block((void *)(& A),4UL);
-  __full_init((void *)(& A));
+  __e_acsl_store_block((void *)(& B),4UL);
+  __e_acsl_full_init((void *)(& B));
+  __e_acsl_store_block((void *)(& A),4UL);
+  __e_acsl_full_init((void *)(& A));
   return;
 }
 
@@ -26,16 +26,16 @@ int main(void)
   int dup[2];
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(d),16UL);
-  __store_block((void *)(c),16UL);
-  __store_block((void *)(& r),8UL);
-  __store_block((void *)(& b),4UL);
-  __store_block((void *)(& a),4UL);
-  __store_block((void *)(& q),8UL);
-  __store_block((void *)(& p),8UL);
-  __full_init((void *)(& p));
+  __e_acsl_store_block((void *)(d),16UL);
+  __e_acsl_store_block((void *)(c),16UL);
+  __e_acsl_store_block((void *)(& r),8UL);
+  __e_acsl_store_block((void *)(& b),4UL);
+  __e_acsl_store_block((void *)(& a),4UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_full_init((void *)(& p));
   p = & A;
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q = & B;
   /*@ assert \initialized(&A); */
   __e_acsl_assert(1,(char *)"Assertion",(char *)"main",
@@ -45,274 +45,294 @@ int main(void)
                   (char *)"\\initialized(&B)",17);
   /*@ assert \initialized(p); */
   {
-    int __e_acsl_initialized;
-    __e_acsl_initialized = __initialized((void *)p,sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized,(char *)"Assertion",(char *)"main",
-                    (char *)"\\initialized(p)",18);
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(p)",18);
   }
   /*@ assert \initialized(q); */
   {
-    int __e_acsl_initialized_2;
-    __e_acsl_initialized_2 = __initialized((void *)q,sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized_2,(char *)"Assertion",
+    int __gen_e_acsl_initialized_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_2,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(q)",19);
   }
-  __full_init((void *)(& a));
+  __e_acsl_full_init((void *)(& a));
   a = 0;
-  __initialize((void *)(c),sizeof(long));
+  __e_acsl_initialize((void *)(c),sizeof(long));
   c[0] = (long)1;
-  __initialize((void *)(& c[1]),sizeof(long));
+  __e_acsl_initialize((void *)(& c[1]),sizeof(long));
   c[1] = (long)1;
-  __full_init((void *)(& p));
+  __e_acsl_full_init((void *)(& p));
   p = & a;
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q = & b;
   /*@ assert \initialized(&a); */
   {
-    int __e_acsl_initialized_3;
-    __e_acsl_initialized_3 = __initialized((void *)(& a),sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized_3,(char *)"Assertion",
+    int __gen_e_acsl_initialized_3;
+    __gen_e_acsl_initialized_3 = __e_acsl_initialized((void *)(& a),
+                                                      sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_3,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(&a)",30);
   }
   /*@ assert ¬\initialized(&b); */
   {
-    int __e_acsl_initialized_4;
-    __e_acsl_initialized_4 = __initialized((void *)(& b),sizeof(int));
-    __e_acsl_assert(! __e_acsl_initialized_4,(char *)"Assertion",
+    int __gen_e_acsl_initialized_4;
+    __gen_e_acsl_initialized_4 = __e_acsl_initialized((void *)(& b),
+                                                      sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_4,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(&b)",31);
   }
   /*@ assert \initialized(p); */
   {
-    int __e_acsl_initialized_5;
-    __e_acsl_initialized_5 = __initialized((void *)p,sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized_5,(char *)"Assertion",
+    int __gen_e_acsl_initialized_5;
+    __gen_e_acsl_initialized_5 = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_5,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(p)",32);
   }
   /*@ assert ¬\initialized(q); */
   {
-    int __e_acsl_initialized_6;
-    __e_acsl_initialized_6 = __initialized((void *)q,sizeof(int));
-    __e_acsl_assert(! __e_acsl_initialized_6,(char *)"Assertion",
+    int __gen_e_acsl_initialized_6;
+    __gen_e_acsl_initialized_6 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_6,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(q)",33);
   }
   /*@ assert \initialized(&c); */
   {
-    int __e_acsl_initialized_7;
-    __e_acsl_initialized_7 = __initialized((void *)(& c),sizeof(long [2]));
-    __e_acsl_assert(__e_acsl_initialized_7,(char *)"Assertion",
+    int __gen_e_acsl_initialized_7;
+    __gen_e_acsl_initialized_7 = __e_acsl_initialized((void *)(& c),
+                                                      sizeof(long [2]));
+    __e_acsl_assert(__gen_e_acsl_initialized_7,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(&c)",34);
   }
   /*@ assert ¬\initialized(&d); */
   {
-    int __e_acsl_initialized_8;
-    __e_acsl_initialized_8 = __initialized((void *)(& d),sizeof(long [2]));
-    __e_acsl_assert(! __e_acsl_initialized_8,(char *)"Assertion",
+    int __gen_e_acsl_initialized_8;
+    __gen_e_acsl_initialized_8 = __e_acsl_initialized((void *)(& d),
+                                                      sizeof(long [2]));
+    __e_acsl_assert(! __gen_e_acsl_initialized_8,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(&d)",35);
   }
-  __full_init((void *)(& b));
+  __e_acsl_full_init((void *)(& b));
   b = 0;
   /*@ assert \initialized(q); */
   {
-    int __e_acsl_initialized_9;
-    __e_acsl_initialized_9 = __initialized((void *)q,sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized_9,(char *)"Assertion",
+    int __gen_e_acsl_initialized_9;
+    __gen_e_acsl_initialized_9 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_9,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(q)",39);
   }
   /*@ assert \initialized(&b); */
   {
-    int __e_acsl_initialized_10;
-    __e_acsl_initialized_10 = __initialized((void *)(& b),sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized_10,(char *)"Assertion",
+    int __gen_e_acsl_initialized_10;
+    __gen_e_acsl_initialized_10 = __e_acsl_initialized((void *)(& b),
+                                                       sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_10,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(&b)",40);
   }
-  __full_init((void *)(& r));
+  __e_acsl_full_init((void *)(& r));
   r = d;
   /*@ assert ¬\initialized((long *)d); */
   {
-    int __e_acsl_initialized_11;
-    __e_acsl_initialized_11 = __initialized((void *)(d),sizeof(long));
-    __e_acsl_assert(! __e_acsl_initialized_11,(char *)"Assertion",
+    int __gen_e_acsl_initialized_11;
+    __gen_e_acsl_initialized_11 = __e_acsl_initialized((void *)(d),
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_11,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized((long *)d)",43);
   }
   /*@ assert ¬\initialized(&d[1]); */
   {
-    int __e_acsl_initialized_12;
-    __e_acsl_initialized_12 = __initialized((void *)(& d[1]),sizeof(long));
-    __e_acsl_assert(! __e_acsl_initialized_12,(char *)"Assertion",
+    int __gen_e_acsl_initialized_12;
+    __gen_e_acsl_initialized_12 = __e_acsl_initialized((void *)(& d[1]),
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_12,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(&d[1])",44);
   }
   /*@ assert ¬\initialized(&d); */
   {
-    int __e_acsl_initialized_13;
-    __e_acsl_initialized_13 = __initialized((void *)(& d),sizeof(long [2]));
-    __e_acsl_assert(! __e_acsl_initialized_13,(char *)"Assertion",
+    int __gen_e_acsl_initialized_13;
+    __gen_e_acsl_initialized_13 = __e_acsl_initialized((void *)(& d),
+                                                       sizeof(long [2]));
+    __e_acsl_assert(! __gen_e_acsl_initialized_13,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(&d)",45);
   }
   /*@ assert ¬\initialized(r); */
   {
-    int __e_acsl_initialized_14;
-    __e_acsl_initialized_14 = __initialized((void *)r,sizeof(long));
-    __e_acsl_assert(! __e_acsl_initialized_14,(char *)"Assertion",
+    int __gen_e_acsl_initialized_14;
+    __gen_e_acsl_initialized_14 = __e_acsl_initialized((void *)r,
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_14,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(r)",46);
   }
   /*@ assert ¬\initialized(r+1); */
   {
-    int __e_acsl_initialized_15;
-    __e_acsl_initialized_15 = __initialized((void *)(r + 1),sizeof(long));
-    __e_acsl_assert(! __e_acsl_initialized_15,(char *)"Assertion",
+    int __gen_e_acsl_initialized_15;
+    __gen_e_acsl_initialized_15 = __e_acsl_initialized((void *)(r + 1),
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_15,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(r+1)",47);
   }
-  __initialize((void *)(d),sizeof(long));
+  __e_acsl_initialize((void *)(d),sizeof(long));
   d[0] = (long)1;
   /*@ assert \initialized((long *)d); */
   {
-    int __e_acsl_initialized_16;
-    __e_acsl_initialized_16 = __initialized((void *)(d),sizeof(long));
-    __e_acsl_assert(__e_acsl_initialized_16,(char *)"Assertion",
+    int __gen_e_acsl_initialized_16;
+    __gen_e_acsl_initialized_16 = __e_acsl_initialized((void *)(d),
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_16,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized((long *)d)",50);
   }
   /*@ assert ¬\initialized(&d[1]); */
   {
-    int __e_acsl_initialized_17;
-    __e_acsl_initialized_17 = __initialized((void *)(& d[1]),sizeof(long));
-    __e_acsl_assert(! __e_acsl_initialized_17,(char *)"Assertion",
+    int __gen_e_acsl_initialized_17;
+    __gen_e_acsl_initialized_17 = __e_acsl_initialized((void *)(& d[1]),
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_17,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(&d[1])",51);
   }
   /*@ assert ¬\initialized(&d); */
   {
-    int __e_acsl_initialized_18;
-    __e_acsl_initialized_18 = __initialized((void *)(& d),sizeof(long [2]));
-    __e_acsl_assert(! __e_acsl_initialized_18,(char *)"Assertion",
+    int __gen_e_acsl_initialized_18;
+    __gen_e_acsl_initialized_18 = __e_acsl_initialized((void *)(& d),
+                                                       sizeof(long [2]));
+    __e_acsl_assert(! __gen_e_acsl_initialized_18,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(&d)",52);
   }
   /*@ assert \initialized(r); */
   {
-    int __e_acsl_initialized_19;
-    __e_acsl_initialized_19 = __initialized((void *)r,sizeof(long));
-    __e_acsl_assert(__e_acsl_initialized_19,(char *)"Assertion",
+    int __gen_e_acsl_initialized_19;
+    __gen_e_acsl_initialized_19 = __e_acsl_initialized((void *)r,
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_19,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(r)",53);
   }
   /*@ assert ¬\initialized(r+1); */
   {
-    int __e_acsl_initialized_20;
-    __e_acsl_initialized_20 = __initialized((void *)(r + 1),sizeof(long));
-    __e_acsl_assert(! __e_acsl_initialized_20,(char *)"Assertion",
+    int __gen_e_acsl_initialized_20;
+    __gen_e_acsl_initialized_20 = __e_acsl_initialized((void *)(r + 1),
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_20,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(r+1)",54);
   }
-  __initialize((void *)(& d[1]),sizeof(long));
+  __e_acsl_initialize((void *)(& d[1]),sizeof(long));
   d[1] = (long)1;
   /*@ assert \initialized((long *)d); */
   {
-    int __e_acsl_initialized_21;
-    __e_acsl_initialized_21 = __initialized((void *)(d),sizeof(long));
-    __e_acsl_assert(__e_acsl_initialized_21,(char *)"Assertion",
+    int __gen_e_acsl_initialized_21;
+    __gen_e_acsl_initialized_21 = __e_acsl_initialized((void *)(d),
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_21,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized((long *)d)",57);
   }
   /*@ assert \initialized(&d[1]); */
   {
-    int __e_acsl_initialized_22;
-    __e_acsl_initialized_22 = __initialized((void *)(& d[1]),sizeof(long));
-    __e_acsl_assert(__e_acsl_initialized_22,(char *)"Assertion",
+    int __gen_e_acsl_initialized_22;
+    __gen_e_acsl_initialized_22 = __e_acsl_initialized((void *)(& d[1]),
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_22,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(&d[1])",58);
   }
   /*@ assert \initialized(&d); */
   {
-    int __e_acsl_initialized_23;
-    __e_acsl_initialized_23 = __initialized((void *)(& d),sizeof(long [2]));
-    __e_acsl_assert(__e_acsl_initialized_23,(char *)"Assertion",
+    int __gen_e_acsl_initialized_23;
+    __gen_e_acsl_initialized_23 = __e_acsl_initialized((void *)(& d),
+                                                       sizeof(long [2]));
+    __e_acsl_assert(__gen_e_acsl_initialized_23,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(&d)",59);
   }
   /*@ assert \initialized(r); */
   {
-    int __e_acsl_initialized_24;
-    __e_acsl_initialized_24 = __initialized((void *)r,sizeof(long));
-    __e_acsl_assert(__e_acsl_initialized_24,(char *)"Assertion",
+    int __gen_e_acsl_initialized_24;
+    __gen_e_acsl_initialized_24 = __e_acsl_initialized((void *)r,
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_24,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(r)",60);
   }
   /*@ assert \initialized(r+1); */
   {
-    int __e_acsl_initialized_25;
-    __e_acsl_initialized_25 = __initialized((void *)(r + 1),sizeof(long));
-    __e_acsl_assert(__e_acsl_initialized_25,(char *)"Assertion",
+    int __gen_e_acsl_initialized_25;
+    __gen_e_acsl_initialized_25 = __e_acsl_initialized((void *)(r + 1),
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_25,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(r+1)",61);
   }
-  __full_init((void *)(& p));
-  p = (int *)__e_acsl_malloc(sizeof(int *));
+  __e_acsl_full_init((void *)(& p));
+  p = (int *)__gen_e_acsl_malloc(sizeof(int *));
   /*@ assert ¬\initialized(p); */
   {
-    int __e_acsl_initialized_26;
-    __e_acsl_initialized_26 = __initialized((void *)p,sizeof(int));
-    __e_acsl_assert(! __e_acsl_initialized_26,(char *)"Assertion",
+    int __gen_e_acsl_initialized_26;
+    __gen_e_acsl_initialized_26 = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_26,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(p)",65);
   }
-  __full_init((void *)(& q));
-  q = (int *)__calloc((unsigned long)1,sizeof(int));
+  __e_acsl_full_init((void *)(& q));
+  q = (int *)__e_acsl_calloc((unsigned long)1,sizeof(int));
   /*@ assert \initialized(q); */
   {
-    int __e_acsl_initialized_27;
-    __e_acsl_initialized_27 = __initialized((void *)q,sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized_27,(char *)"Assertion",
+    int __gen_e_acsl_initialized_27;
+    __gen_e_acsl_initialized_27 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_27,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(q)",69);
   }
-  __full_init((void *)(& q));
-  q = (int *)__e_acsl_realloc((void *)q,(unsigned long)2 * sizeof(int));
+  __e_acsl_full_init((void *)(& q));
+  q = (int *)__gen_e_acsl_realloc((void *)q,(unsigned long)2 * sizeof(int));
   /*@ assert \initialized(q); */
   {
-    int __e_acsl_initialized_28;
-    __e_acsl_initialized_28 = __initialized((void *)q,sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized_28,(char *)"Assertion",
+    int __gen_e_acsl_initialized_28;
+    __gen_e_acsl_initialized_28 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_28,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(q)",74);
   }
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q ++;
   /*@ assert ¬\initialized(q); */
   {
-    int __e_acsl_initialized_29;
-    __e_acsl_initialized_29 = __initialized((void *)q,sizeof(int));
-    __e_acsl_assert(! __e_acsl_initialized_29,(char *)"Assertion",
+    int __gen_e_acsl_initialized_29;
+    __gen_e_acsl_initialized_29 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_29,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(q)",76);
   }
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q --;
-  __e_acsl_free((void *)p);
-  __e_acsl_free((void *)q);
+  __gen_e_acsl_free((void *)p);
+  __gen_e_acsl_free((void *)q);
   /*@ assert ¬\initialized(p); */
   {
-    int __e_acsl_initialized_30;
-    __e_acsl_initialized_30 = __initialized((void *)p,sizeof(int));
-    __e_acsl_assert(! __e_acsl_initialized_30,(char *)"Assertion",
+    int __gen_e_acsl_initialized_30;
+    __gen_e_acsl_initialized_30 = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_30,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(p)",84);
   }
   /*@ assert ¬\initialized(q); */
   {
-    int __e_acsl_initialized_31;
-    __e_acsl_initialized_31 = __initialized((void *)q,sizeof(int));
-    __e_acsl_assert(! __e_acsl_initialized_31,(char *)"Assertion",
+    int __gen_e_acsl_initialized_31;
+    __gen_e_acsl_initialized_31 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_31,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(q)",85);
   }
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q = (int *)(& q - 1024 * 5);
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q = (int *)128;
   /*@ assert ¬\initialized(q); */
   {
-    int __e_acsl_initialized_32;
-    __e_acsl_initialized_32 = __initialized((void *)q,sizeof(int));
-    __e_acsl_assert(! __e_acsl_initialized_32,(char *)"Assertion",
+    int __gen_e_acsl_initialized_32;
+    __gen_e_acsl_initialized_32 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_32,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(q)",93);
   }
-  __full_init((void *)(& p));
+  __e_acsl_full_init((void *)(& p));
   p = (int *)0;
   /*@ assert ¬\initialized(p); */
   {
-    int __e_acsl_initialized_33;
-    __e_acsl_initialized_33 = __initialized((void *)p,sizeof(int));
-    __e_acsl_assert(! __e_acsl_initialized_33,(char *)"Assertion",
+    int __gen_e_acsl_initialized_33;
+    __gen_e_acsl_initialized_33 = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_33,(char *)"Assertion",
                     (char *)"main",(char *)"!\\initialized(p)",96);
   }
   size = 100;
-  partsc = (char *)__e_acsl_malloc((unsigned long)size * sizeof(char));
-  partsi = (char *)__e_acsl_malloc((unsigned long)size * sizeof(int));
+  partsc = (char *)__gen_e_acsl_malloc((unsigned long)size * sizeof(char));
+  partsi = (char *)__gen_e_acsl_malloc((unsigned long)size * sizeof(int));
   {
     int i;
     i = 0;
@@ -337,15 +357,15 @@ int main(void)
   dup[0] = 1;
   dup[0] = 1;
   __retres = 0;
-  __delete_block((void *)(& B));
-  __delete_block((void *)(& A));
-  __delete_block((void *)(d));
-  __delete_block((void *)(c));
-  __delete_block((void *)(& r));
-  __delete_block((void *)(& b));
-  __delete_block((void *)(& a));
-  __delete_block((void *)(& q));
-  __delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(& B));
+  __e_acsl_delete_block((void *)(& A));
+  __e_acsl_delete_block((void *)(d));
+  __e_acsl_delete_block((void *)(c));
+  __e_acsl_delete_block((void *)(& r));
+  __e_acsl_delete_block((void *)(& b));
+  __e_acsl_delete_block((void *)(& a));
+  __e_acsl_delete_block((void *)(& q));
+  __e_acsl_delete_block((void *)(& p));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant.c
index 00b01a2cfa1e96f0b00c41adcd0d0995eb13e3d8..b937dcc050160b7ccbb6f31d54c670b246c29009 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_invariant.c
@@ -10,9 +10,9 @@ int main(void)
     while (i < 10) {
       /*@ invariant 0 ≤ i < 10; */
       {
-        int __e_acsl_and;
-        if (0 <= i) __e_acsl_and = i < 10; else __e_acsl_and = 0;
-        __e_acsl_assert(__e_acsl_and,(char *)"Invariant",(char *)"main",
+        int __gen_e_acsl_and;
+        if (0 <= i) __gen_e_acsl_and = i < 10; else __gen_e_acsl_and = 0;
+        __e_acsl_assert(__gen_e_acsl_and,(char *)"Invariant",(char *)"main",
                         (char *)"0 <= i < 10",9);
       }
       x += i;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt.c
index a4a82d76300b18d4e450027af90de4af8d6b3919..016a37366bb8950ea4faaa9a997b00797ae0c573 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_labeled_stmt.c
@@ -1,7 +1,7 @@
 /* Generated by Frama-C */
 int X = 0;
 /*@ ensures X ≡ 3; */
-int __e_acsl_main(void)
+int __gen_e_acsl_main(void)
 {
   int __retres;
   goto L1;
@@ -34,7 +34,7 @@ int __e_acsl_main(void)
 int main(void)
 {
   int __retres;
-  __retres = __e_acsl_main();
+  __retres = __gen_e_acsl_main();
   __e_acsl_assert(X == 3,(char *)"Postcondition",(char *)"main",
                   (char *)"X == 3",7);
   return __retres;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy.c
index 3fceb008cd8462c79295d5ff197e8fb9f7b30fb7..2254f166910768079300906bfaf2d8c3cf1f28bc 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_lazy.c
@@ -8,149 +8,154 @@ int main(void)
   y = 1;
   /*@ assert x ≡ 0 ∧ y ≡ 1; */
   {
-    int __e_acsl_and;
-    if (x == 0) __e_acsl_and = y == 1; else __e_acsl_and = 0;
-    __e_acsl_assert(__e_acsl_and,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_and;
+    if (x == 0) __gen_e_acsl_and = y == 1; else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
                     (char *)"x == 0 && y == 1",9);
   }
   /*@ assert ¬(x ≢ 0 ∧ y ≡ 1/0); */
   {
-    int __e_acsl_and_2;
+    int __gen_e_acsl_and_2;
     if (x != 0) {
       __e_acsl_assert(0 != 0,(char *)"RTE",(char *)"main",
                       (char *)"division_by_zero: 0 != 0",10);
-      __e_acsl_and_2 = y == 1 / 0;
+      __gen_e_acsl_and_2 = y == 1 / 0;
     }
-    else __e_acsl_and_2 = 0;
-    __e_acsl_assert(! __e_acsl_and_2,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_2 = 0;
+    __e_acsl_assert(! __gen_e_acsl_and_2,(char *)"Assertion",(char *)"main",
                     (char *)"!(x != 0 && y == 1/0)",10);
   }
   /*@ assert y ≡ 1 ∨ x ≡ 1; */
   {
-    int __e_acsl_or;
-    if (y == 1) __e_acsl_or = 1; else __e_acsl_or = x == 1;
-    __e_acsl_assert(__e_acsl_or,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_or;
+    if (y == 1) __gen_e_acsl_or = 1; else __gen_e_acsl_or = x == 1;
+    __e_acsl_assert(__gen_e_acsl_or,(char *)"Assertion",(char *)"main",
                     (char *)"y == 1 || x == 1",11);
   }
   /*@ assert x ≡ 0 ∨ y ≡ 1/0; */
   {
-    int __e_acsl_or_2;
-    if (x == 0) __e_acsl_or_2 = 1;
+    int __gen_e_acsl_or_2;
+    if (x == 0) __gen_e_acsl_or_2 = 1;
     else {
       __e_acsl_assert(0 != 0,(char *)"RTE",(char *)"main",
                       (char *)"division_by_zero: 0 != 0",12);
-      __e_acsl_or_2 = y == 1 / 0;
+      __gen_e_acsl_or_2 = y == 1 / 0;
     }
-    __e_acsl_assert(__e_acsl_or_2,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_or_2,(char *)"Assertion",(char *)"main",
                     (char *)"x == 0 || y == 1/0",12);
   }
   /*@ assert x ≡ 0 ⇒ y ≡ 1; */
   {
-    int __e_acsl_implies;
-    if (! (x == 0)) __e_acsl_implies = 1; else __e_acsl_implies = y == 1;
-    __e_acsl_assert(__e_acsl_implies,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_implies;
+    if (! (x == 0)) __gen_e_acsl_implies = 1;
+    else __gen_e_acsl_implies = y == 1;
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Assertion",(char *)"main",
                     (char *)"x == 0 ==> y == 1",13);
   }
   /*@ assert x ≡ 1 ⇒ y ≡ 1/0; */
   {
-    int __e_acsl_implies_2;
-    if (! (x == 1)) __e_acsl_implies_2 = 1;
+    int __gen_e_acsl_implies_2;
+    if (! (x == 1)) __gen_e_acsl_implies_2 = 1;
     else {
       __e_acsl_assert(0 != 0,(char *)"RTE",(char *)"main",
                       (char *)"division_by_zero: 0 != 0",14);
-      __e_acsl_implies_2 = y == 1 / 0;
+      __gen_e_acsl_implies_2 = y == 1 / 0;
     }
-    __e_acsl_assert(__e_acsl_implies_2,(char *)"Assertion",(char *)"main",
-                    (char *)"x == 1 ==> y == 1/0",14);
+    __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Assertion",
+                    (char *)"main",(char *)"x == 1 ==> y == 1/0",14);
   }
   /*@ assert x≢0? x ≢ 0: y ≢ 0; */
   {
-    int __e_acsl_if;
-    if (x != 0) __e_acsl_if = x != 0; else __e_acsl_if = y != 0;
-    __e_acsl_assert(__e_acsl_if,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_if;
+    if (x != 0) __gen_e_acsl_if = x != 0; else __gen_e_acsl_if = y != 0;
+    __e_acsl_assert(__gen_e_acsl_if,(char *)"Assertion",(char *)"main",
                     (char *)"x!=0? x != 0: y != 0",15);
   }
   /*@ assert y≢0? y ≢ 0: x ≢ 0; */
   {
-    int __e_acsl_if_2;
-    if (y != 0) __e_acsl_if_2 = y != 0; else __e_acsl_if_2 = x != 0;
-    __e_acsl_assert(__e_acsl_if_2,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_if_2;
+    if (y != 0) __gen_e_acsl_if_2 = y != 0; else __gen_e_acsl_if_2 = x != 0;
+    __e_acsl_assert(__gen_e_acsl_if_2,(char *)"Assertion",(char *)"main",
                     (char *)"y!=0? y != 0: x != 0",16);
   }
   /*@ assert x≡1? x ≡ 18: x ≡ 0; */
   {
-    int __e_acsl_if_3;
-    if (x == 1) __e_acsl_if_3 = x == 18; else __e_acsl_if_3 = x == 0;
-    __e_acsl_assert(__e_acsl_if_3,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_if_3;
+    if (x == 1) __gen_e_acsl_if_3 = x == 18; else __gen_e_acsl_if_3 = x == 0;
+    __e_acsl_assert(__gen_e_acsl_if_3,(char *)"Assertion",(char *)"main",
                     (char *)"x==1? x == 18: x == 0",17);
   }
   /*@ assert x ≡ 2 ⇔ y ≡ 3; */
   {
-    int __e_acsl_implies_3;
-    int __e_acsl_equiv;
-    if (! (x == 2)) __e_acsl_implies_3 = 1; else __e_acsl_implies_3 = y == 3;
-    if (__e_acsl_implies_3) {
-      int __e_acsl_implies_4;
-      if (! (y == 3)) __e_acsl_implies_4 = 1;
-      else __e_acsl_implies_4 = x == 2;
-      __e_acsl_equiv = __e_acsl_implies_4;
+    int __gen_e_acsl_implies_3;
+    int __gen_e_acsl_equiv;
+    if (! (x == 2)) __gen_e_acsl_implies_3 = 1;
+    else __gen_e_acsl_implies_3 = y == 3;
+    if (__gen_e_acsl_implies_3) {
+      int __gen_e_acsl_implies_4;
+      if (! (y == 3)) __gen_e_acsl_implies_4 = 1;
+      else __gen_e_acsl_implies_4 = x == 2;
+      __gen_e_acsl_equiv = __gen_e_acsl_implies_4;
     }
-    else __e_acsl_equiv = 0;
-    __e_acsl_assert(__e_acsl_equiv,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_equiv = 0;
+    __e_acsl_assert(__gen_e_acsl_equiv,(char *)"Assertion",(char *)"main",
                     (char *)"x == 2 <==> y == 3",20);
   }
   /*@ assert x ≡ 0 ⇔ y ≡ 1; */
   {
-    int __e_acsl_implies_5;
-    int __e_acsl_equiv_2;
-    if (! (x == 0)) __e_acsl_implies_5 = 1; else __e_acsl_implies_5 = y == 1;
-    if (__e_acsl_implies_5) {
-      int __e_acsl_implies_6;
-      if (! (y == 1)) __e_acsl_implies_6 = 1;
-      else __e_acsl_implies_6 = x == 0;
-      __e_acsl_equiv_2 = __e_acsl_implies_6;
+    int __gen_e_acsl_implies_5;
+    int __gen_e_acsl_equiv_2;
+    if (! (x == 0)) __gen_e_acsl_implies_5 = 1;
+    else __gen_e_acsl_implies_5 = y == 1;
+    if (__gen_e_acsl_implies_5) {
+      int __gen_e_acsl_implies_6;
+      if (! (y == 1)) __gen_e_acsl_implies_6 = 1;
+      else __gen_e_acsl_implies_6 = x == 0;
+      __gen_e_acsl_equiv_2 = __gen_e_acsl_implies_6;
     }
-    else __e_acsl_equiv_2 = 0;
-    __e_acsl_assert(__e_acsl_equiv_2,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_equiv_2 = 0;
+    __e_acsl_assert(__gen_e_acsl_equiv_2,(char *)"Assertion",(char *)"main",
                     (char *)"x == 0 <==> y == 1",21);
   }
   /*@ assert ((x≢0? x: y)≢0) ≡ (x≡0); */
   {
-    int __e_acsl_if_4;
-    if (x != 0) __e_acsl_if_4 = x; else __e_acsl_if_4 = y;
-    __e_acsl_assert((__e_acsl_if_4 != 0) == (x == 0),(char *)"Assertion",
+    int __gen_e_acsl_if_4;
+    if (x != 0) __gen_e_acsl_if_4 = x; else __gen_e_acsl_if_4 = y;
+    __e_acsl_assert((__gen_e_acsl_if_4 != 0) == (x == 0),(char *)"Assertion",
                     (char *)"main",(char *)"((x!=0? x: y)!=0) == (x==0)",24);
   }
   /*@ assert (x ≢ 0 ∧ y ≢ 0) ∨ y ≢ 0; */
   {
-    int __e_acsl_and_3;
-    int __e_acsl_or_3;
-    if (x != 0) __e_acsl_and_3 = y != 0; else __e_acsl_and_3 = 0;
-    if (__e_acsl_and_3) __e_acsl_or_3 = 1; else __e_acsl_or_3 = y != 0;
-    __e_acsl_assert(__e_acsl_or_3,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_and_3;
+    int __gen_e_acsl_or_3;
+    if (x != 0) __gen_e_acsl_and_3 = y != 0; else __gen_e_acsl_and_3 = 0;
+    if (__gen_e_acsl_and_3) __gen_e_acsl_or_3 = 1;
+    else __gen_e_acsl_or_3 = y != 0;
+    __e_acsl_assert(__gen_e_acsl_or_3,(char *)"Assertion",(char *)"main",
                     (char *)"(x != 0 && y != 0) || y != 0",25);
   }
   /*@ assert (x ≢ 0 ∨ y ≢ 0) ∧ y ≡ 1; */
   {
-    int __e_acsl_or_4;
-    int __e_acsl_and_4;
-    if (x != 0) __e_acsl_or_4 = 1; else __e_acsl_or_4 = y != 0;
-    if (__e_acsl_or_4) __e_acsl_and_4 = y == 1; else __e_acsl_and_4 = 0;
-    __e_acsl_assert(__e_acsl_and_4,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_or_4;
+    int __gen_e_acsl_and_4;
+    if (x != 0) __gen_e_acsl_or_4 = 1; else __gen_e_acsl_or_4 = y != 0;
+    if (__gen_e_acsl_or_4) __gen_e_acsl_and_4 = y == 1;
+    else __gen_e_acsl_and_4 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_4,(char *)"Assertion",(char *)"main",
                     (char *)"(x != 0 || y != 0) && y == 1",26);
   }
   /*@ assert (x≢0∨y≢0) ≡ (y≢0); */
   {
-    int __e_acsl_or_5;
-    if (x != 0) __e_acsl_or_5 = 1; else __e_acsl_or_5 = y != 0;
-    __e_acsl_assert(__e_acsl_or_5 == (y != 0),(char *)"Assertion",
+    int __gen_e_acsl_or_5;
+    if (x != 0) __gen_e_acsl_or_5 = 1; else __gen_e_acsl_or_5 = y != 0;
+    __e_acsl_assert(__gen_e_acsl_or_5 == (y != 0),(char *)"Assertion",
                     (char *)"main",(char *)"(x!=0||y!=0) == (y!=0)",27);
   }
   /*@ assert (x≢0 ∧ y≢0) ≡ (x≢0); */
   {
-    int __e_acsl_and_5;
-    if (x != 0) __e_acsl_and_5 = y != 0; else __e_acsl_and_5 = 0;
-    __e_acsl_assert(__e_acsl_and_5 == (x != 0),(char *)"Assertion",
+    int __gen_e_acsl_and_5;
+    if (x != 0) __gen_e_acsl_and_5 = y != 0; else __gen_e_acsl_and_5 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_5 == (x != 0),(char *)"Assertion",
                     (char *)"main",(char *)"(x!=0 && y!=0) == (x!=0)",28);
   }
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search.c
index 723ab7f5ac72478233e3f599a1d4d8909a2657e8..b182b73dce562c7f2f7180704f94782e51dd4c9c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_linear_search.c
@@ -16,30 +16,30 @@ int search(int elt)
   int k;
   k = 0;
   {
-    int __e_acsl_forall;
-    int __e_acsl_i;
-    int __e_acsl_and;
-    __e_acsl_forall = 1;
-    __e_acsl_i = 0;
+    int __gen_e_acsl_forall;
+    int __gen_e_acsl_i;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_forall = 1;
+    __gen_e_acsl_i = 0;
     while (1) {
-      if (__e_acsl_i < k) ; else break;
-      __e_acsl_assert(__e_acsl_i < 10,(char *)"RTE",(char *)"search",
-                      (char *)"index_bound: __e_acsl_i < 10",18);
-      __e_acsl_assert(0 <= __e_acsl_i,(char *)"RTE",(char *)"search",
-                      (char *)"index_bound: 0 <= __e_acsl_i",18);
-      if (A[__e_acsl_i] < elt) ;
+      if (__gen_e_acsl_i < k) ; else break;
+      __e_acsl_assert(__gen_e_acsl_i < 10,(char *)"RTE",(char *)"search",
+                      (char *)"index_bound: __gen_e_acsl_i < 10",18);
+      __e_acsl_assert(0 <= __gen_e_acsl_i,(char *)"RTE",(char *)"search",
+                      (char *)"index_bound: 0 <= __gen_e_acsl_i",18);
+      if (A[__gen_e_acsl_i] < elt) ;
       else {
-        __e_acsl_forall = 0;
+        __gen_e_acsl_forall = 0;
         goto e_acsl_end_loop1;
       }
-      __e_acsl_i ++;
+      __gen_e_acsl_i ++;
     }
     e_acsl_end_loop1: ;
-    __e_acsl_assert(__e_acsl_forall,(char *)"Invariant",(char *)"search",
+    __e_acsl_assert(__gen_e_acsl_forall,(char *)"Invariant",(char *)"search",
                     (char *)"\\forall integer i; 0 <= i < k ==> A[i] < elt",
                     18);
-    if (0 <= k) __e_acsl_and = k <= 10; else __e_acsl_and = 0;
-    __e_acsl_assert(__e_acsl_and,(char *)"Invariant",(char *)"search",
+    if (0 <= k) __gen_e_acsl_and = k <= 10; else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Invariant",(char *)"search",
                     (char *)"0 <= k <= 10",17);
     /*@ loop invariant 0 ≤ k ≤ 10;
         loop invariant ∀ ℤ i; 0 ≤ i < k ⇒ A[i] < elt;
@@ -55,30 +55,33 @@ int search(int elt)
           goto return_label;
         }
       {
-        int __e_acsl_and_2;
-        int __e_acsl_forall_2;
-        int __e_acsl_i_2;
+        int __gen_e_acsl_and_2;
+        int __gen_e_acsl_forall_2;
+        int __gen_e_acsl_i_2;
         k ++;
-        if (0 <= k) __e_acsl_and_2 = k <= 10; else __e_acsl_and_2 = 0;
-        __e_acsl_assert(__e_acsl_and_2,(char *)"Invariant",(char *)"search",
-                        (char *)"0 <= k <= 10",17);
-        __e_acsl_forall_2 = 1;
-        __e_acsl_i_2 = 0;
+        if (0 <= k) __gen_e_acsl_and_2 = k <= 10;
+        else __gen_e_acsl_and_2 = 0;
+        __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Invariant",
+                        (char *)"search",(char *)"0 <= k <= 10",17);
+        __gen_e_acsl_forall_2 = 1;
+        __gen_e_acsl_i_2 = 0;
         while (1) {
-          if (__e_acsl_i_2 < k) ; else break;
-          __e_acsl_assert(__e_acsl_i_2 < 10,(char *)"RTE",(char *)"search",
-                          (char *)"index_bound: __e_acsl_i_2 < 10",18);
-          __e_acsl_assert(0 <= __e_acsl_i_2,(char *)"RTE",(char *)"search",
-                          (char *)"index_bound: 0 <= __e_acsl_i_2",18);
-          if (A[__e_acsl_i_2] < elt) ;
+          if (__gen_e_acsl_i_2 < k) ; else break;
+          __e_acsl_assert(__gen_e_acsl_i_2 < 10,(char *)"RTE",
+                          (char *)"search",
+                          (char *)"index_bound: __gen_e_acsl_i_2 < 10",18);
+          __e_acsl_assert(0 <= __gen_e_acsl_i_2,(char *)"RTE",
+                          (char *)"search",
+                          (char *)"index_bound: 0 <= __gen_e_acsl_i_2",18);
+          if (A[__gen_e_acsl_i_2] < elt) ;
           else {
-            __e_acsl_forall_2 = 0;
+            __gen_e_acsl_forall_2 = 0;
             goto e_acsl_end_loop2;
           }
-          __e_acsl_i_2 ++;
+          __gen_e_acsl_i_2 ++;
         }
         e_acsl_end_loop2: ;
-        __e_acsl_assert(__e_acsl_forall_2,(char *)"Invariant",
+        __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Invariant",
                         (char *)"search",
                         (char *)"\\forall integer i; 0 <= i < k ==> A[i] < elt",
                         18);
@@ -99,93 +102,94 @@ int search(int elt)
       assumes ∀ ℤ j; 0 ≤ j < 10 ⇒ A[j] ≢ elt;
       ensures \result ≡ 0;
  */
-int __e_acsl_search(int elt)
+int __gen_e_acsl_search(int elt)
 {
-  int __e_acsl_at_2;
-  int __e_acsl_at;
+  int __gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
   int __retres;
   {
-    int __e_acsl_forall;
-    int __e_acsl_i;
-    __e_acsl_forall = 1;
-    __e_acsl_i = 0;
+    int __gen_e_acsl_forall;
+    int __gen_e_acsl_i;
+    __gen_e_acsl_forall = 1;
+    __gen_e_acsl_i = 0;
     while (1) {
-      if (__e_acsl_i < 9) ; else break;
-      __e_acsl_assert(__e_acsl_i + 1 < 10,(char *)"RTE",(char *)"search",
-                      (char *)"index_bound: (int)(__e_acsl_i+1) < 10",7);
-      __e_acsl_assert(0 <= __e_acsl_i + 1,(char *)"RTE",(char *)"search",
-                      (char *)"index_bound: 0 <= (int)(__e_acsl_i+1)",7);
-      __e_acsl_assert(__e_acsl_i < 10,(char *)"RTE",(char *)"search",
-                      (char *)"index_bound: __e_acsl_i < 10",7);
-      __e_acsl_assert(0 <= __e_acsl_i,(char *)"RTE",(char *)"search",
-                      (char *)"index_bound: 0 <= __e_acsl_i",7);
-      if (A[__e_acsl_i] <= A[__e_acsl_i + 1]) ;
+      if (__gen_e_acsl_i < 9) ; else break;
+      __e_acsl_assert(__gen_e_acsl_i + 1 < 10,(char *)"RTE",(char *)"search",
+                      (char *)"index_bound: (int)(__gen_e_acsl_i+1) < 10",7);
+      __e_acsl_assert(0 <= __gen_e_acsl_i + 1,(char *)"RTE",(char *)"search",
+                      (char *)"index_bound: 0 <= (int)(__gen_e_acsl_i+1)",7);
+      __e_acsl_assert(__gen_e_acsl_i < 10,(char *)"RTE",(char *)"search",
+                      (char *)"index_bound: __gen_e_acsl_i < 10",7);
+      __e_acsl_assert(0 <= __gen_e_acsl_i,(char *)"RTE",(char *)"search",
+                      (char *)"index_bound: 0 <= __gen_e_acsl_i",7);
+      if (A[__gen_e_acsl_i] <= A[__gen_e_acsl_i + 1]) ;
       else {
-        __e_acsl_forall = 0;
+        __gen_e_acsl_forall = 0;
         goto e_acsl_end_loop3;
       }
-      __e_acsl_i ++;
+      __gen_e_acsl_i ++;
     }
     e_acsl_end_loop3: ;
-    __e_acsl_assert(__e_acsl_forall,(char *)"Precondition",(char *)"search",
+    __e_acsl_assert(__gen_e_acsl_forall,(char *)"Precondition",
+                    (char *)"search",
                     (char *)"\\forall integer i; 0 <= i < 9 ==> A[i] <= A[i+1]",
                     7);
     {
-      int __e_acsl_forall_2;
-      int __e_acsl_j_2;
-      __e_acsl_forall_2 = 1;
-      __e_acsl_j_2 = 0;
+      int __gen_e_acsl_forall_2;
+      int __gen_e_acsl_j_2;
+      __gen_e_acsl_forall_2 = 1;
+      __gen_e_acsl_j_2 = 0;
       while (1) {
-        if (__e_acsl_j_2 < 10) ; else break;
-        __e_acsl_assert(__e_acsl_j_2 < 10,(char *)"RTE",(char *)"search",
-                        (char *)"index_bound: __e_acsl_j_2 < 10",12);
-        __e_acsl_assert(0 <= __e_acsl_j_2,(char *)"RTE",(char *)"search",
-                        (char *)"index_bound: 0 <= __e_acsl_j_2",12);
-        if (A[__e_acsl_j_2] != elt) ;
+        if (__gen_e_acsl_j_2 < 10) ; else break;
+        __e_acsl_assert(__gen_e_acsl_j_2 < 10,(char *)"RTE",(char *)"search",
+                        (char *)"index_bound: __gen_e_acsl_j_2 < 10",12);
+        __e_acsl_assert(0 <= __gen_e_acsl_j_2,(char *)"RTE",(char *)"search",
+                        (char *)"index_bound: 0 <= __gen_e_acsl_j_2",12);
+        if (A[__gen_e_acsl_j_2] != elt) ;
         else {
-          __e_acsl_forall_2 = 0;
+          __gen_e_acsl_forall_2 = 0;
           goto e_acsl_end_loop5;
         }
-        __e_acsl_j_2 ++;
+        __gen_e_acsl_j_2 ++;
       }
       e_acsl_end_loop5: ;
-      __e_acsl_at_2 = __e_acsl_forall_2;
+      __gen_e_acsl_at_2 = __gen_e_acsl_forall_2;
     }
     {
-      int __e_acsl_exists;
-      int __e_acsl_j;
-      __e_acsl_exists = 0;
-      __e_acsl_j = 0;
+      int __gen_e_acsl_exists;
+      int __gen_e_acsl_j;
+      __gen_e_acsl_exists = 0;
+      __gen_e_acsl_j = 0;
       while (1) {
-        if (__e_acsl_j < 10) ; else break;
-        __e_acsl_assert(__e_acsl_j < 10,(char *)"RTE",(char *)"search",
-                        (char *)"index_bound: __e_acsl_j < 10",9);
-        __e_acsl_assert(0 <= __e_acsl_j,(char *)"RTE",(char *)"search",
-                        (char *)"index_bound: 0 <= __e_acsl_j",9);
-        if (! (A[__e_acsl_j] == elt)) ;
+        if (__gen_e_acsl_j < 10) ; else break;
+        __e_acsl_assert(__gen_e_acsl_j < 10,(char *)"RTE",(char *)"search",
+                        (char *)"index_bound: __gen_e_acsl_j < 10",9);
+        __e_acsl_assert(0 <= __gen_e_acsl_j,(char *)"RTE",(char *)"search",
+                        (char *)"index_bound: 0 <= __gen_e_acsl_j",9);
+        if (! (A[__gen_e_acsl_j] == elt)) ;
         else {
-          __e_acsl_exists = 1;
+          __gen_e_acsl_exists = 1;
           goto e_acsl_end_loop4;
         }
-        __e_acsl_j ++;
+        __gen_e_acsl_j ++;
       }
       e_acsl_end_loop4: ;
-      __e_acsl_at = __e_acsl_exists;
+      __gen_e_acsl_at = __gen_e_acsl_exists;
     }
     __retres = search(elt);
   }
   {
-    int __e_acsl_implies;
-    int __e_acsl_implies_2;
-    if (! __e_acsl_at) __e_acsl_implies = 1;
-    else __e_acsl_implies = __retres == 1;
-    __e_acsl_assert(__e_acsl_implies,(char *)"Postcondition",
+    int __gen_e_acsl_implies;
+    int __gen_e_acsl_implies_2;
+    if (! __gen_e_acsl_at) __gen_e_acsl_implies = 1;
+    else __gen_e_acsl_implies = __retres == 1;
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Postcondition",
                     (char *)"search",
                     (char *)"\\old(\\exists integer j; 0 <= j < 10 && A[j] == elt) ==> \\result == 1",
                     10);
-    if (! __e_acsl_at_2) __e_acsl_implies_2 = 1;
-    else __e_acsl_implies_2 = __retres == 0;
-    __e_acsl_assert(__e_acsl_implies_2,(char *)"Postcondition",
+    if (! __gen_e_acsl_at_2) __gen_e_acsl_implies_2 = 1;
+    else __gen_e_acsl_implies_2 = __retres == 0;
+    __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Postcondition",
                     (char *)"search",
                     (char *)"\\old(\\forall integer j; 0 <= j < 10 ==> A[j] != elt) ==> \\result == 0",
                     13);
@@ -205,11 +209,11 @@ int main(void)
       i ++;
     }
   }
-  found = __e_acsl_search(36);
+  found = __gen_e_acsl_search(36);
   /*@ assert found ≡ 1; */
   __e_acsl_assert(found == 1,(char *)"Assertion",(char *)"main",
                   (char *)"found == 1",31);
-  found = __e_acsl_search(5);
+  found = __gen_e_acsl_search(5);
   /*@ assert found ≡ 0; */
   __e_acsl_assert(found == 0,(char *)"Assertion",(char *)"main",
                   (char *)"found == 0",34);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c
index 3be0a63ac97588ff203277eddae5a09f6d337601..6fb4f9efc15669a790dcb6cdd6b1fb5f5421c0c0 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c
@@ -1,8 +1,8 @@
 /* Generated by Frama-C */
-char *__e_acsl_literal_string;
-char *__e_acsl_literal_string_4;
-char *__e_acsl_literal_string_3;
-char *__e_acsl_literal_string_2;
+char *__gen_e_acsl_literal_string;
+char *__gen_e_acsl_literal_string_4;
+char *__gen_e_acsl_literal_string_3;
+char *__gen_e_acsl_literal_string_2;
 int main(void);
 
 char *T = (char *)"bar";
@@ -11,9 +11,10 @@ void f(void)
 {
   /*@ assert *(T+G) ≡ 'b'; */
   {
-    int __e_acsl_valid_read;
-    __e_acsl_valid_read = __valid_read((void *)(T + G),sizeof(char));
-    __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"f",
+    int __gen_e_acsl_valid_read;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(T + G),
+                                                  sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"f",
                     (char *)"mem_access: \\valid_read(T+G)",11);
     __e_acsl_assert((int)*(T + G) == 'b',(char *)"Assertion",(char *)"f",
                     (char *)"*(T+G) == \'b\'",11);
@@ -29,28 +30,28 @@ int G2 = 2;
 char *U = (char *)"baz";
 void __e_acsl_globals_init(void)
 {
-  __e_acsl_literal_string = "ss";
-  __store_block((void *)__e_acsl_literal_string,sizeof("ss"));
-  __full_init((void *)__e_acsl_literal_string);
-  __readonly((void *)__e_acsl_literal_string);
-  __e_acsl_literal_string_4 = "foo2";
-  __store_block((void *)__e_acsl_literal_string_4,sizeof("foo2"));
-  __full_init((void *)__e_acsl_literal_string_4);
-  __readonly((void *)__e_acsl_literal_string_4);
-  __e_acsl_literal_string_3 = "foo";
-  __store_block((void *)__e_acsl_literal_string_3,sizeof("foo"));
-  __full_init((void *)__e_acsl_literal_string_3);
-  __readonly((void *)__e_acsl_literal_string_3);
-  __e_acsl_literal_string_2 = "bar";
-  __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
-  __full_init((void *)__e_acsl_literal_string_2);
-  __readonly((void *)__e_acsl_literal_string_2);
-  __store_block((void *)(& S2),8UL);
-  __full_init((void *)(& S2));
-  __store_block((void *)(& S),8UL);
-  __full_init((void *)(& S));
-  __store_block((void *)(& T),8UL);
-  __full_init((void *)(& T));
+  __gen_e_acsl_literal_string = "ss";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string,sizeof("ss"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string);
+  __gen_e_acsl_literal_string_4 = "foo2";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_4,sizeof("foo2"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_4);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_4);
+  __gen_e_acsl_literal_string_3 = "foo";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_3,sizeof("foo"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_3);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_3);
+  __gen_e_acsl_literal_string_2 = "bar";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_2,sizeof("bar"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_2);
+  __e_acsl_store_block((void *)(& S2),8UL);
+  __e_acsl_full_init((void *)(& S2));
+  __e_acsl_store_block((void *)(& S),8UL);
+  __e_acsl_full_init((void *)(& S));
+  __e_acsl_store_block((void *)(& T),8UL);
+  __e_acsl_full_init((void *)(& T));
   return;
 }
 
@@ -60,52 +61,54 @@ int main(void)
   char *SS;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(& SS),8UL);
-  __full_init((void *)(& SS));
-  SS = (char *)__e_acsl_literal_string;
+  __e_acsl_store_block((void *)(& SS),8UL);
+  __e_acsl_full_init((void *)(& SS));
+  SS = (char *)__gen_e_acsl_literal_string;
   /*@ assert *(S+G2) ≡ 'o'; */
   {
-    int __e_acsl_valid_read;
-    __e_acsl_valid_read = __valid_read((void *)(S + G2),sizeof(char));
-    __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"main",
+    int __gen_e_acsl_valid_read;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(S + G2),
+                                                  sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"main",
                     (char *)"mem_access: \\valid_read(S+G2)",22);
     __e_acsl_assert((int)*(S + G2) == 'o',(char *)"Assertion",(char *)"main",
                     (char *)"*(S+G2) == \'o\'",22);
   }
   /*@ assert \initialized(S); */
   {
-    int __e_acsl_initialized;
-    __e_acsl_initialized = __initialized((void *)S,sizeof(char));
-    __e_acsl_assert(__e_acsl_initialized,(char *)"Assertion",(char *)"main",
-                    (char *)"\\initialized(S)",23);
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)S,sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(S)",23);
   }
   /*@ assert \valid_read(S2); */
   {
-    int __e_acsl_valid_read_2;
-    __e_acsl_valid_read_2 = __valid_read((void *)S2,sizeof(char));
-    __e_acsl_assert(__e_acsl_valid_read_2,(char *)"Assertion",(char *)"main",
-                    (char *)"\\valid_read(S2)",24);
+    int __gen_e_acsl_valid_read_2;
+    __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)S2,sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"Assertion",
+                    (char *)"main",(char *)"\\valid_read(S2)",24);
   }
   /*@ assert ¬\valid(SS); */
   {
-    int __e_acsl_initialized_2;
-    int __e_acsl_and;
-    __e_acsl_initialized_2 = __initialized((void *)(& SS),sizeof(char *));
-    if (__e_acsl_initialized_2) {
-      int __e_acsl_valid;
-      __e_acsl_valid = __valid((void *)SS,sizeof(char));
-      __e_acsl_and = __e_acsl_valid;
+    int __gen_e_acsl_initialized_2;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& SS),
+                                                      sizeof(char *));
+    if (__gen_e_acsl_initialized_2) {
+      int __gen_e_acsl_valid;
+      __gen_e_acsl_valid = __e_acsl_valid((void *)SS,sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid;
     }
-    else __e_acsl_and = 0;
-    __e_acsl_assert(! __e_acsl_and,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(! __gen_e_acsl_and,(char *)"Assertion",(char *)"main",
                     (char *)"!\\valid(SS)",25);
   }
   f();
   __retres = 0;
-  __delete_block((void *)(& S2));
-  __delete_block((void *)(& S));
-  __delete_block((void *)(& T));
-  __delete_block((void *)(& SS));
+  __e_acsl_delete_block((void *)(& S2));
+  __e_acsl_delete_block((void *)(& S));
+  __e_acsl_delete_block((void *)(& T));
+  __e_acsl_delete_block((void *)(& SS));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar.c
index 0a35857a17a9b09365ed97ee8cce3855bd6bb426..52af6c0327420d1766418891e73ff245c8bcac27 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_localvar.c
@@ -6,31 +6,31 @@ struct list {
 struct list *add(struct list *l, int i)
 {
   struct list *new;
-  __store_block((void *)(& new),8UL);
-  __store_block((void *)(& l),8UL);
-  __full_init((void *)(& new));
-  new = (struct list *)__e_acsl_malloc(sizeof(struct list));
+  __e_acsl_store_block((void *)(& new),8UL);
+  __e_acsl_store_block((void *)(& l),8UL);
+  __e_acsl_full_init((void *)(& new));
+  new = (struct list *)__gen_e_acsl_malloc(sizeof(struct list));
   /*@ assert \valid(new); */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and;
-    __e_acsl_initialized = __initialized((void *)(& new),
-                                         sizeof(struct list *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_valid;
-      __e_acsl_valid = __valid((void *)new,sizeof(struct list));
-      __e_acsl_and = __e_acsl_valid;
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& new),
+                                                    sizeof(struct list *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid;
+      __gen_e_acsl_valid = __e_acsl_valid((void *)new,sizeof(struct list));
+      __gen_e_acsl_and = __gen_e_acsl_valid;
     }
-    else __e_acsl_and = 0;
-    __e_acsl_assert(__e_acsl_and,(char *)"Assertion",(char *)"add",
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"add",
                     (char *)"\\valid(new)",18);
   }
-  __initialize((void *)(& new->element),sizeof(int));
+  __e_acsl_initialize((void *)(& new->element),sizeof(int));
   new->element = i;
-  __initialize((void *)(& new->next),sizeof(struct list *));
+  __e_acsl_initialize((void *)(& new->next),sizeof(struct list *));
   new->next = l;
-  __delete_block((void *)(& l));
-  __delete_block((void *)(& new));
+  __e_acsl_delete_block((void *)(& l));
+  __e_acsl_delete_block((void *)(& new));
   return new;
 }
 
@@ -39,15 +39,15 @@ int main(void)
   int __retres;
   struct list *l;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& l),8UL);
-  __full_init((void *)(& l));
+  __e_acsl_store_block((void *)(& l),8UL);
+  __e_acsl_full_init((void *)(& l));
   l = (struct list *)0;
-  __full_init((void *)(& l));
+  __e_acsl_full_init((void *)(& l));
   l = add(l,4);
-  __full_init((void *)(& l));
+  __e_acsl_full_init((void *)(& l));
   l = add(l,7);
   __retres = 0;
-  __delete_block((void *)(& l));
+  __e_acsl_delete_block((void *)(& l));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_loop.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_loop.c
index 2516e147d1d0d2653a4decc8311dd01c6fa220d8..417f6083659d42f4c96dbb2c514af18db6a8ad1d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_loop.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_loop.c
@@ -7,18 +7,19 @@ void simple_loop(void)
     int i;
     i = 0;
     {
-      int __e_acsl_and;
-      if (0 <= i) __e_acsl_and = i <= 10; else __e_acsl_and = 0;
-      __e_acsl_assert(__e_acsl_and,(char *)"Invariant",(char *)"simple_loop",
-                      (char *)"0 <= i <= 10",8);
+      int __gen_e_acsl_and;
+      if (0 <= i) __gen_e_acsl_and = i <= 10; else __gen_e_acsl_and = 0;
+      __e_acsl_assert(__gen_e_acsl_and,(char *)"Invariant",
+                      (char *)"simple_loop",(char *)"0 <= i <= 10",8);
       /*@ loop invariant 0 ≤ i ≤ 10; */
       while (i < 10) {
         sum += i;
         {
-          int __e_acsl_and_2;
+          int __gen_e_acsl_and_2;
           i ++;
-          if (0 <= i) __e_acsl_and_2 = i <= 10; else __e_acsl_and_2 = 0;
-          __e_acsl_assert(__e_acsl_and_2,(char *)"Invariant",
+          if (0 <= i) __gen_e_acsl_and_2 = i <= 10;
+          else __gen_e_acsl_and_2 = 0;
+          __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Invariant",
                           (char *)"simple_loop",(char *)"0 <= i <= 10",8);
         }
       }
@@ -33,56 +34,57 @@ void nested_loops(void)
   int i;
   i = 0;
   {
-    int __e_acsl_and;
-    if (0 <= i) __e_acsl_and = i <= 10; else __e_acsl_and = 0;
-    __e_acsl_assert(__e_acsl_and,(char *)"Invariant",(char *)"nested_loops",
-                    (char *)"0 <= i <= 10",15);
+    int __gen_e_acsl_and;
+    if (0 <= i) __gen_e_acsl_and = i <= 10; else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Invariant",
+                    (char *)"nested_loops",(char *)"0 <= i <= 10",15);
     /*@ loop invariant 0 ≤ i ≤ 10; */
     while (i < 10) {
       {
         int j;
         j = 0;
         {
-          int __e_acsl_forall;
-          int __e_acsl_k;
-          int __e_acsl_l;
-          int __e_acsl_and_2;
-          __e_acsl_forall = 1;
-          __e_acsl_k = 0;
+          int __gen_e_acsl_forall;
+          int __gen_e_acsl_k;
+          int __gen_e_acsl_l;
+          int __gen_e_acsl_and_2;
+          __gen_e_acsl_forall = 1;
+          __gen_e_acsl_k = 0;
           while (1) {
-            if (__e_acsl_k < i) ; else break;
-            __e_acsl_l = 0;
+            if (__gen_e_acsl_k < i) ; else break;
+            __gen_e_acsl_l = 0;
             while (1) {
-              if (__e_acsl_l < j) ; else break;
-              __e_acsl_assert(__e_acsl_l < 15,(char *)"RTE",
+              if (__gen_e_acsl_l < j) ; else break;
+              __e_acsl_assert(__gen_e_acsl_l < 15,(char *)"RTE",
                               (char *)"nested_loops",
-                              (char *)"index_bound: __e_acsl_l < 15",19);
-              __e_acsl_assert(0 <= __e_acsl_l,(char *)"RTE",
+                              (char *)"index_bound: __gen_e_acsl_l < 15",19);
+              __e_acsl_assert(0 <= __gen_e_acsl_l,(char *)"RTE",
                               (char *)"nested_loops",
-                              (char *)"index_bound: 0 <= __e_acsl_l",19);
-              __e_acsl_assert(__e_acsl_k < 10,(char *)"RTE",
+                              (char *)"index_bound: 0 <= __gen_e_acsl_l",19);
+              __e_acsl_assert(__gen_e_acsl_k < 10,(char *)"RTE",
                               (char *)"nested_loops",
-                              (char *)"index_bound: __e_acsl_k < 10",19);
-              __e_acsl_assert(0 <= __e_acsl_k,(char *)"RTE",
+                              (char *)"index_bound: __gen_e_acsl_k < 10",19);
+              __e_acsl_assert(0 <= __gen_e_acsl_k,(char *)"RTE",
                               (char *)"nested_loops",
-                              (char *)"index_bound: 0 <= __e_acsl_k",19);
-              if ((long)t[__e_acsl_k][__e_acsl_l] == (long)__e_acsl_k * (long)__e_acsl_l) 
+                              (char *)"index_bound: 0 <= __gen_e_acsl_k",19);
+              if ((long)t[__gen_e_acsl_k][__gen_e_acsl_l] == (long)__gen_e_acsl_k * (long)__gen_e_acsl_l) 
                 ;
               else {
-                __e_acsl_forall = 0;
+                __gen_e_acsl_forall = 0;
                 goto e_acsl_end_loop1;
               }
-              __e_acsl_l ++;
+              __gen_e_acsl_l ++;
             }
-            __e_acsl_k ++;
+            __gen_e_acsl_k ++;
           }
           e_acsl_end_loop1: ;
-          __e_acsl_assert(__e_acsl_forall,(char *)"Invariant",
+          __e_acsl_assert(__gen_e_acsl_forall,(char *)"Invariant",
                           (char *)"nested_loops",
                           (char *)"\\forall integer k, integer l; 0 <= k < i && 0 <= l < j ==> t[k][l] == k*l",
                           19);
-          if (0 <= j) __e_acsl_and_2 = j <= 15; else __e_acsl_and_2 = 0;
-          __e_acsl_assert(__e_acsl_and_2,(char *)"Invariant",
+          if (0 <= j) __gen_e_acsl_and_2 = j <= 15;
+          else __gen_e_acsl_and_2 = 0;
+          __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Invariant",
                           (char *)"nested_loops",(char *)"0 <= j <= 15",17);
           /*@ loop invariant 0 ≤ j ≤ 15;
               loop invariant
@@ -92,54 +94,56 @@ void nested_loops(void)
           while (j < 15) {
             t[i][j] = i * j;
             {
-              int __e_acsl_and_3;
-              int __e_acsl_forall_2;
-              int __e_acsl_k_2;
-              int __e_acsl_l_2;
+              int __gen_e_acsl_and_3;
+              int __gen_e_acsl_forall_2;
+              int __gen_e_acsl_k_2;
+              int __gen_e_acsl_l_2;
               j ++;
-              if (0 <= j) __e_acsl_and_3 = j <= 15; else __e_acsl_and_3 = 0;
-              __e_acsl_assert(__e_acsl_and_3,(char *)"Invariant",
+              if (0 <= j) __gen_e_acsl_and_3 = j <= 15;
+              else __gen_e_acsl_and_3 = 0;
+              __e_acsl_assert(__gen_e_acsl_and_3,(char *)"Invariant",
                               (char *)"nested_loops",(char *)"0 <= j <= 15",
                               17);
-              __e_acsl_forall_2 = 1;
-              __e_acsl_k_2 = 0;
+              __gen_e_acsl_forall_2 = 1;
+              __gen_e_acsl_k_2 = 0;
               while (1) {
-                if (__e_acsl_k_2 < i) ; else break;
-                __e_acsl_l_2 = 0;
+                if (__gen_e_acsl_k_2 < i) ; else break;
+                __gen_e_acsl_l_2 = 0;
                 while (1) {
-                  if (__e_acsl_l_2 < j) ; else break;
-                  __e_acsl_assert(__e_acsl_l_2 < 15,(char *)"RTE",
+                  if (__gen_e_acsl_l_2 < j) ; else break;
+                  __e_acsl_assert(__gen_e_acsl_l_2 < 15,(char *)"RTE",
                                   (char *)"nested_loops",
-                                  (char *)"index_bound: __e_acsl_l_2 < 15",
+                                  (char *)"index_bound: __gen_e_acsl_l_2 < 15",
                                   19);
-                  __e_acsl_assert(0 <= __e_acsl_l_2,(char *)"RTE",
+                  __e_acsl_assert(0 <= __gen_e_acsl_l_2,(char *)"RTE",
                                   (char *)"nested_loops",
-                                  (char *)"index_bound: 0 <= __e_acsl_l_2",
+                                  (char *)"index_bound: 0 <= __gen_e_acsl_l_2",
                                   19);
-                  __e_acsl_assert(__e_acsl_k_2 < 10,(char *)"RTE",
+                  __e_acsl_assert(__gen_e_acsl_k_2 < 10,(char *)"RTE",
                                   (char *)"nested_loops",
-                                  (char *)"index_bound: __e_acsl_k_2 < 10",
+                                  (char *)"index_bound: __gen_e_acsl_k_2 < 10",
                                   19);
-                  __e_acsl_assert(0 <= __e_acsl_k_2,(char *)"RTE",
+                  __e_acsl_assert(0 <= __gen_e_acsl_k_2,(char *)"RTE",
                                   (char *)"nested_loops",
-                                  (char *)"index_bound: 0 <= __e_acsl_k_2",
+                                  (char *)"index_bound: 0 <= __gen_e_acsl_k_2",
                                   19);
                   /*@ assert
                       Value: initialisation:
-                        \initialized(&t[__e_acsl_k_2][__e_acsl_l_2]);
+                        \initialized(&t[__gen_e_acsl_k_2][__gen_e_acsl_l_2]);
                   */
-                  if ((long)t[__e_acsl_k_2][__e_acsl_l_2] == (long)__e_acsl_k_2 * (long)__e_acsl_l_2) 
+                  if ((long)t[__gen_e_acsl_k_2][__gen_e_acsl_l_2] == 
+                      (long)__gen_e_acsl_k_2 * (long)__gen_e_acsl_l_2) 
                     ;
                   else {
-                    __e_acsl_forall_2 = 0;
+                    __gen_e_acsl_forall_2 = 0;
                     goto e_acsl_end_loop2;
                   }
-                  __e_acsl_l_2 ++;
+                  __gen_e_acsl_l_2 ++;
                 }
-                __e_acsl_k_2 ++;
+                __gen_e_acsl_k_2 ++;
               }
               e_acsl_end_loop2: ;
-              __e_acsl_assert(__e_acsl_forall_2,(char *)"Invariant",
+              __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Invariant",
                               (char *)"nested_loops",
                               (char *)"\\forall integer k, integer l; 0 <= k < i && 0 <= l < j ==> t[k][l] == k*l",
                               19);
@@ -148,10 +152,11 @@ void nested_loops(void)
         }
       }
       {
-        int __e_acsl_and_4;
+        int __gen_e_acsl_and_4;
         i ++;
-        if (0 <= i) __e_acsl_and_4 = i <= 10; else __e_acsl_and_4 = 0;
-        __e_acsl_assert(__e_acsl_and_4,(char *)"Invariant",
+        if (0 <= i) __gen_e_acsl_and_4 = i <= 10;
+        else __gen_e_acsl_and_4 = 0;
+        __e_acsl_assert(__gen_e_acsl_and_4,(char *)"Invariant",
                         (char *)"nested_loops",(char *)"0 <= i <= 10",15);
       }
     }
@@ -167,19 +172,20 @@ void unnatural_loop(void)
     int i;
     i = 0;
     {
-      int __e_acsl_and;
-      if (0 <= i) __e_acsl_and = i <= 6; else __e_acsl_and = 0;
-      __e_acsl_assert(__e_acsl_and,(char *)"Invariant",
+      int __gen_e_acsl_and;
+      if (0 <= i) __gen_e_acsl_and = i <= 6; else __gen_e_acsl_and = 0;
+      __e_acsl_assert(__gen_e_acsl_and,(char *)"Invariant",
                       (char *)"unnatural_loop",(char *)"0 <= i <= 6",26);
       /*@ loop invariant 0 ≤ i ≤ 6; */
       while (i < 10) {
         if (x == 5) break;
         x = i;
         {
-          int __e_acsl_and_2;
+          int __gen_e_acsl_and_2;
           i ++;
-          if (0 <= i) __e_acsl_and_2 = i <= 6; else __e_acsl_and_2 = 0;
-          __e_acsl_assert(__e_acsl_and_2,(char *)"Invariant",
+          if (0 <= i) __gen_e_acsl_and_2 = i <= 6;
+          else __gen_e_acsl_and_2 = 0;
+          __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Invariant",
                           (char *)"unnatural_loop",(char *)"0 <= i <= 6",26);
         }
       }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_mainargs.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_mainargs.c
index 60e2c7f959d2d7ca4f2434c920e560de5c6f9a5b..c0192f76823dd3df863374717b1072a7874c5dee 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_mainargs.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_mainargs.c
@@ -6,67 +6,68 @@ int main(int argc, char **argv)
   __e_acsl_memory_init(& argc,& argv,8UL);
   /*@ assert \valid(&argc); */
   {
-    int __e_acsl_valid;
-    __store_block((void *)(& argc),4UL);
-    __store_block((void *)(& argv),8UL);
-    __e_acsl_valid = __valid((void *)(& argc),sizeof(int));
-    __e_acsl_assert(__e_acsl_valid,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_valid;
+    __e_acsl_store_block((void *)(& argc),4UL);
+    __e_acsl_store_block((void *)(& argv),8UL);
+    __gen_e_acsl_valid = __e_acsl_valid((void *)(& argc),sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(&argc)",10);
   }
   /*@ assert \valid(&argv); */
   {
-    int __e_acsl_valid_2;
-    __e_acsl_valid_2 = __valid((void *)(& argv),sizeof(char **));
-    __e_acsl_assert(__e_acsl_valid_2,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_valid_2;
+    __gen_e_acsl_valid_2 = __e_acsl_valid((void *)(& argv),sizeof(char **));
+    __e_acsl_assert(__gen_e_acsl_valid_2,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(&argv)",11);
   }
   /*@ assert ∀ int k; 0 ≤ k < argc ⇒ \valid(argv+k); */
   {
-    int __e_acsl_forall;
-    int __e_acsl_k;
-    __e_acsl_forall = 1;
-    __e_acsl_k = 0;
+    int __gen_e_acsl_forall;
+    int __gen_e_acsl_k;
+    __gen_e_acsl_forall = 1;
+    __gen_e_acsl_k = 0;
     while (1) {
-      if (__e_acsl_k < argc) ; else break;
+      if (__gen_e_acsl_k < argc) ; else break;
       {
-        int __e_acsl_valid_3;
-        __e_acsl_valid_3 = __valid((void *)(argv + __e_acsl_k),
-                                   sizeof(char *));
-        if (__e_acsl_valid_3) ;
+        int __gen_e_acsl_valid_3;
+        __gen_e_acsl_valid_3 = __e_acsl_valid((void *)(argv + __gen_e_acsl_k),
+                                              sizeof(char *));
+        if (__gen_e_acsl_valid_3) ;
         else {
-          __e_acsl_forall = 0;
+          __gen_e_acsl_forall = 0;
           goto e_acsl_end_loop1;
         }
       }
-      __e_acsl_k ++;
+      __gen_e_acsl_k ++;
     }
     e_acsl_end_loop1: ;
-    __e_acsl_assert(__e_acsl_forall,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall int k; 0 <= k < argc ==> \\valid(argv+k)",
                     12);
   }
   /*@ assert \block_length(argv) ≡ (argc+1)*sizeof(char *); */
   {
-    unsigned long __e_acsl_block_length;
-    mpz_t __e_acsl_block_length_2;
-    mpz_t __e_acsl;
-    int __e_acsl_eq;
-    __e_acsl_block_length = __block_length((void *)argv);
-    __gmpz_init_set_ui(__e_acsl_block_length_2,__e_acsl_block_length);
-    __gmpz_init_set_si(__e_acsl,((long)argc + (long)1) * 8L);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_block_length_2),
-                             (__mpz_struct const *)(__e_acsl));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    unsigned long __gen_e_acsl_block_length;
+    mpz_t __gen_e_acsl_block_length_2;
+    mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq;
+    __gen_e_acsl_block_length = __e_acsl_block_length((void *)argv);
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_2,__gen_e_acsl_block_length);
+    __gmpz_init_set_si(__gen_e_acsl_,((long)argc + (long)1) * 8L);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_block_length_2),
+                                 (__mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"\\block_length(argv) == (argc+1)*sizeof(char *)",
                     13);
-    __gmpz_clear(__e_acsl_block_length_2);
-    __gmpz_clear(__e_acsl);
+    __gmpz_clear(__gen_e_acsl_block_length_2);
+    __gmpz_clear(__gen_e_acsl_);
   }
   /*@ assert *(argv+argc) ≡ \null; */
   {
-    int __e_acsl_valid_read;
-    __e_acsl_valid_read = __valid_read((void *)(argv + argc),sizeof(char *));
-    __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"main",
+    int __gen_e_acsl_valid_read;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(argv + argc),
+                                                  sizeof(char *));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"main",
                     (char *)"mem_access: \\valid_read(argv+argc)",15);
     /*@ assert Value: mem_access: \valid_read(argv+argc); */
     __e_acsl_assert(*(argv + argc) == (void *)0,(char *)"Assertion",
@@ -74,23 +75,24 @@ int main(int argc, char **argv)
   }
   /*@ assert ¬\valid(*(argv+argc)); */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and;
-    __e_acsl_initialized = __initialized((void *)(argv + argc),
-                                         sizeof(char *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_valid_read_2;
-      int __e_acsl_valid_4;
-      __e_acsl_valid_read_2 = __valid_read((void *)(argv + argc),
-                                           sizeof(char *));
-      __e_acsl_assert(__e_acsl_valid_read_2,(char *)"RTE",(char *)"main",
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(argv + argc),
+                                                    sizeof(char *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_read_2;
+      int __gen_e_acsl_valid_4;
+      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(argv + argc),
+                                                      sizeof(char *));
+      __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",(char *)"main",
                       (char *)"mem_access: \\valid_read(argv+argc)",16);
       /*@ assert Value: mem_access: \valid_read(argv+argc); */
-      __e_acsl_valid_4 = __valid((void *)*(argv + argc),sizeof(char));
-      __e_acsl_and = __e_acsl_valid_4;
+      __gen_e_acsl_valid_4 = __e_acsl_valid((void *)*(argv + argc),
+                                            sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid_4;
     }
-    else __e_acsl_and = 0;
-    __e_acsl_assert(! __e_acsl_and,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(! __gen_e_acsl_and,(char *)"Assertion",(char *)"main",
                     (char *)"!\\valid(*(argv+argc))",16);
   }
   i = 0;
@@ -98,56 +100,60 @@ int main(int argc, char **argv)
     {
       int len;
       size_t tmp;
-      tmp = __e_acsl_strlen((char const *)*(argv + i));
+      tmp = __gen_e_acsl_strlen((char const *)*(argv + i));
       len = (int)tmp;
       /*@ assert \valid(*(argv+i)); */
       {
-        int __e_acsl_initialized_2;
-        int __e_acsl_and_2;
-        __e_acsl_initialized_2 = __initialized((void *)(argv + i),
-                                               sizeof(char *));
-        if (__e_acsl_initialized_2) {
-          int __e_acsl_valid_read_3;
-          int __e_acsl_valid_5;
-          __e_acsl_valid_read_3 = __valid_read((void *)(argv + i),
-                                               sizeof(char *));
-          __e_acsl_assert(__e_acsl_valid_read_3,(char *)"RTE",(char *)"main",
+        int __gen_e_acsl_initialized_2;
+        int __gen_e_acsl_and_2;
+        __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(argv + i),
+                                                          sizeof(char *));
+        if (__gen_e_acsl_initialized_2) {
+          int __gen_e_acsl_valid_read_3;
+          int __gen_e_acsl_valid_5;
+          __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)(argv + i),
+                                                          sizeof(char *));
+          __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"RTE",
+                          (char *)"main",
                           (char *)"mem_access: \\valid_read(argv+i)",19);
-          __e_acsl_valid_5 = __valid((void *)*(argv + i),sizeof(char));
-          __e_acsl_and_2 = __e_acsl_valid_5;
+          __gen_e_acsl_valid_5 = __e_acsl_valid((void *)*(argv + i),
+                                                sizeof(char));
+          __gen_e_acsl_and_2 = __gen_e_acsl_valid_5;
         }
-        else __e_acsl_and_2 = 0;
-        __e_acsl_assert(__e_acsl_and_2,(char *)"Assertion",(char *)"main",
-                        (char *)"\\valid(*(argv+i))",19);
+        else __gen_e_acsl_and_2 = 0;
+        __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Assertion",
+                        (char *)"main",(char *)"\\valid(*(argv+i))",19);
       }
       /*@ assert ∀ int k; 0 ≤ k ≤ len ⇒ \valid(*(argv+i)+k); */
       {
-        int __e_acsl_forall_2;
-        long __e_acsl_k_2;
-        __e_acsl_forall_2 = 1;
-        __e_acsl_k_2 = (long)0;
+        int __gen_e_acsl_forall_2;
+        long __gen_e_acsl_k_2;
+        __gen_e_acsl_forall_2 = 1;
+        __gen_e_acsl_k_2 = (long)0;
         while (1) {
-          if (__e_acsl_k_2 <= (long)len) ; else break;
+          if (__gen_e_acsl_k_2 <= (long)len) ; else break;
           {
-            int __e_acsl_valid_read_4;
-            int __e_acsl_valid_6;
-            __e_acsl_valid_read_4 = __valid_read((void *)(argv + i),
-                                                 sizeof(char *));
-            __e_acsl_assert(__e_acsl_valid_read_4,(char *)"RTE",
+            int __gen_e_acsl_valid_read_4;
+            int __gen_e_acsl_valid_6;
+            __gen_e_acsl_valid_read_4 = __e_acsl_valid_read((void *)(
+                                                            argv + i),
+                                                            sizeof(char *));
+            __e_acsl_assert(__gen_e_acsl_valid_read_4,(char *)"RTE",
                             (char *)"main",
                             (char *)"mem_access: \\valid_read(argv+i)",20);
-            __e_acsl_valid_6 = __valid((void *)(*(argv + i) + __e_acsl_k_2),
-                                       sizeof(char));
-            if (__e_acsl_valid_6) ;
+            __gen_e_acsl_valid_6 = __e_acsl_valid((void *)(*(argv + i) + __gen_e_acsl_k_2),
+                                                  sizeof(char));
+            if (__gen_e_acsl_valid_6) ;
             else {
-              __e_acsl_forall_2 = 0;
+              __gen_e_acsl_forall_2 = 0;
               goto e_acsl_end_loop2;
             }
           }
-          __e_acsl_k_2 ++;
+          __gen_e_acsl_k_2 ++;
         }
         e_acsl_end_loop2: ;
-        __e_acsl_assert(__e_acsl_forall_2,(char *)"Assertion",(char *)"main",
+        __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Assertion",
+                        (char *)"main",
                         (char *)"\\forall int k; 0 <= k <= len ==> \\valid(*(argv+i)+k)",
                         20);
       }
@@ -155,8 +161,8 @@ int main(int argc, char **argv)
     i ++;
   }
   __retres = 0;
-  __delete_block((void *)(& argc));
-  __delete_block((void *)(& argv));
+  __e_acsl_delete_block((void *)(& argc));
+  __e_acsl_delete_block((void *)(& argv));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_memsize.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_memsize.c
index 1cf25804fadab51454285e2f06eac95d7ef96327..b36c7fd023642732f35f85bdcbbb737adaed7f07 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_memsize.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_memsize.c
@@ -5,82 +5,90 @@ int main(int argc, char **argv)
   char *a;
   char *b;
   __e_acsl_memory_init(& argc,& argv,8UL);
-  __store_block((void *)(& b),8UL);
-  __store_block((void *)(& a),8UL);
-  __full_init((void *)(& a));
-  a = (char *)__e_acsl_malloc((unsigned long)7);
-  /*@ assert __heap_size ≡ 7; */
-  __e_acsl_assert(__heap_size == (unsigned long)7,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 7",22);
-  __full_init((void *)(& b));
-  b = (char *)__e_acsl_malloc((unsigned long)14);
-  /*@ assert __heap_size ≡ 21; */
-  __e_acsl_assert(__heap_size == (unsigned long)21,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 21",24);
-  __e_acsl_free((void *)a);
-  /*@ assert __heap_size ≡ 14; */
-  __e_acsl_assert(__heap_size == (unsigned long)14,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 14",28);
-  __full_init((void *)(& a));
+  __e_acsl_store_block((void *)(& b),8UL);
+  __e_acsl_store_block((void *)(& a),8UL);
+  __e_acsl_full_init((void *)(& a));
+  a = (char *)__gen_e_acsl_malloc((unsigned long)7);
+  /*@ assert __e_acsl_heap_size ≡ 7; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)7,(char *)"Assertion",
+                  (char *)"main",(char *)"__e_acsl_heap_size == 7",22);
+  __e_acsl_full_init((void *)(& b));
+  b = (char *)__gen_e_acsl_malloc((unsigned long)14);
+  /*@ assert __e_acsl_heap_size ≡ 21; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)21,
+                  (char *)"Assertion",(char *)"main",
+                  (char *)"__e_acsl_heap_size == 21",24);
+  __gen_e_acsl_free((void *)a);
+  /*@ assert __e_acsl_heap_size ≡ 14; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)14,
+                  (char *)"Assertion",(char *)"main",
+                  (char *)"__e_acsl_heap_size == 14",28);
+  __e_acsl_full_init((void *)(& a));
   a = (char *)0;
-  __e_acsl_free((void *)a);
-  /*@ assert __heap_size ≡ 14; */
-  __e_acsl_assert(__heap_size == (unsigned long)14,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 14",33);
-  __full_init((void *)(& b));
-  b = (char *)__e_acsl_realloc((void *)b,(unsigned long)9);
-  /*@ assert __heap_size ≡ 9; */
-  __e_acsl_assert(__heap_size == (unsigned long)9,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 9",37);
-  __full_init((void *)(& b));
-  b = (char *)__e_acsl_realloc((void *)b,(unsigned long)18);
-  /*@ assert __heap_size ≡ 18; */
-  __e_acsl_assert(__heap_size == (unsigned long)18,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 18",41);
-  __full_init((void *)(& b));
-  b = (char *)__e_acsl_realloc((void *)b,(unsigned long)0);
-  __full_init((void *)(& b));
+  __gen_e_acsl_free((void *)a);
+  /*@ assert __e_acsl_heap_size ≡ 14; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)14,
+                  (char *)"Assertion",(char *)"main",
+                  (char *)"__e_acsl_heap_size == 14",33);
+  __e_acsl_full_init((void *)(& b));
+  b = (char *)__gen_e_acsl_realloc((void *)b,(unsigned long)9);
+  /*@ assert __e_acsl_heap_size ≡ 9; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)9,(char *)"Assertion",
+                  (char *)"main",(char *)"__e_acsl_heap_size == 9",37);
+  __e_acsl_full_init((void *)(& b));
+  b = (char *)__gen_e_acsl_realloc((void *)b,(unsigned long)18);
+  /*@ assert __e_acsl_heap_size ≡ 18; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)18,
+                  (char *)"Assertion",(char *)"main",
+                  (char *)"__e_acsl_heap_size == 18",41);
+  __e_acsl_full_init((void *)(& b));
+  b = (char *)__gen_e_acsl_realloc((void *)b,(unsigned long)0);
+  __e_acsl_full_init((void *)(& b));
   b = (char *)0;
-  /*@ assert __heap_size ≡ 0; */
-  __e_acsl_assert(__heap_size == (unsigned long)0,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 0",46);
-  __full_init((void *)(& b));
-  b = (char *)__e_acsl_realloc((void *)b,(unsigned long)8);
-  /*@ assert __heap_size ≡ 8; */
-  __e_acsl_assert(__heap_size == (unsigned long)8,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 8",50);
-  __full_init((void *)(& b));
-  b = (char *)__e_acsl_realloc((void *)0,(unsigned long)8);
-  /*@ assert __heap_size ≡ 16; */
-  __e_acsl_assert(__heap_size == (unsigned long)16,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 16",54);
-  __full_init((void *)(& b));
-  b = (char *)__e_acsl_realloc((void *)0,18446744073709551615UL);
-  /*@ assert __heap_size ≡ 16; */
-  __e_acsl_assert(__heap_size == (unsigned long)16,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 16",58);
+  /*@ assert __e_acsl_heap_size ≡ 0; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)0,(char *)"Assertion",
+                  (char *)"main",(char *)"__e_acsl_heap_size == 0",46);
+  __e_acsl_full_init((void *)(& b));
+  b = (char *)__gen_e_acsl_realloc((void *)b,(unsigned long)8);
+  /*@ assert __e_acsl_heap_size ≡ 8; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)8,(char *)"Assertion",
+                  (char *)"main",(char *)"__e_acsl_heap_size == 8",50);
+  __e_acsl_full_init((void *)(& b));
+  b = (char *)__gen_e_acsl_realloc((void *)0,(unsigned long)8);
+  /*@ assert __e_acsl_heap_size ≡ 16; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)16,
+                  (char *)"Assertion",(char *)"main",
+                  (char *)"__e_acsl_heap_size == 16",54);
+  __e_acsl_full_init((void *)(& b));
+  b = (char *)__gen_e_acsl_realloc((void *)0,18446744073709551615UL);
+  /*@ assert __e_acsl_heap_size ≡ 16; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)16,
+                  (char *)"Assertion",(char *)"main",
+                  (char *)"__e_acsl_heap_size == 16",58);
   /*@ assert b ≡ (char *)((void *)0); */
   __e_acsl_assert(b == (char *)0,(char *)"Assertion",(char *)"main",
                   (char *)"b == (char *)((void *)0)",59);
-  __full_init((void *)(& b));
-  b = (char *)__calloc(18446744073709551615UL,18446744073709551615UL);
-  /*@ assert __heap_size ≡ 16; */
-  __e_acsl_assert(__heap_size == (unsigned long)16,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 16",63);
+  __e_acsl_full_init((void *)(& b));
+  b = (char *)__e_acsl_calloc(18446744073709551615UL,18446744073709551615UL);
+  /*@ assert __e_acsl_heap_size ≡ 16; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)16,
+                  (char *)"Assertion",(char *)"main",
+                  (char *)"__e_acsl_heap_size == 16",63);
   /*@ assert b ≡ (char *)((void *)0); */
   __e_acsl_assert(b == (char *)0,(char *)"Assertion",(char *)"main",
                   (char *)"b == (char *)((void *)0)",64);
-  __full_init((void *)(& b));
-  b = (char *)__e_acsl_malloc(18446744073709551615UL);
-  /*@ assert __heap_size ≡ 16; */
-  __e_acsl_assert(__heap_size == (unsigned long)16,(char *)"Assertion",
-                  (char *)"main",(char *)"__heap_size == 16",68);
+  __e_acsl_full_init((void *)(& b));
+  b = (char *)__gen_e_acsl_malloc(18446744073709551615UL);
+  /*@ assert __e_acsl_heap_size ≡ 16; */
+  __e_acsl_assert(__e_acsl_heap_size == (unsigned long)16,
+                  (char *)"Assertion",(char *)"main",
+                  (char *)"__e_acsl_heap_size == 16",68);
   /*@ assert b ≡ (char *)((void *)0); */
   __e_acsl_assert(b == (char *)0,(char *)"Assertion",(char *)"main",
                   (char *)"b == (char *)((void *)0)",69);
   __retres = 0;
-  __delete_block((void *)(& b));
-  __delete_block((void *)(& a));
+  __e_acsl_delete_block((void *)(& b));
+  __e_acsl_delete_block((void *)(& a));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_offset.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_offset.c
index 43875a289cfb2ef7399349f673ba4855ae077d3f..1c2e230fe1b2144e0e419794feda7d72a7adc81d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_offset.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_offset.c
@@ -3,10 +3,10 @@ int A[4] = {1, 2, 3, 4};
 int *PA;
 void __e_acsl_globals_init(void)
 {
-  __store_block((void *)(& PA),8UL);
-  __full_init((void *)(& PA));
-  __store_block((void *)(A),16UL);
-  __full_init((void *)(& A));
+  __e_acsl_store_block((void *)(& PA),8UL);
+  __e_acsl_full_init((void *)(& PA));
+  __e_acsl_store_block((void *)(A),16UL);
+  __e_acsl_full_init((void *)(& A));
   return;
 }
 
@@ -21,227 +21,227 @@ int main(void)
   long *q;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(& q),8UL);
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& pi),8UL);
-  __store_block((void *)(& pl),8UL);
-  __store_block((void *)(& l),8UL);
-  __store_block((void *)(a),16UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& pi),8UL);
+  __e_acsl_store_block((void *)(& pl),8UL);
+  __e_acsl_store_block((void *)(& l),8UL);
+  __e_acsl_store_block((void *)(a),16UL);
   PA = (int *)(& A);
   /*@ assert \offset((int *)A) ≡ 0; */
   {
-    int __e_acsl_offset;
-    __e_acsl_offset = __offset((void *)(A));
-    __e_acsl_assert((unsigned long)__e_acsl_offset == (unsigned long)0,
+    int __gen_e_acsl_offset;
+    __gen_e_acsl_offset = __e_acsl_offset((void *)(A));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset == (unsigned long)0,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset((int *)A) == 0",13);
   }
   /*@ assert \offset(&A[3]) ≡ 12; */
   {
-    int __e_acsl_offset_2;
-    __e_acsl_offset_2 = __offset((void *)(& A[3]));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_2 == (unsigned long)12,
+    int __gen_e_acsl_offset_2;
+    __gen_e_acsl_offset_2 = __e_acsl_offset((void *)(& A[3]));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_2 == (unsigned long)12,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(&A[3]) == 12",14);
   }
   /*@ assert \offset(PA) ≡ 0; */
   {
-    int __e_acsl_offset_3;
-    __e_acsl_offset_3 = __offset((void *)PA);
-    __e_acsl_assert((unsigned long)__e_acsl_offset_3 == (unsigned long)0,
+    int __gen_e_acsl_offset_3;
+    __gen_e_acsl_offset_3 = __e_acsl_offset((void *)PA);
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_3 == (unsigned long)0,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(PA) == 0",15);
   }
   PA ++;
   /*@ assert \offset(PA+1) ≡ 8; */
   {
-    int __e_acsl_offset_4;
-    __e_acsl_offset_4 = __offset((void *)(PA + 1));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_4 == (unsigned long)8,
+    int __gen_e_acsl_offset_4;
+    __gen_e_acsl_offset_4 = __e_acsl_offset((void *)(PA + 1));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_4 == (unsigned long)8,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(PA+1) == 8",17);
   }
-  __initialize((void *)(a),sizeof(int));
+  __e_acsl_initialize((void *)(a),sizeof(int));
   a[0] = 1;
-  __initialize((void *)(& a[1]),sizeof(int));
+  __e_acsl_initialize((void *)(& a[1]),sizeof(int));
   a[1] = 2;
-  __initialize((void *)(& a[2]),sizeof(int));
+  __e_acsl_initialize((void *)(& a[2]),sizeof(int));
   a[2] = 3;
-  __initialize((void *)(& a[3]),sizeof(int));
+  __e_acsl_initialize((void *)(& a[3]),sizeof(int));
   a[3] = 4;
   /*@ assert \offset((int *)a) ≡ 0; */
   {
-    int __e_acsl_offset_5;
-    __e_acsl_offset_5 = __offset((void *)(a));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_5 == (unsigned long)0,
+    int __gen_e_acsl_offset_5;
+    __gen_e_acsl_offset_5 = __e_acsl_offset((void *)(a));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_5 == (unsigned long)0,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset((int *)a) == 0",21);
   }
   /*@ assert \offset(&a[1]) ≡ 4; */
   {
-    int __e_acsl_offset_6;
-    __e_acsl_offset_6 = __offset((void *)(& a[1]));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_6 == (unsigned long)4,
+    int __gen_e_acsl_offset_6;
+    __gen_e_acsl_offset_6 = __e_acsl_offset((void *)(& a[1]));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_6 == (unsigned long)4,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(&a[1]) == 4",22);
   }
   /*@ assert \offset(&a[3]) ≡ 12; */
   {
-    int __e_acsl_offset_7;
-    __e_acsl_offset_7 = __offset((void *)(& a[3]));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_7 == (unsigned long)12,
+    int __gen_e_acsl_offset_7;
+    __gen_e_acsl_offset_7 = __e_acsl_offset((void *)(& a[3]));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_7 == (unsigned long)12,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(&a[3]) == 12",23);
   }
-  __full_init((void *)(& l));
+  __e_acsl_full_init((void *)(& l));
   l = (long)4;
-  __full_init((void *)(& pl));
+  __e_acsl_full_init((void *)(& pl));
   pl = (char *)(& l);
   /*@ assert \offset(&l) ≡ 0; */
   {
-    int __e_acsl_offset_8;
-    __e_acsl_offset_8 = __offset((void *)(& l));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_8 == (unsigned long)0,
+    int __gen_e_acsl_offset_8;
+    __gen_e_acsl_offset_8 = __e_acsl_offset((void *)(& l));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_8 == (unsigned long)0,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(&l) == 0",28);
   }
   /*@ assert \offset(pl) ≡ 0; */
   {
-    int __e_acsl_offset_9;
-    __e_acsl_offset_9 = __offset((void *)pl);
-    __e_acsl_assert((unsigned long)__e_acsl_offset_9 == (unsigned long)0,
+    int __gen_e_acsl_offset_9;
+    __gen_e_acsl_offset_9 = __e_acsl_offset((void *)pl);
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_9 == (unsigned long)0,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(pl) == 0",29);
   }
   /*@ assert \offset(pl+1) ≡ 1; */
   {
-    int __e_acsl_offset_10;
-    __e_acsl_offset_10 = __offset((void *)(pl + 1));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_10 == (unsigned long)1,
+    int __gen_e_acsl_offset_10;
+    __gen_e_acsl_offset_10 = __e_acsl_offset((void *)(pl + 1));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_10 == (unsigned long)1,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(pl+1) == 1",30);
   }
   /*@ assert \offset(pl+7) ≡ 7; */
   {
-    int __e_acsl_offset_11;
-    __e_acsl_offset_11 = __offset((void *)(pl + 7));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_11 == (unsigned long)7,
+    int __gen_e_acsl_offset_11;
+    __gen_e_acsl_offset_11 = __e_acsl_offset((void *)(pl + 7));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_11 == (unsigned long)7,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(pl+7) == 7",31);
   }
-  __full_init((void *)(& pi));
+  __e_acsl_full_init((void *)(& pi));
   pi = (int *)(& l);
   /*@ assert \offset(pi) ≡ 0; */
   {
-    int __e_acsl_offset_12;
-    __e_acsl_offset_12 = __offset((void *)pi);
-    __e_acsl_assert((unsigned long)__e_acsl_offset_12 == (unsigned long)0,
+    int __gen_e_acsl_offset_12;
+    __gen_e_acsl_offset_12 = __e_acsl_offset((void *)pi);
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_12 == (unsigned long)0,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(pi) == 0",33);
   }
-  __full_init((void *)(& pi));
+  __e_acsl_full_init((void *)(& pi));
   pi ++;
   /*@ assert \offset(pi) ≡ 4; */
   {
-    int __e_acsl_offset_13;
-    __e_acsl_offset_13 = __offset((void *)pi);
-    __e_acsl_assert((unsigned long)__e_acsl_offset_13 == (unsigned long)4,
+    int __gen_e_acsl_offset_13;
+    __gen_e_acsl_offset_13 = __e_acsl_offset((void *)pi);
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_13 == (unsigned long)4,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(pi) == 4",35);
   }
-  __full_init((void *)(& p));
-  p = (char *)__e_acsl_malloc((unsigned long)12);
+  __e_acsl_full_init((void *)(& p));
+  p = (char *)__gen_e_acsl_malloc((unsigned long)12);
   /*@ assert \offset(p) ≡ 0; */
   {
-    int __e_acsl_offset_14;
-    __e_acsl_offset_14 = __offset((void *)p);
-    __e_acsl_assert((unsigned long)__e_acsl_offset_14 == (unsigned long)0,
+    int __gen_e_acsl_offset_14;
+    __gen_e_acsl_offset_14 = __e_acsl_offset((void *)p);
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_14 == (unsigned long)0,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(p) == 0",39);
   }
   /*@ assert \offset(p+1) ≡ 1; */
   {
-    int __e_acsl_offset_15;
-    __e_acsl_offset_15 = __offset((void *)(p + 1));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_15 == (unsigned long)1,
+    int __gen_e_acsl_offset_15;
+    __gen_e_acsl_offset_15 = __e_acsl_offset((void *)(p + 1));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_15 == (unsigned long)1,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(p+1) == 1",40);
   }
   /*@ assert \offset(p+11) ≡ 11; */
   {
-    int __e_acsl_offset_16;
-    __e_acsl_offset_16 = __offset((void *)(p + 11));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_16 == (unsigned long)11,
+    int __gen_e_acsl_offset_16;
+    __gen_e_acsl_offset_16 = __e_acsl_offset((void *)(p + 11));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_16 == (unsigned long)11,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(p+11) == 11",41);
   }
-  __full_init((void *)(& p));
+  __e_acsl_full_init((void *)(& p));
   p += 5;
   /*@ assert \offset(p+5) ≡ 10; */
   {
-    int __e_acsl_offset_17;
-    __e_acsl_offset_17 = __offset((void *)(p + 5));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_17 == (unsigned long)10,
+    int __gen_e_acsl_offset_17;
+    __gen_e_acsl_offset_17 = __e_acsl_offset((void *)(p + 5));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_17 == (unsigned long)10,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(p+5) == 10",43);
   }
   /*@ assert \offset(p-5) ≡ 0; */
   {
-    int __e_acsl_offset_18;
-    __e_acsl_offset_18 = __offset((void *)(p - 5));
-    __e_acsl_assert((unsigned long)__e_acsl_offset_18 == (unsigned long)0,
+    int __gen_e_acsl_offset_18;
+    __gen_e_acsl_offset_18 = __e_acsl_offset((void *)(p - 5));
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_18 == (unsigned long)0,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(p-5) == 0",44);
   }
-  __full_init((void *)(& q));
-  q = (long *)__e_acsl_malloc((unsigned long)30 * sizeof(long));
+  __e_acsl_full_init((void *)(& q));
+  q = (long *)__gen_e_acsl_malloc((unsigned long)30 * sizeof(long));
   /*@ assert \offset(q) ≡ 0; */
   {
-    int __e_acsl_offset_19;
-    __e_acsl_offset_19 = __offset((void *)q);
-    __e_acsl_assert((unsigned long)__e_acsl_offset_19 == (unsigned long)0,
+    int __gen_e_acsl_offset_19;
+    __gen_e_acsl_offset_19 = __e_acsl_offset((void *)q);
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_19 == (unsigned long)0,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(q) == 0",49);
   }
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q ++;
   /*@ assert \offset(q) ≡ sizeof(long); */
   {
-    int __e_acsl_offset_20;
-    __e_acsl_offset_20 = __offset((void *)q);
-    __e_acsl_assert((unsigned long)__e_acsl_offset_20 == 8UL,
+    int __gen_e_acsl_offset_20;
+    __gen_e_acsl_offset_20 = __e_acsl_offset((void *)q);
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_20 == 8UL,
                     (char *)"Assertion",(char *)"main",
                     (char *)"\\offset(q) == sizeof(long)",51);
   }
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q += 2;
   /*@ assert \offset(q) ≡ sizeof(long)*3; */
   {
-    int __e_acsl_offset_21;
-    __e_acsl_offset_21 = __offset((void *)q);
-    __e_acsl_assert((unsigned long)__e_acsl_offset_21 == (unsigned long)(
+    int __gen_e_acsl_offset_21;
+    __gen_e_acsl_offset_21 = __e_acsl_offset((void *)q);
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_21 == (unsigned long)(
                     8 * 3),(char *)"Assertion",(char *)"main",
                     (char *)"\\offset(q) == sizeof(long)*3",53);
   }
-  __full_init((void *)(& q));
+  __e_acsl_full_init((void *)(& q));
   q += 4;
   /*@ assert \offset(q) ≡ sizeof(long)*7; */
   {
-    int __e_acsl_offset_22;
-    __e_acsl_offset_22 = __offset((void *)q);
-    __e_acsl_assert((unsigned long)__e_acsl_offset_22 == (unsigned long)(
+    int __gen_e_acsl_offset_22;
+    __gen_e_acsl_offset_22 = __e_acsl_offset((void *)q);
+    __e_acsl_assert((unsigned long)__gen_e_acsl_offset_22 == (unsigned long)(
                     8 * 7),(char *)"Assertion",(char *)"main",
                     (char *)"\\offset(q) == sizeof(long)*7",55);
   }
   __retres = 0;
-  __delete_block((void *)(& PA));
-  __delete_block((void *)(A));
-  __delete_block((void *)(& q));
-  __delete_block((void *)(& p));
-  __delete_block((void *)(& pi));
-  __delete_block((void *)(& pl));
-  __delete_block((void *)(& l));
-  __delete_block((void *)(a));
+  __e_acsl_delete_block((void *)(& PA));
+  __e_acsl_delete_block((void *)(A));
+  __e_acsl_delete_block((void *)(& q));
+  __e_acsl_delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(& pi));
+  __e_acsl_delete_block((void *)(& pl));
+  __e_acsl_delete_block((void *)(& l));
+  __e_acsl_delete_block((void *)(a));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr.c
index a5d213aa97917f1b1dd6f05533b8fd0b20a77a37..e559b441ee9b011beb77f9506a719808247d6276 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr.c
@@ -6,31 +6,32 @@ int main(void)
   int t[3];
   int *p;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(t),12UL);
-  __store_block((void *)(& x),4UL);
-  __full_init((void *)(& x));
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(t),12UL);
+  __e_acsl_store_block((void *)(& x),4UL);
+  __e_acsl_full_init((void *)(& x));
   x = 1;
-  __initialize((void *)(t),sizeof(int));
+  __e_acsl_initialize((void *)(t),sizeof(int));
   t[0] = 2;
-  __initialize((void *)(& t[1]),sizeof(int));
+  __e_acsl_initialize((void *)(& t[1]),sizeof(int));
   t[1] = 3;
-  __initialize((void *)(& t[2]),sizeof(int));
+  __e_acsl_initialize((void *)(& t[2]),sizeof(int));
   t[2] = 4;
-  __full_init((void *)(& p));
+  __e_acsl_full_init((void *)(& p));
   p = & x;
   /*@ assert *p ≡ 1; */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and;
-    __e_acsl_initialized = __initialized((void *)(& p),sizeof(int *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_valid_read;
-      __e_acsl_valid_read = __valid_read((void *)p,sizeof(int));
-      __e_acsl_and = __e_acsl_valid_read;
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
+                                                    sizeof(int *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_read;
+      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)p,sizeof(int));
+      __gen_e_acsl_and = __gen_e_acsl_valid_read;
     }
-    else __e_acsl_and = 0;
-    __e_acsl_assert(__e_acsl_and,(char *)"RTE",(char *)"main",
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"RTE",(char *)"main",
                     (char *)"mem_access: \\valid_read(p)",11);
     __e_acsl_assert(*p == 1,(char *)"Assertion",(char *)"main",
                     (char *)"*p == 1",11);
@@ -66,10 +67,11 @@ int main(void)
                       (char *)"t[2-i] == 4-i",18);
       /*@ assert *(&t[2]-i) ≡ 4-i; */
       {
-        int __e_acsl_valid_read_2;
-        __e_acsl_valid_read_2 = __valid_read((void *)(& t[2] - i),
-                                             sizeof(int));
-        __e_acsl_assert(__e_acsl_valid_read_2,(char *)"RTE",(char *)"main",
+        int __gen_e_acsl_valid_read_2;
+        __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(& t[2] - i),
+                                                        sizeof(int));
+        __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",
+                        (char *)"main",
                         (char *)"mem_access: \\valid_read(&t[2]-i)",19);
         __e_acsl_assert((long)*(& t[2] - i) == (long)4 - (long)i,
                         (char *)"Assertion",(char *)"main",
@@ -78,30 +80,31 @@ int main(void)
       i ++;
     }
   }
-  __full_init((void *)(& p));
+  __e_acsl_full_init((void *)(& p));
   p = & t[2];
-  __initialize((void *)(& t[2]),sizeof(int));
+  __e_acsl_initialize((void *)(& t[2]),sizeof(int));
   t[2] = 5;
   /*@ assert *p ≡ 5; */
   {
-    int __e_acsl_initialized_2;
-    int __e_acsl_and_2;
-    __e_acsl_initialized_2 = __initialized((void *)(& p),sizeof(int *));
-    if (__e_acsl_initialized_2) {
-      int __e_acsl_valid_read_3;
-      __e_acsl_valid_read_3 = __valid_read((void *)p,sizeof(int));
-      __e_acsl_and_2 = __e_acsl_valid_read_3;
+    int __gen_e_acsl_initialized_2;
+    int __gen_e_acsl_and_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& p),
+                                                      sizeof(int *));
+    if (__gen_e_acsl_initialized_2) {
+      int __gen_e_acsl_valid_read_3;
+      __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)p,sizeof(int));
+      __gen_e_acsl_and_2 = __gen_e_acsl_valid_read_3;
     }
-    else __e_acsl_and_2 = 0;
-    __e_acsl_assert(__e_acsl_and_2,(char *)"RTE",(char *)"main",
+    else __gen_e_acsl_and_2 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_2,(char *)"RTE",(char *)"main",
                     (char *)"mem_access: \\valid_read(p)",25);
     __e_acsl_assert(*p == 5,(char *)"Assertion",(char *)"main",
                     (char *)"*p == 5",25);
   }
   __retres = 0;
-  __delete_block((void *)(& p));
-  __delete_block((void *)(t));
-  __delete_block((void *)(& x));
+  __e_acsl_delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(t));
+  __e_acsl_delete_block((void *)(& x));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr_init.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr_init.c
index 0b3e6de4726af6f5bf14c8d3982e6b68e3fbdb99..ac6b3c0e4c95d9f36ed8bf01f3f9436b6d8df02d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr_init.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_ptr_init.c
@@ -10,19 +10,19 @@ void f(void)
 void g(int *C, int *D)
 {
   /*@ assert \initialized(&C); */
-  __store_block((void *)(& C),8UL);
+  __e_acsl_store_block((void *)(& C),8UL);
   __e_acsl_assert(1,(char *)"Assertion",(char *)"g",
                   (char *)"\\initialized(&C)",16);
-  __delete_block((void *)(& C));
+  __e_acsl_delete_block((void *)(& C));
   return;
 }
 
 void __e_acsl_globals_init(void)
 {
-  __store_block((void *)(& B),8UL);
-  __full_init((void *)(& B));
-  __store_block((void *)(& A),8UL);
-  __full_init((void *)(& A));
+  __e_acsl_store_block((void *)(& B),8UL);
+  __e_acsl_full_init((void *)(& B));
+  __e_acsl_store_block((void *)(& A),8UL);
+  __e_acsl_full_init((void *)(& A));
   return;
 }
 
@@ -33,12 +33,12 @@ int main(void)
   int *y;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(& y),8UL);
-  __store_block((void *)(& x),8UL);
-  B = (int *)__e_acsl_malloc(sizeof(int));
-  __full_init((void *)(& y));
-  y = (int *)__e_acsl_malloc(sizeof(int));
-  __full_init((void *)(& x));
+  __e_acsl_store_block((void *)(& y),8UL);
+  __e_acsl_store_block((void *)(& x),8UL);
+  B = (int *)__gen_e_acsl_malloc(sizeof(int));
+  __e_acsl_full_init((void *)(& y));
+  y = (int *)__gen_e_acsl_malloc(sizeof(int));
+  __e_acsl_full_init((void *)(& x));
   x = y;
   f();
   /*@ assert \initialized(&A); */
@@ -46,17 +46,18 @@ int main(void)
                   (char *)"\\initialized(&A)",25);
   /*@ assert \initialized(&x); */
   {
-    int __e_acsl_initialized;
-    __e_acsl_initialized = __initialized((void *)(& x),sizeof(int *));
-    __e_acsl_assert(__e_acsl_initialized,(char *)"Assertion",(char *)"main",
-                    (char *)"\\initialized(&x)",26);
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& x),
+                                                    sizeof(int *));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(&x)",26);
   }
   g(x,y);
   __retres = 0;
-  __delete_block((void *)(& B));
-  __delete_block((void *)(& A));
-  __delete_block((void *)(& y));
-  __delete_block((void *)(& x));
+  __e_acsl_delete_block((void *)(& B));
+  __e_acsl_delete_block((void *)(& A));
+  __e_acsl_delete_block((void *)(& y));
+  __e_acsl_delete_block((void *)(& x));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result.c
index 48a61b45a89c65b75604ab53cb3acf7191da9004..6c1e496f75c15df488769235e860cef434f170cf 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_result.c
@@ -7,15 +7,15 @@ int f(int x)
 }
 
 /*@ ensures \result ≡ (int)(\old(x)-\old(x)); */
-int __e_acsl_f(int x)
+int __gen_e_acsl_f(int x)
 {
-  int __e_acsl_at_2;
-  int __e_acsl_at;
+  int __gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
   int __retres;
-  __e_acsl_at_2 = x;
-  __e_acsl_at = x;
+  __gen_e_acsl_at_2 = x;
+  __gen_e_acsl_at = x;
   __retres = f(x);
-  __e_acsl_assert(__retres == (int)((long)__e_acsl_at - (long)__e_acsl_at_2),
+  __e_acsl_assert(__retres == (int)((long)__gen_e_acsl_at - (long)__gen_e_acsl_at_2),
                   (char *)"Postcondition",(char *)"f",
                   (char *)"\\result == (int)(\\old(x)-\\old(x))",5);
   return __retres;
@@ -29,7 +29,7 @@ int g(int x)
 }
 
 /*@ ensures \result ≡ Y; */
-int __e_acsl_g(int x)
+int __gen_e_acsl_g(int x)
 {
   int __retres;
   __retres = g(x);
@@ -47,7 +47,7 @@ int h(void)
 }
 
 /*@ ensures \result ≡ 0; */
-int __e_acsl_h(void)
+int __gen_e_acsl_h(void)
 {
   int __retres;
   __retres = h();
@@ -59,9 +59,9 @@ int __e_acsl_h(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_f(1);
-  __e_acsl_g(Y);
-  __e_acsl_h();
+  __gen_e_acsl_f(1);
+  __gen_e_acsl_g(Y);
+  __gen_e_acsl_h();
   __retres = 0;
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stdout.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stdout.c
index ff3d6fe78a1a7234a4a37a56440452a738174a81..48cb9f342ffe2a6e54f85c0389adcc3c7c1411ad 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stdout.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stdout.c
@@ -1,18 +1,19 @@
 /* Generated by Frama-C */
-char *__e_acsl_literal_string_2;
-char *__e_acsl_literal_string;
+char *__gen_e_acsl_literal_string_2;
+char *__gen_e_acsl_literal_string;
 void __e_acsl_globals_init(void)
 {
-  __e_acsl_literal_string_2 = "wb";
-  __store_block((void *)__e_acsl_literal_string_2,sizeof("wb"));
-  __full_init((void *)__e_acsl_literal_string_2);
-  __readonly((void *)__e_acsl_literal_string_2);
-  __e_acsl_literal_string = "/tmp/foo";
-  __store_block((void *)__e_acsl_literal_string,sizeof("/tmp/foo"));
-  __full_init((void *)__e_acsl_literal_string);
-  __readonly((void *)__e_acsl_literal_string);
-  __store_block((void *)(& stdout),8UL);
-  __full_init((void *)(& stdout));
+  __gen_e_acsl_literal_string_2 = "wb";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string_2,sizeof("wb"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string_2);
+  __gen_e_acsl_literal_string = "/tmp/foo";
+  __e_acsl_store_block((void *)__gen_e_acsl_literal_string,
+                       sizeof("/tmp/foo"));
+  __e_acsl_full_init((void *)__gen_e_acsl_literal_string);
+  __e_acsl_readonly((void *)__gen_e_acsl_literal_string);
+  __e_acsl_store_block((void *)(& stdout),8UL);
+  __e_acsl_full_init((void *)(& stdout));
   return;
 }
 
@@ -23,16 +24,17 @@ int main(void)
   FILE *f2;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(& f),8UL);
-  __full_init((void *)(& f));
+  __e_acsl_store_block((void *)(& f),8UL);
+  __e_acsl_full_init((void *)(& f));
   f = stdout;
-  f2 = __e_acsl_fopen(__e_acsl_literal_string,__e_acsl_literal_string_2);
+  f2 = __gen_e_acsl_fopen(__gen_e_acsl_literal_string,
+                          __gen_e_acsl_literal_string_2);
   /*@ assert f ≡ __fc_stdout; */
   __e_acsl_assert(f == stdout,(char *)"Assertion",(char *)"main",
                   (char *)"f == __fc_stdout",11);
   __retres = 0;
-  __delete_block((void *)(& stdout));
-  __delete_block((void *)(& f));
+  __e_acsl_delete_block((void *)(& stdout));
+  __e_acsl_delete_block((void *)(& f));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract.c
index c463b12a7a38aeaa9de203f021c09fa124bb9179..66ebebe18dc1105f6488ff3291c260b95c8d8935 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_stmt_contract.c
@@ -65,24 +65,26 @@ int main(void)
         requires x+y ≡ 5;
   */
   {
-    int __e_acsl_implies;
-    int __e_acsl_and;
-    int __e_acsl_implies_2;
-    int __e_acsl_and_2;
-    int __e_acsl_implies_3;
-    if (! (x == 1)) __e_acsl_implies = 1; else __e_acsl_implies = x == 0;
-    __e_acsl_assert(__e_acsl_implies,(char *)"Precondition",(char *)"main",
-                    (char *)"x == 1 ==> x == 0",33);
-    if (x == 3) __e_acsl_and = y == 2; else __e_acsl_and = 0;
-    if (! __e_acsl_and) __e_acsl_implies_2 = 1;
-    else __e_acsl_implies_2 = x == 3;
-    __e_acsl_assert(__e_acsl_implies_2,(char *)"Precondition",(char *)"main",
-                    (char *)"x == 3 && y == 2 ==> x == 3",37);
-    if (x == 3) __e_acsl_and_2 = y == 2; else __e_acsl_and_2 = 0;
-    if (! __e_acsl_and_2) __e_acsl_implies_3 = 1;
-    else __e_acsl_implies_3 = (long)x + (long)y == (long)5;
-    __e_acsl_assert(__e_acsl_implies_3,(char *)"Precondition",(char *)"main",
-                    (char *)"x == 3 && y == 2 ==> x+y == 5",38);
+    int __gen_e_acsl_implies;
+    int __gen_e_acsl_and;
+    int __gen_e_acsl_implies_2;
+    int __gen_e_acsl_and_2;
+    int __gen_e_acsl_implies_3;
+    if (! (x == 1)) __gen_e_acsl_implies = 1;
+    else __gen_e_acsl_implies = x == 0;
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Precondition",
+                    (char *)"main",(char *)"x == 1 ==> x == 0",33);
+    if (x == 3) __gen_e_acsl_and = y == 2; else __gen_e_acsl_and = 0;
+    if (! __gen_e_acsl_and) __gen_e_acsl_implies_2 = 1;
+    else __gen_e_acsl_implies_2 = x == 3;
+    __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Precondition",
+                    (char *)"main",(char *)"x == 3 && y == 2 ==> x == 3",37);
+    if (x == 3) __gen_e_acsl_and_2 = y == 2; else __gen_e_acsl_and_2 = 0;
+    if (! __gen_e_acsl_and_2) __gen_e_acsl_implies_3 = 1;
+    else __gen_e_acsl_implies_3 = (long)x + (long)y == (long)5;
+    __e_acsl_assert(__gen_e_acsl_implies_3,(char *)"Precondition",
+                    (char *)"main",(char *)"x == 3 && y == 2 ==> x+y == 5",
+                    38);
     x += y;
   }
   /*@ requires x ≡ 5; */
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid.c
index c3b7d26d52a678165abc605f73decc8a21e28753..02a945dca83c592e6948a11f49ab156948621f1b 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid.c
@@ -6,57 +6,58 @@ int Z;
 int *f(int *x)
 {
   int *y;
-  __store_block((void *)(& y),8UL);
+  __e_acsl_store_block((void *)(& y),8UL);
   /*@ assert ¬\valid(y); */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and;
-    __store_block((void *)(& x),8UL);
-    __e_acsl_initialized = __initialized((void *)(& y),sizeof(int *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_valid;
-      __e_acsl_valid = __valid((void *)y,sizeof(int));
-      __e_acsl_and = __e_acsl_valid;
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __e_acsl_store_block((void *)(& x),8UL);
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& y),
+                                                    sizeof(int *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid;
+      __gen_e_acsl_valid = __e_acsl_valid((void *)y,sizeof(int));
+      __gen_e_acsl_and = __gen_e_acsl_valid;
     }
-    else __e_acsl_and = 0;
-    __e_acsl_assert(! __e_acsl_and,(char *)"Assertion",(char *)"f",
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(! __gen_e_acsl_and,(char *)"Assertion",(char *)"f",
                     (char *)"!\\valid(y)",17);
   }
-  __full_init((void *)(& y));
+  __e_acsl_full_init((void *)(& y));
   y = x;
   /*@ assert \valid(x); */
   {
-    int __e_acsl_valid_2;
-    __e_acsl_valid_2 = __valid((void *)x,sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_2,(char *)"Assertion",(char *)"f",
+    int __gen_e_acsl_valid_2;
+    __gen_e_acsl_valid_2 = __e_acsl_valid((void *)x,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_2,(char *)"Assertion",(char *)"f",
                     (char *)"\\valid(x)",19);
   }
-  __delete_block((void *)(& x));
-  __delete_block((void *)(& y));
+  __e_acsl_delete_block((void *)(& x));
+  __e_acsl_delete_block((void *)(& y));
   return y;
 }
 
 /*@ requires \valid(x);
     ensures \valid(\result); */
-int *__e_acsl_f(int *x)
+int *__gen_e_acsl_f(int *x)
 {
   int *__retres;
-  __store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   {
-    int __e_acsl_valid;
-    __store_block((void *)(& x),8UL);
-    __e_acsl_valid = __valid((void *)x,sizeof(int));
-    __e_acsl_assert(__e_acsl_valid,(char *)"Precondition",(char *)"f",
+    int __gen_e_acsl_valid;
+    __e_acsl_store_block((void *)(& x),8UL);
+    __gen_e_acsl_valid = __e_acsl_valid((void *)x,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Precondition",(char *)"f",
                     (char *)"\\valid(x)",13);
     __retres = f(x);
   }
   {
-    int __e_acsl_valid_2;
-    __e_acsl_valid_2 = __valid((void *)__retres,sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_2,(char *)"Postcondition",(char *)"f",
+    int __gen_e_acsl_valid_2;
+    __gen_e_acsl_valid_2 = __e_acsl_valid((void *)__retres,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_2,(char *)"Postcondition",(char *)"f",
                     (char *)"\\valid(\\result)",14);
-    __delete_block((void *)(& x));
-    __delete_block((void *)(& __retres));
+    __e_acsl_delete_block((void *)(& x));
+    __e_acsl_delete_block((void *)(& __retres));
     return __retres;
   }
 }
@@ -66,52 +67,54 @@ void g(void)
   int m;
   int *u;
   int **p;
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& u),8UL);
-  __store_block((void *)(& m),4UL);
-  __full_init((void *)(& p));
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& u),8UL);
+  __e_acsl_store_block((void *)(& m),4UL);
+  __e_acsl_full_init((void *)(& p));
   p = & u;
-  __full_init((void *)(& u));
+  __e_acsl_full_init((void *)(& u));
   u = & m;
-  __full_init((void *)(& m));
+  __e_acsl_full_init((void *)(& m));
   m = 123;
   /*@ assert \valid(*p); */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and_2;
-    __e_acsl_initialized = __initialized((void *)p,sizeof(int *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_initialized_2;
-      int __e_acsl_and;
-      int __e_acsl_valid;
-      __e_acsl_initialized_2 = __initialized((void *)(& p),sizeof(int **));
-      if (__e_acsl_initialized_2) {
-        int __e_acsl_valid_read;
-        __e_acsl_valid_read = __valid_read((void *)p,sizeof(int *));
-        __e_acsl_and = __e_acsl_valid_read;
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and_2;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_initialized_2;
+      int __gen_e_acsl_and;
+      int __gen_e_acsl_valid;
+      __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& p),
+                                                        sizeof(int **));
+      if (__gen_e_acsl_initialized_2) {
+        int __gen_e_acsl_valid_read;
+        __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)p,
+                                                      sizeof(int *));
+        __gen_e_acsl_and = __gen_e_acsl_valid_read;
       }
-      else __e_acsl_and = 0;
-      __e_acsl_assert(__e_acsl_and,(char *)"RTE",(char *)"g",
+      else __gen_e_acsl_and = 0;
+      __e_acsl_assert(__gen_e_acsl_and,(char *)"RTE",(char *)"g",
                       (char *)"mem_access: \\valid_read(p)",28);
-      __e_acsl_valid = __valid((void *)*p,sizeof(int));
-      __e_acsl_and_2 = __e_acsl_valid;
+      __gen_e_acsl_valid = __e_acsl_valid((void *)*p,sizeof(int));
+      __gen_e_acsl_and_2 = __gen_e_acsl_valid;
     }
-    else __e_acsl_and_2 = 0;
-    __e_acsl_assert(__e_acsl_and_2,(char *)"Assertion",(char *)"g",
+    else __gen_e_acsl_and_2 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Assertion",(char *)"g",
                     (char *)"\\valid(*p)",28);
   }
-  __delete_block((void *)(& p));
-  __delete_block((void *)(& u));
-  __delete_block((void *)(& m));
+  __e_acsl_delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(& u));
+  __e_acsl_delete_block((void *)(& m));
   return;
 }
 
 void __e_acsl_globals_init(void)
 {
-  __store_block((void *)(& Z),4UL);
-  __full_init((void *)(& Z));
-  __store_block((void *)(& X),8UL);
-  __full_init((void *)(& X));
+  __e_acsl_store_block((void *)(& Z),4UL);
+  __e_acsl_full_init((void *)(& Z));
+  __e_acsl_store_block((void *)(& X),8UL);
+  __e_acsl_full_init((void *)(& X));
   return;
 }
 
@@ -125,328 +128,349 @@ int main(void)
   int n;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __store_block((void *)(& n),4UL);
-  __store_block((void *)(& d),8UL);
-  __store_block((void *)(& c),8UL);
-  __store_block((void *)(& b),8UL);
-  __store_block((void *)(& a),8UL);
-  __full_init((void *)(& n));
+  __e_acsl_store_block((void *)(& n),4UL);
+  __e_acsl_store_block((void *)(& d),8UL);
+  __e_acsl_store_block((void *)(& c),8UL);
+  __e_acsl_store_block((void *)(& b),8UL);
+  __e_acsl_store_block((void *)(& a),8UL);
+  __e_acsl_full_init((void *)(& n));
   n = 0;
   /*@ assert ¬\valid(a) ∧ ¬\valid(b) ∧ ¬\valid(X); */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and;
-    int __e_acsl_and_3;
-    int __e_acsl_and_4;
-    __e_acsl_initialized = __initialized((void *)(& a),sizeof(int *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_valid;
-      __e_acsl_valid = __valid((void *)a,sizeof(int));
-      __e_acsl_and = __e_acsl_valid;
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    int __gen_e_acsl_and_3;
+    int __gen_e_acsl_and_4;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& a),
+                                                    sizeof(int *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid;
+      __gen_e_acsl_valid = __e_acsl_valid((void *)a,sizeof(int));
+      __gen_e_acsl_and = __gen_e_acsl_valid;
     }
-    else __e_acsl_and = 0;
-    if (! __e_acsl_and) {
-      int __e_acsl_initialized_2;
-      int __e_acsl_and_2;
-      __e_acsl_initialized_2 = __initialized((void *)(& b),sizeof(int *));
-      if (__e_acsl_initialized_2) {
-        int __e_acsl_valid_2;
-        __e_acsl_valid_2 = __valid((void *)b,sizeof(int));
-        __e_acsl_and_2 = __e_acsl_valid_2;
+    else __gen_e_acsl_and = 0;
+    if (! __gen_e_acsl_and) {
+      int __gen_e_acsl_initialized_2;
+      int __gen_e_acsl_and_2;
+      __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& b),
+                                                        sizeof(int *));
+      if (__gen_e_acsl_initialized_2) {
+        int __gen_e_acsl_valid_2;
+        __gen_e_acsl_valid_2 = __e_acsl_valid((void *)b,sizeof(int));
+        __gen_e_acsl_and_2 = __gen_e_acsl_valid_2;
       }
-      else __e_acsl_and_2 = 0;
-      __e_acsl_and_3 = ! __e_acsl_and_2;
+      else __gen_e_acsl_and_2 = 0;
+      __gen_e_acsl_and_3 = ! __gen_e_acsl_and_2;
     }
-    else __e_acsl_and_3 = 0;
-    if (__e_acsl_and_3) {
-      int __e_acsl_valid_3;
-      __e_acsl_valid_3 = __valid((void *)X,sizeof(int));
-      __e_acsl_and_4 = ! __e_acsl_valid_3;
+    else __gen_e_acsl_and_3 = 0;
+    if (__gen_e_acsl_and_3) {
+      int __gen_e_acsl_valid_3;
+      __gen_e_acsl_valid_3 = __e_acsl_valid((void *)X,sizeof(int));
+      __gen_e_acsl_and_4 = ! __gen_e_acsl_valid_3;
     }
-    else __e_acsl_and_4 = 0;
-    __e_acsl_assert(__e_acsl_and_4,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_4 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_4,(char *)"Assertion",(char *)"main",
                     (char *)"!\\valid(a) && !\\valid(b) && !\\valid(X)",33);
   }
-  __full_init((void *)(& a));
-  a = (int *)__e_acsl_malloc(sizeof(int));
+  __e_acsl_full_init((void *)(& a));
+  a = (int *)__gen_e_acsl_malloc(sizeof(int));
   /*@ assert \valid(a) ∧ ¬\valid(b) ∧ ¬\valid(X); */
   {
-    int __e_acsl_initialized_3;
-    int __e_acsl_and_5;
-    int __e_acsl_and_7;
-    int __e_acsl_and_8;
-    __e_acsl_initialized_3 = __initialized((void *)(& a),sizeof(int *));
-    if (__e_acsl_initialized_3) {
-      int __e_acsl_valid_4;
-      __e_acsl_valid_4 = __valid((void *)a,sizeof(int));
-      __e_acsl_and_5 = __e_acsl_valid_4;
+    int __gen_e_acsl_initialized_3;
+    int __gen_e_acsl_and_5;
+    int __gen_e_acsl_and_7;
+    int __gen_e_acsl_and_8;
+    __gen_e_acsl_initialized_3 = __e_acsl_initialized((void *)(& a),
+                                                      sizeof(int *));
+    if (__gen_e_acsl_initialized_3) {
+      int __gen_e_acsl_valid_4;
+      __gen_e_acsl_valid_4 = __e_acsl_valid((void *)a,sizeof(int));
+      __gen_e_acsl_and_5 = __gen_e_acsl_valid_4;
     }
-    else __e_acsl_and_5 = 0;
-    if (__e_acsl_and_5) {
-      int __e_acsl_initialized_4;
-      int __e_acsl_and_6;
-      __e_acsl_initialized_4 = __initialized((void *)(& b),sizeof(int *));
-      if (__e_acsl_initialized_4) {
-        int __e_acsl_valid_5;
-        __e_acsl_valid_5 = __valid((void *)b,sizeof(int));
-        __e_acsl_and_6 = __e_acsl_valid_5;
+    else __gen_e_acsl_and_5 = 0;
+    if (__gen_e_acsl_and_5) {
+      int __gen_e_acsl_initialized_4;
+      int __gen_e_acsl_and_6;
+      __gen_e_acsl_initialized_4 = __e_acsl_initialized((void *)(& b),
+                                                        sizeof(int *));
+      if (__gen_e_acsl_initialized_4) {
+        int __gen_e_acsl_valid_5;
+        __gen_e_acsl_valid_5 = __e_acsl_valid((void *)b,sizeof(int));
+        __gen_e_acsl_and_6 = __gen_e_acsl_valid_5;
       }
-      else __e_acsl_and_6 = 0;
-      __e_acsl_and_7 = ! __e_acsl_and_6;
+      else __gen_e_acsl_and_6 = 0;
+      __gen_e_acsl_and_7 = ! __gen_e_acsl_and_6;
     }
-    else __e_acsl_and_7 = 0;
-    if (__e_acsl_and_7) {
-      int __e_acsl_valid_6;
-      __e_acsl_valid_6 = __valid((void *)X,sizeof(int));
-      __e_acsl_and_8 = ! __e_acsl_valid_6;
+    else __gen_e_acsl_and_7 = 0;
+    if (__gen_e_acsl_and_7) {
+      int __gen_e_acsl_valid_6;
+      __gen_e_acsl_valid_6 = __e_acsl_valid((void *)X,sizeof(int));
+      __gen_e_acsl_and_8 = ! __gen_e_acsl_valid_6;
     }
-    else __e_acsl_and_8 = 0;
-    __e_acsl_assert(__e_acsl_and_8,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_8 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_8,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(a) && !\\valid(b) && !\\valid(X)",35);
   }
   X = a;
   /*@ assert \valid(a) ∧ ¬\valid(b) ∧ \valid(X); */
   {
-    int __e_acsl_initialized_5;
-    int __e_acsl_and_9;
-    int __e_acsl_and_11;
-    int __e_acsl_and_12;
-    __e_acsl_initialized_5 = __initialized((void *)(& a),sizeof(int *));
-    if (__e_acsl_initialized_5) {
-      int __e_acsl_valid_7;
-      __e_acsl_valid_7 = __valid((void *)a,sizeof(int));
-      __e_acsl_and_9 = __e_acsl_valid_7;
+    int __gen_e_acsl_initialized_5;
+    int __gen_e_acsl_and_9;
+    int __gen_e_acsl_and_11;
+    int __gen_e_acsl_and_12;
+    __gen_e_acsl_initialized_5 = __e_acsl_initialized((void *)(& a),
+                                                      sizeof(int *));
+    if (__gen_e_acsl_initialized_5) {
+      int __gen_e_acsl_valid_7;
+      __gen_e_acsl_valid_7 = __e_acsl_valid((void *)a,sizeof(int));
+      __gen_e_acsl_and_9 = __gen_e_acsl_valid_7;
     }
-    else __e_acsl_and_9 = 0;
-    if (__e_acsl_and_9) {
-      int __e_acsl_initialized_6;
-      int __e_acsl_and_10;
-      __e_acsl_initialized_6 = __initialized((void *)(& b),sizeof(int *));
-      if (__e_acsl_initialized_6) {
-        int __e_acsl_valid_8;
-        __e_acsl_valid_8 = __valid((void *)b,sizeof(int));
-        __e_acsl_and_10 = __e_acsl_valid_8;
+    else __gen_e_acsl_and_9 = 0;
+    if (__gen_e_acsl_and_9) {
+      int __gen_e_acsl_initialized_6;
+      int __gen_e_acsl_and_10;
+      __gen_e_acsl_initialized_6 = __e_acsl_initialized((void *)(& b),
+                                                        sizeof(int *));
+      if (__gen_e_acsl_initialized_6) {
+        int __gen_e_acsl_valid_8;
+        __gen_e_acsl_valid_8 = __e_acsl_valid((void *)b,sizeof(int));
+        __gen_e_acsl_and_10 = __gen_e_acsl_valid_8;
       }
-      else __e_acsl_and_10 = 0;
-      __e_acsl_and_11 = ! __e_acsl_and_10;
+      else __gen_e_acsl_and_10 = 0;
+      __gen_e_acsl_and_11 = ! __gen_e_acsl_and_10;
     }
-    else __e_acsl_and_11 = 0;
-    if (__e_acsl_and_11) {
-      int __e_acsl_valid_9;
-      __e_acsl_valid_9 = __valid((void *)X,sizeof(int));
-      __e_acsl_and_12 = __e_acsl_valid_9;
+    else __gen_e_acsl_and_11 = 0;
+    if (__gen_e_acsl_and_11) {
+      int __gen_e_acsl_valid_9;
+      __gen_e_acsl_valid_9 = __e_acsl_valid((void *)X,sizeof(int));
+      __gen_e_acsl_and_12 = __gen_e_acsl_valid_9;
     }
-    else __e_acsl_and_12 = 0;
-    __e_acsl_assert(__e_acsl_and_12,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_12 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_12,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(a) && !\\valid(b) && \\valid(X)",37);
   }
-  __full_init((void *)(& b));
-  b = __e_acsl_f(& n);
+  __e_acsl_full_init((void *)(& b));
+  b = __gen_e_acsl_f(& n);
   /*@ assert \valid(a) ∧ \valid(b) ∧ \valid(X); */
   {
-    int __e_acsl_initialized_7;
-    int __e_acsl_and_13;
-    int __e_acsl_and_15;
-    int __e_acsl_and_16;
-    __e_acsl_initialized_7 = __initialized((void *)(& a),sizeof(int *));
-    if (__e_acsl_initialized_7) {
-      int __e_acsl_valid_10;
-      __e_acsl_valid_10 = __valid((void *)a,sizeof(int));
-      __e_acsl_and_13 = __e_acsl_valid_10;
+    int __gen_e_acsl_initialized_7;
+    int __gen_e_acsl_and_13;
+    int __gen_e_acsl_and_15;
+    int __gen_e_acsl_and_16;
+    __gen_e_acsl_initialized_7 = __e_acsl_initialized((void *)(& a),
+                                                      sizeof(int *));
+    if (__gen_e_acsl_initialized_7) {
+      int __gen_e_acsl_valid_10;
+      __gen_e_acsl_valid_10 = __e_acsl_valid((void *)a,sizeof(int));
+      __gen_e_acsl_and_13 = __gen_e_acsl_valid_10;
     }
-    else __e_acsl_and_13 = 0;
-    if (__e_acsl_and_13) {
-      int __e_acsl_initialized_8;
-      int __e_acsl_and_14;
-      __e_acsl_initialized_8 = __initialized((void *)(& b),sizeof(int *));
-      if (__e_acsl_initialized_8) {
-        int __e_acsl_valid_11;
-        __e_acsl_valid_11 = __valid((void *)b,sizeof(int));
-        __e_acsl_and_14 = __e_acsl_valid_11;
+    else __gen_e_acsl_and_13 = 0;
+    if (__gen_e_acsl_and_13) {
+      int __gen_e_acsl_initialized_8;
+      int __gen_e_acsl_and_14;
+      __gen_e_acsl_initialized_8 = __e_acsl_initialized((void *)(& b),
+                                                        sizeof(int *));
+      if (__gen_e_acsl_initialized_8) {
+        int __gen_e_acsl_valid_11;
+        __gen_e_acsl_valid_11 = __e_acsl_valid((void *)b,sizeof(int));
+        __gen_e_acsl_and_14 = __gen_e_acsl_valid_11;
       }
-      else __e_acsl_and_14 = 0;
-      __e_acsl_and_15 = __e_acsl_and_14;
+      else __gen_e_acsl_and_14 = 0;
+      __gen_e_acsl_and_15 = __gen_e_acsl_and_14;
     }
-    else __e_acsl_and_15 = 0;
-    if (__e_acsl_and_15) {
-      int __e_acsl_valid_12;
-      __e_acsl_valid_12 = __valid((void *)X,sizeof(int));
-      __e_acsl_and_16 = __e_acsl_valid_12;
+    else __gen_e_acsl_and_15 = 0;
+    if (__gen_e_acsl_and_15) {
+      int __gen_e_acsl_valid_12;
+      __gen_e_acsl_valid_12 = __e_acsl_valid((void *)X,sizeof(int));
+      __gen_e_acsl_and_16 = __gen_e_acsl_valid_12;
     }
-    else __e_acsl_and_16 = 0;
-    __e_acsl_assert(__e_acsl_and_16,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_16 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_16,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(a) && \\valid(b) && \\valid(X)",39);
   }
   X = b;
   /*@ assert \valid(a) ∧ \valid(b) ∧ \valid(X); */
   {
-    int __e_acsl_initialized_9;
-    int __e_acsl_and_17;
-    int __e_acsl_and_19;
-    int __e_acsl_and_20;
-    __e_acsl_initialized_9 = __initialized((void *)(& a),sizeof(int *));
-    if (__e_acsl_initialized_9) {
-      int __e_acsl_valid_13;
-      __e_acsl_valid_13 = __valid((void *)a,sizeof(int));
-      __e_acsl_and_17 = __e_acsl_valid_13;
+    int __gen_e_acsl_initialized_9;
+    int __gen_e_acsl_and_17;
+    int __gen_e_acsl_and_19;
+    int __gen_e_acsl_and_20;
+    __gen_e_acsl_initialized_9 = __e_acsl_initialized((void *)(& a),
+                                                      sizeof(int *));
+    if (__gen_e_acsl_initialized_9) {
+      int __gen_e_acsl_valid_13;
+      __gen_e_acsl_valid_13 = __e_acsl_valid((void *)a,sizeof(int));
+      __gen_e_acsl_and_17 = __gen_e_acsl_valid_13;
     }
-    else __e_acsl_and_17 = 0;
-    if (__e_acsl_and_17) {
-      int __e_acsl_initialized_10;
-      int __e_acsl_and_18;
-      __e_acsl_initialized_10 = __initialized((void *)(& b),sizeof(int *));
-      if (__e_acsl_initialized_10) {
-        int __e_acsl_valid_14;
-        __e_acsl_valid_14 = __valid((void *)b,sizeof(int));
-        __e_acsl_and_18 = __e_acsl_valid_14;
+    else __gen_e_acsl_and_17 = 0;
+    if (__gen_e_acsl_and_17) {
+      int __gen_e_acsl_initialized_10;
+      int __gen_e_acsl_and_18;
+      __gen_e_acsl_initialized_10 = __e_acsl_initialized((void *)(& b),
+                                                         sizeof(int *));
+      if (__gen_e_acsl_initialized_10) {
+        int __gen_e_acsl_valid_14;
+        __gen_e_acsl_valid_14 = __e_acsl_valid((void *)b,sizeof(int));
+        __gen_e_acsl_and_18 = __gen_e_acsl_valid_14;
       }
-      else __e_acsl_and_18 = 0;
-      __e_acsl_and_19 = __e_acsl_and_18;
+      else __gen_e_acsl_and_18 = 0;
+      __gen_e_acsl_and_19 = __gen_e_acsl_and_18;
     }
-    else __e_acsl_and_19 = 0;
-    if (__e_acsl_and_19) {
-      int __e_acsl_valid_15;
-      __e_acsl_valid_15 = __valid((void *)X,sizeof(int));
-      __e_acsl_and_20 = __e_acsl_valid_15;
+    else __gen_e_acsl_and_19 = 0;
+    if (__gen_e_acsl_and_19) {
+      int __gen_e_acsl_valid_15;
+      __gen_e_acsl_valid_15 = __e_acsl_valid((void *)X,sizeof(int));
+      __gen_e_acsl_and_20 = __gen_e_acsl_valid_15;
     }
-    else __e_acsl_and_20 = 0;
-    __e_acsl_assert(__e_acsl_and_20,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_20 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_20,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(a) && \\valid(b) && \\valid(X)",41);
   }
-  __full_init((void *)(& c));
+  __e_acsl_full_init((void *)(& c));
   c = & a;
-  __full_init((void *)(& d));
+  __e_acsl_full_init((void *)(& d));
   d = & c;
   /*@ assert \valid(*c); */
   {
-    int __e_acsl_initialized_11;
-    int __e_acsl_and_22;
-    __e_acsl_initialized_11 = __initialized((void *)c,sizeof(int *));
-    if (__e_acsl_initialized_11) {
-      int __e_acsl_initialized_12;
-      int __e_acsl_and_21;
-      int __e_acsl_valid_16;
-      __e_acsl_initialized_12 = __initialized((void *)(& c),sizeof(int **));
-      if (__e_acsl_initialized_12) {
-        int __e_acsl_valid_read;
-        __e_acsl_valid_read = __valid_read((void *)c,sizeof(int *));
-        __e_acsl_and_21 = __e_acsl_valid_read;
+    int __gen_e_acsl_initialized_11;
+    int __gen_e_acsl_and_22;
+    __gen_e_acsl_initialized_11 = __e_acsl_initialized((void *)c,
+                                                       sizeof(int *));
+    if (__gen_e_acsl_initialized_11) {
+      int __gen_e_acsl_initialized_12;
+      int __gen_e_acsl_and_21;
+      int __gen_e_acsl_valid_16;
+      __gen_e_acsl_initialized_12 = __e_acsl_initialized((void *)(& c),
+                                                         sizeof(int **));
+      if (__gen_e_acsl_initialized_12) {
+        int __gen_e_acsl_valid_read;
+        __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)c,
+                                                      sizeof(int *));
+        __gen_e_acsl_and_21 = __gen_e_acsl_valid_read;
       }
-      else __e_acsl_and_21 = 0;
-      __e_acsl_assert(__e_acsl_and_21,(char *)"RTE",(char *)"main",
+      else __gen_e_acsl_and_21 = 0;
+      __e_acsl_assert(__gen_e_acsl_and_21,(char *)"RTE",(char *)"main",
                       (char *)"mem_access: \\valid_read(c)",44);
-      __e_acsl_valid_16 = __valid((void *)*c,sizeof(int));
-      __e_acsl_and_22 = __e_acsl_valid_16;
+      __gen_e_acsl_valid_16 = __e_acsl_valid((void *)*c,sizeof(int));
+      __gen_e_acsl_and_22 = __gen_e_acsl_valid_16;
     }
-    else __e_acsl_and_22 = 0;
-    __e_acsl_assert(__e_acsl_and_22,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_22 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_22,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(*c)",44);
   }
   /*@ assert \valid(*(*d)); */
   {
-    int __e_acsl_valid_read_2;
-    int __e_acsl_initialized_13;
-    int __e_acsl_and_26;
-    __e_acsl_valid_read_2 = __valid_read((void *)d,sizeof(int **));
-    __e_acsl_assert(__e_acsl_valid_read_2,(char *)"RTE",(char *)"main",
+    int __gen_e_acsl_valid_read_2;
+    int __gen_e_acsl_initialized_13;
+    int __gen_e_acsl_and_26;
+    __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)d,sizeof(int **));
+    __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",(char *)"main",
                     (char *)"mem_access: \\valid_read(d)",45);
-    __e_acsl_initialized_13 = __initialized((void *)*d,sizeof(int *));
-    if (__e_acsl_initialized_13) {
-      int __e_acsl_initialized_14;
-      int __e_acsl_and_24;
-      int __e_acsl_initialized_16;
-      int __e_acsl_and_25;
-      int __e_acsl_valid_17;
-      __e_acsl_initialized_14 = __initialized((void *)d,sizeof(int **));
-      if (__e_acsl_initialized_14) {
-        int __e_acsl_initialized_15;
-        int __e_acsl_and_23;
-        int __e_acsl_valid_read_4;
-        __e_acsl_initialized_15 = __initialized((void *)(& d),
-                                                sizeof(int ***));
-        if (__e_acsl_initialized_15) {
-          int __e_acsl_valid_read_3;
-          __e_acsl_valid_read_3 = __valid_read((void *)d,sizeof(int **));
-          __e_acsl_and_23 = __e_acsl_valid_read_3;
+    __gen_e_acsl_initialized_13 = __e_acsl_initialized((void *)*d,
+                                                       sizeof(int *));
+    if (__gen_e_acsl_initialized_13) {
+      int __gen_e_acsl_initialized_14;
+      int __gen_e_acsl_and_24;
+      int __gen_e_acsl_initialized_16;
+      int __gen_e_acsl_and_25;
+      int __gen_e_acsl_valid_17;
+      __gen_e_acsl_initialized_14 = __e_acsl_initialized((void *)d,
+                                                         sizeof(int **));
+      if (__gen_e_acsl_initialized_14) {
+        int __gen_e_acsl_initialized_15;
+        int __gen_e_acsl_and_23;
+        int __gen_e_acsl_valid_read_4;
+        __gen_e_acsl_initialized_15 = __e_acsl_initialized((void *)(& d),
+                                                           sizeof(int ***));
+        if (__gen_e_acsl_initialized_15) {
+          int __gen_e_acsl_valid_read_3;
+          __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)d,
+                                                          sizeof(int **));
+          __gen_e_acsl_and_23 = __gen_e_acsl_valid_read_3;
         }
-        else __e_acsl_and_23 = 0;
-        __e_acsl_assert(__e_acsl_and_23,(char *)"RTE",(char *)"main",
+        else __gen_e_acsl_and_23 = 0;
+        __e_acsl_assert(__gen_e_acsl_and_23,(char *)"RTE",(char *)"main",
                         (char *)"mem_access: \\valid_read(d)",45);
-        __e_acsl_valid_read_4 = __valid_read((void *)*d,sizeof(int *));
-        __e_acsl_and_24 = __e_acsl_valid_read_4;
+        __gen_e_acsl_valid_read_4 = __e_acsl_valid_read((void *)*d,
+                                                        sizeof(int *));
+        __gen_e_acsl_and_24 = __gen_e_acsl_valid_read_4;
       }
-      else __e_acsl_and_24 = 0;
-      __e_acsl_assert(__e_acsl_and_24,(char *)"RTE",(char *)"main",
+      else __gen_e_acsl_and_24 = 0;
+      __e_acsl_assert(__gen_e_acsl_and_24,(char *)"RTE",(char *)"main",
                       (char *)"mem_access: \\valid_read(*d)",45);
-      __e_acsl_initialized_16 = __initialized((void *)(& d),sizeof(int ***));
-      if (__e_acsl_initialized_16) {
-        int __e_acsl_valid_read_5;
-        __e_acsl_valid_read_5 = __valid_read((void *)d,sizeof(int **));
-        __e_acsl_and_25 = __e_acsl_valid_read_5;
+      __gen_e_acsl_initialized_16 = __e_acsl_initialized((void *)(& d),
+                                                         sizeof(int ***));
+      if (__gen_e_acsl_initialized_16) {
+        int __gen_e_acsl_valid_read_5;
+        __gen_e_acsl_valid_read_5 = __e_acsl_valid_read((void *)d,
+                                                        sizeof(int **));
+        __gen_e_acsl_and_25 = __gen_e_acsl_valid_read_5;
       }
-      else __e_acsl_and_25 = 0;
-      __e_acsl_assert(__e_acsl_and_25,(char *)"RTE",(char *)"main",
+      else __gen_e_acsl_and_25 = 0;
+      __e_acsl_assert(__gen_e_acsl_and_25,(char *)"RTE",(char *)"main",
                       (char *)"mem_access: \\valid_read(d)",45);
-      __e_acsl_valid_17 = __valid((void *)*(*d),sizeof(int));
-      __e_acsl_and_26 = __e_acsl_valid_17;
+      __gen_e_acsl_valid_17 = __e_acsl_valid((void *)*(*d),sizeof(int));
+      __gen_e_acsl_and_26 = __gen_e_acsl_valid_17;
     }
-    else __e_acsl_and_26 = 0;
-    __e_acsl_assert(__e_acsl_and_26,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_26 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_26,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(*(*d))",45);
   }
-  __e_acsl_free((void *)a);
+  __gen_e_acsl_free((void *)a);
   /*@ assert ¬\valid(a) ∧ \valid(b) ∧ \valid(X); */
   {
-    int __e_acsl_initialized_17;
-    int __e_acsl_and_27;
-    int __e_acsl_and_29;
-    int __e_acsl_and_30;
-    __e_acsl_initialized_17 = __initialized((void *)(& a),sizeof(int *));
-    if (__e_acsl_initialized_17) {
-      int __e_acsl_valid_18;
+    int __gen_e_acsl_initialized_17;
+    int __gen_e_acsl_and_27;
+    int __gen_e_acsl_and_29;
+    int __gen_e_acsl_and_30;
+    __gen_e_acsl_initialized_17 = __e_acsl_initialized((void *)(& a),
+                                                       sizeof(int *));
+    if (__gen_e_acsl_initialized_17) {
+      int __gen_e_acsl_valid_18;
       /*@ assert Value: dangling_pointer: ¬\dangling(&a); */
-      __e_acsl_valid_18 = __valid((void *)a,sizeof(int));
-      __e_acsl_and_27 = __e_acsl_valid_18;
+      __gen_e_acsl_valid_18 = __e_acsl_valid((void *)a,sizeof(int));
+      __gen_e_acsl_and_27 = __gen_e_acsl_valid_18;
     }
-    else __e_acsl_and_27 = 0;
-    if (! __e_acsl_and_27) {
-      int __e_acsl_initialized_18;
-      int __e_acsl_and_28;
-      __e_acsl_initialized_18 = __initialized((void *)(& b),sizeof(int *));
-      if (__e_acsl_initialized_18) {
-        int __e_acsl_valid_19;
-        __e_acsl_valid_19 = __valid((void *)b,sizeof(int));
-        __e_acsl_and_28 = __e_acsl_valid_19;
+    else __gen_e_acsl_and_27 = 0;
+    if (! __gen_e_acsl_and_27) {
+      int __gen_e_acsl_initialized_18;
+      int __gen_e_acsl_and_28;
+      __gen_e_acsl_initialized_18 = __e_acsl_initialized((void *)(& b),
+                                                         sizeof(int *));
+      if (__gen_e_acsl_initialized_18) {
+        int __gen_e_acsl_valid_19;
+        __gen_e_acsl_valid_19 = __e_acsl_valid((void *)b,sizeof(int));
+        __gen_e_acsl_and_28 = __gen_e_acsl_valid_19;
       }
-      else __e_acsl_and_28 = 0;
-      __e_acsl_and_29 = __e_acsl_and_28;
+      else __gen_e_acsl_and_28 = 0;
+      __gen_e_acsl_and_29 = __gen_e_acsl_and_28;
     }
-    else __e_acsl_and_29 = 0;
-    if (__e_acsl_and_29) {
-      int __e_acsl_valid_20;
-      __e_acsl_valid_20 = __valid((void *)X,sizeof(int));
-      __e_acsl_and_30 = __e_acsl_valid_20;
+    else __gen_e_acsl_and_29 = 0;
+    if (__gen_e_acsl_and_29) {
+      int __gen_e_acsl_valid_20;
+      __gen_e_acsl_valid_20 = __e_acsl_valid((void *)X,sizeof(int));
+      __gen_e_acsl_and_30 = __gen_e_acsl_valid_20;
     }
-    else __e_acsl_and_30 = 0;
-    __e_acsl_assert(__e_acsl_and_30,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_30 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_30,(char *)"Assertion",(char *)"main",
                     (char *)"!\\valid(a) && \\valid(b) && \\valid(X)",47);
   }
   /*@ assert \valid(&Z); */
   {
-    int __e_acsl_valid_21;
-    __e_acsl_valid_21 = __valid((void *)(& Z),sizeof(int));
-    __e_acsl_assert(__e_acsl_valid_21,(char *)"Assertion",(char *)"main",
+    int __gen_e_acsl_valid_21;
+    __gen_e_acsl_valid_21 = __e_acsl_valid((void *)(& Z),sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_21,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(&Z)",48);
   }
   g();
   __retres = 0;
-  __delete_block((void *)(& Z));
-  __delete_block((void *)(& X));
-  __delete_block((void *)(& n));
-  __delete_block((void *)(& d));
-  __delete_block((void *)(& c));
-  __delete_block((void *)(& b));
-  __delete_block((void *)(& a));
+  __e_acsl_delete_block((void *)(& Z));
+  __e_acsl_delete_block((void *)(& X));
+  __e_acsl_delete_block((void *)(& n));
+  __e_acsl_delete_block((void *)(& d));
+  __e_acsl_delete_block((void *)(& c));
+  __e_acsl_delete_block((void *)(& b));
+  __e_acsl_delete_block((void *)(& a));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias.c
index a9820f674bdfaf623f2b7751e2dbb66a06592882..326349829351020d31ade07bcb776d8484030b1c 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_alias.c
@@ -6,121 +6,128 @@ int main(void)
   int *b;
   int n;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& b),8UL);
-  __store_block((void *)(& a),8UL);
+  __e_acsl_store_block((void *)(& b),8UL);
+  __e_acsl_store_block((void *)(& a),8UL);
   n = 0;
   /*@ assert ¬\valid(a) ∧ ¬\valid(b); */
   {
-    int __e_acsl_initialized;
-    int __e_acsl_and;
-    int __e_acsl_and_3;
-    __e_acsl_initialized = __initialized((void *)(& a),sizeof(int *));
-    if (__e_acsl_initialized) {
-      int __e_acsl_valid;
-      __e_acsl_valid = __valid((void *)a,sizeof(int));
-      __e_acsl_and = __e_acsl_valid;
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    int __gen_e_acsl_and_3;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& a),
+                                                    sizeof(int *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid;
+      __gen_e_acsl_valid = __e_acsl_valid((void *)a,sizeof(int));
+      __gen_e_acsl_and = __gen_e_acsl_valid;
     }
-    else __e_acsl_and = 0;
-    if (! __e_acsl_and) {
-      int __e_acsl_initialized_2;
-      int __e_acsl_and_2;
-      __e_acsl_initialized_2 = __initialized((void *)(& b),sizeof(int *));
-      if (__e_acsl_initialized_2) {
-        int __e_acsl_valid_2;
-        __e_acsl_valid_2 = __valid((void *)b,sizeof(int));
-        __e_acsl_and_2 = __e_acsl_valid_2;
+    else __gen_e_acsl_and = 0;
+    if (! __gen_e_acsl_and) {
+      int __gen_e_acsl_initialized_2;
+      int __gen_e_acsl_and_2;
+      __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& b),
+                                                        sizeof(int *));
+      if (__gen_e_acsl_initialized_2) {
+        int __gen_e_acsl_valid_2;
+        __gen_e_acsl_valid_2 = __e_acsl_valid((void *)b,sizeof(int));
+        __gen_e_acsl_and_2 = __gen_e_acsl_valid_2;
       }
-      else __e_acsl_and_2 = 0;
-      __e_acsl_and_3 = ! __e_acsl_and_2;
+      else __gen_e_acsl_and_2 = 0;
+      __gen_e_acsl_and_3 = ! __gen_e_acsl_and_2;
     }
-    else __e_acsl_and_3 = 0;
-    __e_acsl_assert(__e_acsl_and_3,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_3 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_3,(char *)"Assertion",(char *)"main",
                     (char *)"!\\valid(a) && !\\valid(b)",10);
   }
-  __full_init((void *)(& a));
-  a = (int *)__e_acsl_malloc(sizeof(int));
-  __initialize((void *)a,sizeof(int));
+  __e_acsl_full_init((void *)(& a));
+  a = (int *)__gen_e_acsl_malloc(sizeof(int));
+  __e_acsl_initialize((void *)a,sizeof(int));
   *a = n;
-  __full_init((void *)(& b));
+  __e_acsl_full_init((void *)(& b));
   b = a;
   /*@ assert \valid(a) ∧ \valid(b); */
   {
-    int __e_acsl_initialized_3;
-    int __e_acsl_and_4;
-    int __e_acsl_and_6;
-    __e_acsl_initialized_3 = __initialized((void *)(& a),sizeof(int *));
-    if (__e_acsl_initialized_3) {
-      int __e_acsl_valid_3;
-      __e_acsl_valid_3 = __valid((void *)a,sizeof(int));
-      __e_acsl_and_4 = __e_acsl_valid_3;
+    int __gen_e_acsl_initialized_3;
+    int __gen_e_acsl_and_4;
+    int __gen_e_acsl_and_6;
+    __gen_e_acsl_initialized_3 = __e_acsl_initialized((void *)(& a),
+                                                      sizeof(int *));
+    if (__gen_e_acsl_initialized_3) {
+      int __gen_e_acsl_valid_3;
+      __gen_e_acsl_valid_3 = __e_acsl_valid((void *)a,sizeof(int));
+      __gen_e_acsl_and_4 = __gen_e_acsl_valid_3;
     }
-    else __e_acsl_and_4 = 0;
-    if (__e_acsl_and_4) {
-      int __e_acsl_initialized_4;
-      int __e_acsl_and_5;
-      __e_acsl_initialized_4 = __initialized((void *)(& b),sizeof(int *));
-      if (__e_acsl_initialized_4) {
-        int __e_acsl_valid_4;
-        __e_acsl_valid_4 = __valid((void *)b,sizeof(int));
-        __e_acsl_and_5 = __e_acsl_valid_4;
+    else __gen_e_acsl_and_4 = 0;
+    if (__gen_e_acsl_and_4) {
+      int __gen_e_acsl_initialized_4;
+      int __gen_e_acsl_and_5;
+      __gen_e_acsl_initialized_4 = __e_acsl_initialized((void *)(& b),
+                                                        sizeof(int *));
+      if (__gen_e_acsl_initialized_4) {
+        int __gen_e_acsl_valid_4;
+        __gen_e_acsl_valid_4 = __e_acsl_valid((void *)b,sizeof(int));
+        __gen_e_acsl_and_5 = __gen_e_acsl_valid_4;
       }
-      else __e_acsl_and_5 = 0;
-      __e_acsl_and_6 = __e_acsl_and_5;
+      else __gen_e_acsl_and_5 = 0;
+      __gen_e_acsl_and_6 = __gen_e_acsl_and_5;
     }
-    else __e_acsl_and_6 = 0;
-    __e_acsl_assert(__e_acsl_and_6,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_6 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_6,(char *)"Assertion",(char *)"main",
                     (char *)"\\valid(a) && \\valid(b)",14);
   }
   /*@ assert *b ≡ n; */
   {
-    int __e_acsl_initialized_5;
-    int __e_acsl_and_7;
-    __e_acsl_initialized_5 = __initialized((void *)(& b),sizeof(int *));
-    if (__e_acsl_initialized_5) {
-      int __e_acsl_valid_read;
-      __e_acsl_valid_read = __valid_read((void *)b,sizeof(int));
-      __e_acsl_and_7 = __e_acsl_valid_read;
+    int __gen_e_acsl_initialized_5;
+    int __gen_e_acsl_and_7;
+    __gen_e_acsl_initialized_5 = __e_acsl_initialized((void *)(& b),
+                                                      sizeof(int *));
+    if (__gen_e_acsl_initialized_5) {
+      int __gen_e_acsl_valid_read;
+      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)b,sizeof(int));
+      __gen_e_acsl_and_7 = __gen_e_acsl_valid_read;
     }
-    else __e_acsl_and_7 = 0;
-    __e_acsl_assert(__e_acsl_and_7,(char *)"RTE",(char *)"main",
+    else __gen_e_acsl_and_7 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_7,(char *)"RTE",(char *)"main",
                     (char *)"mem_access: \\valid_read(b)",15);
     __e_acsl_assert(*b == n,(char *)"Assertion",(char *)"main",
                     (char *)"*b == n",15);
   }
-  __e_acsl_free((void *)b);
+  __gen_e_acsl_free((void *)b);
   /*@ assert ¬\valid(a) ∧ ¬\valid(b); */
   {
-    int __e_acsl_initialized_6;
-    int __e_acsl_and_8;
-    int __e_acsl_and_10;
-    __e_acsl_initialized_6 = __initialized((void *)(& a),sizeof(int *));
-    if (__e_acsl_initialized_6) {
-      int __e_acsl_valid_5;
+    int __gen_e_acsl_initialized_6;
+    int __gen_e_acsl_and_8;
+    int __gen_e_acsl_and_10;
+    __gen_e_acsl_initialized_6 = __e_acsl_initialized((void *)(& a),
+                                                      sizeof(int *));
+    if (__gen_e_acsl_initialized_6) {
+      int __gen_e_acsl_valid_5;
       /*@ assert Value: dangling_pointer: ¬\dangling(&a); */
-      __e_acsl_valid_5 = __valid((void *)a,sizeof(int));
-      __e_acsl_and_8 = __e_acsl_valid_5;
+      __gen_e_acsl_valid_5 = __e_acsl_valid((void *)a,sizeof(int));
+      __gen_e_acsl_and_8 = __gen_e_acsl_valid_5;
     }
-    else __e_acsl_and_8 = 0;
-    if (! __e_acsl_and_8) {
-      int __e_acsl_initialized_7;
-      int __e_acsl_and_9;
-      __e_acsl_initialized_7 = __initialized((void *)(& b),sizeof(int *));
-      if (__e_acsl_initialized_7) {
-        int __e_acsl_valid_6;
+    else __gen_e_acsl_and_8 = 0;
+    if (! __gen_e_acsl_and_8) {
+      int __gen_e_acsl_initialized_7;
+      int __gen_e_acsl_and_9;
+      __gen_e_acsl_initialized_7 = __e_acsl_initialized((void *)(& b),
+                                                        sizeof(int *));
+      if (__gen_e_acsl_initialized_7) {
+        int __gen_e_acsl_valid_6;
         /*@ assert Value: dangling_pointer: ¬\dangling(&b); */
-        __e_acsl_valid_6 = __valid((void *)b,sizeof(int));
-        __e_acsl_and_9 = __e_acsl_valid_6;
+        __gen_e_acsl_valid_6 = __e_acsl_valid((void *)b,sizeof(int));
+        __gen_e_acsl_and_9 = __gen_e_acsl_valid_6;
       }
-      else __e_acsl_and_9 = 0;
-      __e_acsl_and_10 = ! __e_acsl_and_9;
+      else __gen_e_acsl_and_9 = 0;
+      __gen_e_acsl_and_10 = ! __gen_e_acsl_and_9;
     }
-    else __e_acsl_and_10 = 0;
-    __e_acsl_assert(__e_acsl_and_10,(char *)"Assertion",(char *)"main",
+    else __gen_e_acsl_and_10 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_10,(char *)"Assertion",(char *)"main",
                     (char *)"!\\valid(a) && !\\valid(b)",17);
   }
   __retres = 0;
-  __delete_block((void *)(& b));
-  __delete_block((void *)(& a));
+  __e_acsl_delete_block((void *)(& b));
+  __e_acsl_delete_block((void *)(& a));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract.c
index c734d6606bb0552f3a35b4fa23a99554c0651950..73deb1a555c541ab18c921baffedb2068d607f07 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_valid_in_contract.c
@@ -15,23 +15,23 @@ struct list {
 struct list *f(struct list *l)
 {
   struct list *__retres;
-  __store_block((void *)(& __retres),8UL);
-  __store_block((void *)(& l),8UL);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& l),8UL);
   if (l == (struct list *)0) {
-    __full_init((void *)(& __retres));
+    __e_acsl_full_init((void *)(& __retres));
     __retres = l;
     goto return_label;
   }
   if (l->next == (struct list *)0) {
-    __full_init((void *)(& __retres));
+    __e_acsl_full_init((void *)(& __retres));
     __retres = l;
     goto return_label;
   }
-  __full_init((void *)(& __retres));
+  __e_acsl_full_init((void *)(& __retres));
   __retres = (struct list *)0;
   return_label:
-    __delete_block((void *)(& l));
-    __delete_block((void *)(& __retres));
+    __e_acsl_delete_block((void *)(& l));
+    __e_acsl_delete_block((void *)(& __retres));
     return __retres;
 }
 
@@ -44,62 +44,64 @@ struct list *f(struct list *l)
       assumes ¬\valid(l->next);
       ensures \result ≡ \old(l);
  */
-struct list *__e_acsl_f(struct list *l)
+struct list *__gen_e_acsl_f(struct list *l)
 {
-  struct list *__e_acsl_at_4;
-  int __e_acsl_at_3;
-  struct list *__e_acsl_at_2;
-  int __e_acsl_at;
+  struct list *__gen_e_acsl_at_4;
+  int __gen_e_acsl_at_3;
+  struct list *__gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
   struct list *__retres;
-  __store_block((void *)(& __retres),8UL);
-  __store_block((void *)(& l),8UL);
-  __store_block((void *)(& __e_acsl_at_4),8UL);
-  __e_acsl_at_4 = l;
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& l),8UL);
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at_4),8UL);
+  __gen_e_acsl_at_4 = l;
   {
-    int __e_acsl_valid;
-    int __e_acsl_and_2;
-    __e_acsl_valid = __valid((void *)l,sizeof(struct list));
-    if (! __e_acsl_valid) {
-      int __e_acsl_initialized;
-      int __e_acsl_and;
-      __e_acsl_initialized = __initialized((void *)(& l->next),
-                                           sizeof(struct list *));
-      if (__e_acsl_initialized) {
-        int __e_acsl_valid_read;
-        int __e_acsl_valid_2;
-        __e_acsl_valid_read = __valid_read((void *)(& l->next),
-                                           sizeof(struct list *));
-        __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"f",
+    int __gen_e_acsl_valid;
+    int __gen_e_acsl_and_2;
+    __gen_e_acsl_valid = __e_acsl_valid((void *)l,sizeof(struct list));
+    if (! __gen_e_acsl_valid) {
+      int __gen_e_acsl_initialized;
+      int __gen_e_acsl_and;
+      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& l->next),
+                                                      sizeof(struct list *));
+      if (__gen_e_acsl_initialized) {
+        int __gen_e_acsl_valid_read;
+        int __gen_e_acsl_valid_2;
+        __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(& l->next),
+                                                      sizeof(struct list *));
+        __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"f",
                         (char *)"mem_access: \\valid_read(&l->next)",19);
         /*@ assert Value: mem_access: \valid_read(&l->next); */
-        __e_acsl_valid_2 = __valid((void *)l->next,sizeof(struct list));
-        __e_acsl_and = __e_acsl_valid_2;
+        __gen_e_acsl_valid_2 = __e_acsl_valid((void *)l->next,
+                                              sizeof(struct list));
+        __gen_e_acsl_and = __gen_e_acsl_valid_2;
       }
-      else __e_acsl_and = 0;
-      __e_acsl_and_2 = ! __e_acsl_and;
+      else __gen_e_acsl_and = 0;
+      __gen_e_acsl_and_2 = ! __gen_e_acsl_and;
     }
-    else __e_acsl_and_2 = 0;
-    __e_acsl_at_3 = __e_acsl_and_2;
+    else __gen_e_acsl_and_2 = 0;
+    __gen_e_acsl_at_3 = __gen_e_acsl_and_2;
   }
-  __store_block((void *)(& __e_acsl_at_2),8UL);
-  __e_acsl_at_2 = l;
-  __store_block((void *)(& __e_acsl_at),4UL);
-  __e_acsl_at = l == (void *)0;
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at_2),8UL);
+  __gen_e_acsl_at_2 = l;
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at),4UL);
+  __gen_e_acsl_at = l == (void *)0;
   __retres = f(l);
   {
-    int __e_acsl_implies;
-    int __e_acsl_implies_2;
-    if (! __e_acsl_at) __e_acsl_implies = 1;
-    else __e_acsl_implies = __retres == __e_acsl_at_2;
-    __e_acsl_assert(__e_acsl_implies,(char *)"Postcondition",(char *)"f",
+    int __gen_e_acsl_implies;
+    int __gen_e_acsl_implies_2;
+    if (! __gen_e_acsl_at) __gen_e_acsl_implies = 1;
+    else __gen_e_acsl_implies = __retres == __gen_e_acsl_at_2;
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Postcondition",(char *)"f",
                     (char *)"\\old(l == \\null) ==> \\result == \\old(l)",16);
-    if (! __e_acsl_at_3) __e_acsl_implies_2 = 1;
-    else __e_acsl_implies_2 = __retres == __e_acsl_at_4;
-    __e_acsl_assert(__e_acsl_implies_2,(char *)"Postcondition",(char *)"f",
+    if (! __gen_e_acsl_at_3) __gen_e_acsl_implies_2 = 1;
+    else __gen_e_acsl_implies_2 = __retres == __gen_e_acsl_at_4;
+    __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Postcondition",
+                    (char *)"f",
                     (char *)"\\old(!\\valid{Here}(l) && !\\valid{Here}(l->next)) ==> \\result == \\old(l)",
                     20);
-    __delete_block((void *)(& l));
-    __delete_block((void *)(& __retres));
+    __e_acsl_delete_block((void *)(& l));
+    __e_acsl_delete_block((void *)(& __retres));
     return __retres;
   }
 }
@@ -108,7 +110,7 @@ int main(void)
 {
   int __retres;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __e_acsl_f((struct list *)0);
+  __gen_e_acsl_f((struct list *)0);
   __retres = 0;
   __e_acsl_memory_clean();
   return __retres;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_vector.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_vector.c
index c89a44fee1150ac525ee983d7fb724866eb22136..3b4d57b36a2de87480e5b15c0fd94f4db22f401d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_vector.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_vector.c
@@ -4,16 +4,16 @@ int *new_inversed(int len, int *v)
 {
   int i;
   int *p;
-  __store_block((void *)(& p),8UL);
-  __full_init((void *)(& p));
-  p = (int *)__e_acsl_malloc(sizeof(int) * (unsigned long)len);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_full_init((void *)(& p));
+  p = (int *)__gen_e_acsl_malloc(sizeof(int) * (unsigned long)len);
   i = 0;
   while (i < len) {
-    __initialize((void *)(p + i),sizeof(int));
+    __e_acsl_initialize((void *)(p + i),sizeof(int));
     *(p + i) = *(v + ((len - i) - 1));
     i ++;
   }
-  __delete_block((void *)(& p));
+  __e_acsl_delete_block((void *)(& p));
   return p;
 }
 
@@ -24,41 +24,43 @@ int main(void)
   int v1[3];
   int *v2;
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(& v2),8UL);
-  __store_block((void *)(v1),12UL);
+  __e_acsl_store_block((void *)(& v2),8UL);
+  __e_acsl_store_block((void *)(v1),12UL);
   x = 3;
-  __initialize((void *)(v1),sizeof(int));
+  __e_acsl_initialize((void *)(v1),sizeof(int));
   v1[0] = 1;
-  __initialize((void *)(& v1[1]),sizeof(int));
+  __e_acsl_initialize((void *)(& v1[1]),sizeof(int));
   v1[1] = 2;
-  __initialize((void *)(& v1[2]),sizeof(int));
+  __e_acsl_initialize((void *)(& v1[2]),sizeof(int));
   v1[2] = x;
   LAST = v1[2];
   /*@ assert \initialized(&v1[2]); */
   {
-    int __e_acsl_initialized;
-    __e_acsl_initialized = __initialized((void *)(& v1[2]),sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized,(char *)"Assertion",(char *)"main",
-                    (char *)"\\initialized(&v1[2])",24);
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& v1[2]),
+                                                    sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(&v1[2])",24);
   }
-  __full_init((void *)(& v2));
+  __e_acsl_full_init((void *)(& v2));
   v2 = new_inversed(3,v1);
   LAST = *(v2 + 2);
   /*@ assert \initialized(v2+2); */
   {
-    int __e_acsl_initialized_2;
-    __e_acsl_initialized_2 = __initialized((void *)(v2 + 2),sizeof(int));
-    __e_acsl_assert(__e_acsl_initialized_2,(char *)"Assertion",
+    int __gen_e_acsl_initialized_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(v2 + 2),
+                                                      sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_2,(char *)"Assertion",
                     (char *)"main",(char *)"\\initialized(v2+2)",27);
   }
   /*@ assert LAST ≡ 1; */
   /*@ assert Value: initialisation: \initialized(&LAST); */
   __e_acsl_assert(LAST == 1,(char *)"Assertion",(char *)"main",
                   (char *)"LAST == 1",28);
-  __e_acsl_free((void *)v2);
+  __gen_e_acsl_free((void *)v2);
   __retres = 0;
-  __delete_block((void *)(& v2));
-  __delete_block((void *)(v1));
+  __e_acsl_delete_block((void *)(& v2));
+  __e_acsl_delete_block((void *)(v1));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ghost.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/init.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/init.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/init.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/init.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/init_function.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/init_function.res.oracle
index 3b25fb3a7761e2f3a6b4e0d73b958ee6a709856c..f109e517133d4ce37070bc5e5a38165e725cde1b 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/init_function.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/init_function.res.oracle
@@ -13,5 +13,5 @@ FRAMAC_SHARE/libc/stdlib.h:160:[e-acsl] warning: E-ACSL construct `assigns claus
 FRAMAC_SHARE/libc/stdlib.h:165:[e-acsl] warning: E-ACSL construct `logic function application' is not yet supported.
                   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/initialized.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/initialized.res.oracle
index 1a76c1d3b89f6ad7b885360be496427ba263950c..dd5c54109fb3cfb93fef610edc03ddcd5c71b5d2 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/initialized.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/initialized.res.oracle
@@ -39,21 +39,21 @@ FRAMAC_SHARE/libc/stdlib.h:222:[e-acsl] warning: E-ACSL construct `logic functio
                   Ignoring annotation.
 FRAMAC_SHARE/libc/stdlib.h:146:[kernel] warning: Neither code nor specification for function calloc, generating default assigns from the prototype
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
 tests/e-acsl-runtime/initialized.c:65:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/initialized.c:69:[value] warning: assertion got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:201:[value] warning: function __e_acsl_realloc: precondition got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:216:[value] warning: function __e_acsl_realloc, behavior dealloc: precondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:211:[value] warning: function __e_acsl_realloc, behavior alloc: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:218:[value] warning: function __e_acsl_realloc, behavior dealloc: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:219:[value] warning: function __e_acsl_realloc, behavior dealloc: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:226:[value] warning: function __e_acsl_realloc, behavior fail: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:201:[value] warning: function __gen_e_acsl_realloc: precondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:216:[value] warning: function __gen_e_acsl_realloc, behavior dealloc: precondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:211:[value] warning: function __gen_e_acsl_realloc, behavior alloc: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:218:[value] warning: function __gen_e_acsl_realloc, behavior dealloc: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:219:[value] warning: function __gen_e_acsl_realloc, behavior dealloc: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:226:[value] warning: function __gen_e_acsl_realloc, behavior fail: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
 tests/e-acsl-runtime/initialized.c:74:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/initialized.c:76:[value] warning: assertion got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:178:[value] warning: function __e_acsl_free, behavior deallocation: precondition 'freeable' got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:180:[value] warning: function __e_acsl_free, behavior deallocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:178:[value] warning: function __gen_e_acsl_free, behavior deallocation: precondition 'freeable' got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:180:[value] warning: function __gen_e_acsl_free, behavior deallocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
 FRAMAC_SHARE/libc/stdlib.h:178:[kernel] warning: pointer comparison. assert \pointer_comparable(p, (void *)0);
 FRAMAC_SHARE/libc/stdlib.h:177:[kernel] warning: pointer comparison. assert \pointer_comparable(p, (void *)0);
 tests/e-acsl-runtime/initialized.c:84:[value] warning: assertion got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.res.oracle
index e3eebc4ad642d40b206cbc650768cc9704c96207..25a69869bc3c785c8cb438bedb5421ea5bb8f385 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/linear_search.res.oracle
@@ -1,12 +1,12 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-tests/e-acsl-runtime/linear_search.i:7:[value] warning: function __e_acsl_search: precondition got status unknown.
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+tests/e-acsl-runtime/linear_search.i:7:[value] warning: function __gen_e_acsl_search: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/linear_search.i:7:[value] warning: function search: precondition got status unknown.
 tests/e-acsl-runtime/linear_search.i:18:[value] warning: loop invariant got status unknown.
 tests/e-acsl-runtime/linear_search.i:10:[value] warning: function search, behavior exists: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
 tests/e-acsl-runtime/linear_search.i:13:[value] warning: function search, behavior not_exists: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
-tests/e-acsl-runtime/linear_search.i:10:[value] warning: function __e_acsl_search, behavior exists: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-tests/e-acsl-runtime/linear_search.i:13:[value] warning: function __e_acsl_search, behavior not_exists: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+tests/e-acsl-runtime/linear_search.i:10:[value] warning: function __gen_e_acsl_search, behavior exists: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+tests/e-acsl-runtime/linear_search.i:13:[value] warning: function __gen_e_acsl_search, behavior not_exists: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
 tests/e-acsl-runtime/linear_search.i:31:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/linear_search.i:34:[value] warning: assertion got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.res.oracle
index 2e7694a5190c90c4f931cd94ed5d4ca433afa10e..2aefad1798ba2cf45d0f915afc2e3ba9c30ec9bf 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/literal_string.res.oracle
@@ -1,3 +1,3 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.res.oracle
index 77da8800b8819b67c87e7dc99d1a025d4c83844b..8450a28bf6d20eef504ada68521c08a34e47b325 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/localvar.res.oracle
@@ -13,6 +13,6 @@ FRAMAC_SHARE/libc/stdlib.h:160:[e-acsl] warning: E-ACSL construct `assigns claus
 FRAMAC_SHARE/libc/stdlib.h:165:[e-acsl] warning: E-ACSL construct `logic function application' is not yet supported.
                   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/loop.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/loop.res.oracle
index 6d7bb14adab40bba610e61748dc0b787bf32e4a2..3880f6950b8127776107a1d4671b61e68c2f6697 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/loop.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/loop.res.oracle
@@ -1,6 +1,6 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
 tests/e-acsl-runtime/loop.i:19:[value] warning: loop invariant got status unknown.
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status invalid.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status invalid.
 tests/e-acsl-runtime/loop.i:19:[kernel] warning: accessing uninitialized left-value.
-                  assert \initialized(&t[__e_acsl_k_2][__e_acsl_l_2]);
+                  assert \initialized(&t[__gen_e_acsl_k_2][__gen_e_acsl_l_2]);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/mainargs.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/mainargs.res.oracle
index 2dd86f68e2f67e3c610baea03437fb9040e937f8..c9394915eb1300cf3c0211a66782edc9e8d3a811 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/mainargs.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/mainargs.res.oracle
@@ -9,15 +9,15 @@ FRAMAC_SHARE/libc/string.h:91:[e-acsl] warning: E-ACSL construct `assigns clause
 FRAMAC_SHARE/libc/string.h:93:[e-acsl] warning: E-ACSL construct `applying logic function' is not yet supported.
                   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/mainargs.c:12:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/mainargs.c:13:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/mainargs.c:15:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/mainargs.c:15:[kernel] warning: out of bounds read. assert \valid_read(argv+argc);
 tests/e-acsl-runtime/mainargs.c:16:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/mainargs.c:16:[kernel] warning: out of bounds read. assert \valid_read(argv+argc);
-FRAMAC_SHARE/libc/string.h:91:[value] warning: function __e_acsl_strlen: precondition 'valid_string_src' got status unknown.
+FRAMAC_SHARE/libc/string.h:91:[value] warning: function __gen_e_acsl_strlen: precondition 'valid_string_src' got status unknown.
 FRAMAC_SHARE/libc/string.h:91:[value] warning: function strlen: precondition 'valid_string_src' got status unknown.
-FRAMAC_SHARE/libc/string.h:93:[value] warning: function __e_acsl_strlen: postcondition got status unknown.
+FRAMAC_SHARE/libc/string.h:93:[value] warning: function __gen_e_acsl_strlen: postcondition got status unknown.
 tests/e-acsl-runtime/mainargs.c:19:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/mainargs.c:20:[value] warning: assertion got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/memsize.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/memsize.res.oracle
index 6a958b8cf7e10db63f2799c7ebe8da55e869c90b..dead02674d0d3c1874a5da4b54dd8a0a94af0a0e 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/memsize.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/memsize.res.oracle
@@ -39,7 +39,7 @@ FRAMAC_SHARE/libc/stdlib.h:222:[e-acsl] warning: E-ACSL construct `logic functio
                   Ignoring annotation.
 FRAMAC_SHARE/libc/stdlib.h:146:[kernel] warning: Neither code nor specification for function calloc, generating default assigns from the prototype
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
 tests/e-acsl-runtime/memsize.c:22:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/memsize.c:24:[value] warning: assertion got status invalid (stopping propagation).
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/offset.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/offset.res.oracle
index b74c3bd68abfc70ceed37a1cd713666cb96a62ea..c5de0b1c7b2ee48b1e08caace22fdf258517476d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/offset.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/offset.res.oracle
@@ -13,10 +13,10 @@ FRAMAC_SHARE/libc/stdlib.h:160:[e-acsl] warning: E-ACSL construct `assigns claus
 FRAMAC_SHARE/libc/stdlib.h:165:[e-acsl] warning: E-ACSL construct `logic function application' is not yet supported.
                   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
 tests/e-acsl-runtime/offset.c:39:[value] warning: assertion got status unknown.
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/offset.c:40:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/offset.c:41:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/offset.c:43:[value] warning: assertion got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.res.oracle
index 233a0c813b3a84d15a3b4a11d9dcc967a32607a0..74ccbbd6a2fb4d6b3874da734a93124e31a11864 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr.res.oracle
@@ -1,6 +1,6 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/ptr.i:17:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/ptr.i:18:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/ptr.i:19:[value] warning: assertion got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr_init.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr_init.res.oracle
index 78a279aa39d1e7fe0d10e6f0cef7f5cba67f6306..c559c37ca95e61eaa9b0408e6805b269851acf65 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr_init.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/ptr_init.res.oracle
@@ -13,6 +13,6 @@ FRAMAC_SHARE/libc/stdlib.h:160:[e-acsl] warning: E-ACSL construct `assigns claus
 FRAMAC_SHARE/libc/stdlib.h:165:[e-acsl] warning: E-ACSL construct `logic function application' is not yet supported.
                   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stdout.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stdout.res.oracle
index 5e3bc20fe950a5da3e151527da82b61f3c478a9b..45750468b0fbdc3d9ec514eac5934eec968cfbb9 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stdout.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/stdout.res.oracle
@@ -8,4 +8,4 @@ FRAMAC_SHARE/libc/stdio.h:107:[e-acsl] warning: E-ACSL construct `logic function
                   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
 tests/e-acsl-runtime/stdout.c:11:[value] warning: assertion got status unknown.
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.res.oracle
index 8999e9c940430ff418319eb072811d71be75ac69..67cd18463adffdae4fec8f8903d381274cdff644 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid.res.oracle
@@ -21,10 +21,10 @@ FRAMAC_SHARE/libc/stdlib.h:177:[e-acsl] warning: E-ACSL construct `assigns claus
                   Ignoring annotation.
 FRAMAC_SHARE/libc/stdlib.h:177:[e-acsl] warning: E-ACSL construct `\allocate' is not yet supported. Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:178:[value] warning: function __e_acsl_free, behavior deallocation: precondition 'freeable' got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:180:[value] warning: function __e_acsl_free, behavior deallocation: postcondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:178:[value] warning: function __gen_e_acsl_free, behavior deallocation: precondition 'freeable' got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:180:[value] warning: function __gen_e_acsl_free, behavior deallocation: postcondition got status unknown.
 tests/e-acsl-runtime/valid.c:47:[kernel] warning: accessing left-value that contains escaping addresses.
                   assert ¬\dangling(&a);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.res.oracle
index 355d5656c2b912f7fe391525df842ed03a44e082..bd869536d3f2f1a9d5b6fe508ecf69f390688154 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_alias.res.oracle
@@ -21,11 +21,11 @@ FRAMAC_SHARE/libc/stdlib.h:177:[e-acsl] warning: E-ACSL construct `assigns claus
                   Ignoring annotation.
 FRAMAC_SHARE/libc/stdlib.h:177:[e-acsl] warning: E-ACSL construct `\allocate' is not yet supported. Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:178:[value] warning: function __e_acsl_free, behavior deallocation: precondition 'freeable' got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:180:[value] warning: function __e_acsl_free, behavior deallocation: postcondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:178:[value] warning: function __gen_e_acsl_free, behavior deallocation: precondition 'freeable' got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:180:[value] warning: function __gen_e_acsl_free, behavior deallocation: postcondition got status unknown.
 tests/e-acsl-runtime/valid_alias.c:17:[kernel] warning: accessing left-value that contains escaping addresses.
                   assert ¬\dangling(&a);
 tests/e-acsl-runtime/valid_alias.c:17:[kernel] warning: accessing left-value that contains escaping addresses.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.res.oracle
index 6534eba37a3d9656a19557189474dd83002b67e3..70d2c3e40bc0e027a217ba3436c65548f631ee24 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/valid_in_contract.res.oracle
@@ -1,4 +1,4 @@
 [e-acsl] beginning translation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/e-acsl-runtime/valid_in_contract.c:19:[kernel] warning: out of bounds read. assert \valid_read(&l->next);
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/vector.res.oracle b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/vector.res.oracle
index 62d806e40cd24ddc2b4a5a3172e9b42e716adb8b..15a2119191a821a8805b940b03e2f007ac5ecdc7 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/vector.res.oracle
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/vector.res.oracle
@@ -21,11 +21,11 @@ FRAMAC_SHARE/libc/stdlib.h:177:[e-acsl] warning: E-ACSL construct `assigns claus
                   Ignoring annotation.
 FRAMAC_SHARE/libc/stdlib.h:177:[e-acsl] warning: E-ACSL construct `\allocate' is not yet supported. Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
-FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:163:[value] warning: function __gen_e_acsl_malloc, behavior allocation: postcondition got status unknown. (Behavior may be inactive, no reduction performed.)
+FRAMAC_SHARE/libc/stdlib.h:168:[value] warning: function __gen_e_acsl_malloc, behavior no_allocation: postcondition got status invalid. (Behavior may be inactive, no reduction performed.)
 tests/e-acsl-runtime/vector.c:27:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/vector.c:28:[value] warning: assertion got status unknown.
 tests/e-acsl-runtime/vector.c:28:[kernel] warning: accessing uninitialized left-value. assert \initialized(&LAST);
-FRAMAC_SHARE/libc/stdlib.h:178:[value] warning: function __e_acsl_free, behavior deallocation: precondition 'freeable' got status unknown.
-FRAMAC_SHARE/libc/stdlib.h:180:[value] warning: function __e_acsl_free, behavior deallocation: postcondition got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:178:[value] warning: function __gen_e_acsl_free, behavior deallocation: precondition 'freeable' got status unknown.
+FRAMAC_SHARE/libc/stdlib.h:180:[value] warning: function __gen_e_acsl_free, behavior deallocation: postcondition got status unknown.
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/valid.c b/src/plugins/e-acsl/tests/e-acsl-runtime/valid.c
index f133b8ddf7a55fb76c3e2f65eaf298c30bb167a4..65a86fafafa47dc9a809e555489a98a0065788e6 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/valid.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/valid.c
@@ -1,6 +1,6 @@
 /* run.config
    COMMENT: \valid
-   STDOPT: +"-val-builtin __malloc:Frama_C_alloc_size -val-builtin __free:Frama_C_free"
+   STDOPT: +"-val-builtin __e_acsl_malloc:Frama_C_alloc_size -val-builtin __e_acsl_free:Frama_C_free"
 */
 
 #include "stdlib.h"
@@ -10,14 +10,14 @@ extern void free(void* p);
 
 int *X, Z;
 
-/*@ requires \valid(x); 
+/*@ requires \valid(x);
   @ ensures \valid(\result); */
-int *f(int *x) { 
-  int *y; 
+int *f(int *x) {
+  int *y;
   /*@ assert ! \valid(y); */
   y = x;
   /*@ assert \valid(x); */
-  return y; 
+  return y;
 }
 
 void g(void) {
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/valid_alias.c b/src/plugins/e-acsl/tests/e-acsl-runtime/valid_alias.c
index e86575cde11c5bf04d07dd3dfc3e3141d7477e64..9ce0f0fe2de2372f055795adcede2556a59adbc7 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/valid_alias.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/valid_alias.c
@@ -1,6 +1,6 @@
 /* run.config
    COMMENT: \valid in presence of aliasing
-   STDOPT: +"-val-builtin __malloc:Frama_C_alloc_size -val-builtin __free:Frama_C_free"
+   STDOPT: +"-val-builtin __e_acsl_malloc:Frama_C_alloc_size -val-builtin __e_acsl_free:Frama_C_free"
 */
 
 #include "stdlib.h"
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/valid_in_contract.c b/src/plugins/e-acsl/tests/e-acsl-runtime/valid_in_contract.c
index aaac90174fa104ff5897bab9e9c8b070e4aab943..6a653c56590c504147912ae5cacc0d3a348abf5b 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/valid_in_contract.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/valid_in_contract.c
@@ -1,6 +1,6 @@
 /* run.config
    COMMENT: function contract involving \valid
-   STDOPT: +"-val-builtin __malloc:Frama_C_alloc_size -val-builtin __free:Frama_C_free"
+   STDOPT: +"-val-builtin __e_acsl_malloc:Frama_C_alloc_size -val-builtin __e_acsl_free:Frama_C_free"
 */
 
 #include <stdlib.h>
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/vector.c b/src/plugins/e-acsl/tests/e-acsl-runtime/vector.c
index ac3ed643aac4f34e9dedbd7a7f07dc96c5cb1234..3e22aa90a296bce9604f51a0b858941b927f0eb6 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/vector.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/vector.c
@@ -1,6 +1,6 @@
 /* run.config
    COMMENT: function call + initialized
-   STDOPT: +"-val-builtin __malloc:Frama_C_alloc_size -val-builtin __free:Frama_C_free"
+   STDOPT: +"-val-builtin __e_acsl_malloc:Frama_C_alloc_size -val-builtin __e_acsl_free:Frama_C_free"
 */
 
 #include<stdlib.h>
@@ -20,10 +20,10 @@ int main(void) {
   int x = 3;
   int v1[3]= { 1, 2, x }, *v2;
   // @ assert \valid(&v1[2]);
-  LAST = v1[2]; 
+  LAST = v1[2];
   //@ assert \initialized(v1+2);
   v2 = new_inversed(3, v1);
-  LAST = v2[2]; 
+  LAST = v2[2];
   //@ assert \initialized(v2+2);
   //@ assert LAST == 1;
   free(v2);
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/arith.0.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/arith.0.res.oracle
index d96282c151646e6a301dbf9a1acd8295743a11e9..6caa06ecb87af27fea1a764a8a999e1fa5958819 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/arith.0.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/arith.0.res.oracle
@@ -9,13 +9,13 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 [value] using specification for function __e_acsl_assert
 [value] using specification for function __gmpz_init_set_str
 [value] using specification for function __gmpz_init_set_si
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __gmpz_init
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_tdiv_q
 [value] using specification for function __gmpz_clear
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/arith.1.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/arith.1.res.oracle
index 26c32a86f900ae600120d348b610f4a7ef69c171..aee858a5d5ab5983c55af0c11c8b9278b7bafbab 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/arith.1.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/arith.1.res.oracle
@@ -9,13 +9,13 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 [value] using specification for function __gmpz_init_set_si
 [value] using specification for function __gmpz_init
 [value] using specification for function __gmpz_neg
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 [value] using specification for function __gmpz_com
 [value] using specification for function __gmpz_add
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/array.0.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/array.0.res.oracle
index 8e7516547d6cd98a65bca2ed02b9e74a300693d0..43ba81b1fdd12892f4b8b375909fd2a48c50e9ef 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/array.0.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/array.0.res.oracle
@@ -9,13 +9,13 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
   T1[0..2] ∈ {0}
   T2[0..3] ∈ {0}
 tests/gmp/array.i:10:[value] entering loop for the first time
 tests/gmp/array.i:11:[value] entering loop for the first time
 tests/gmp/array.i:13:[value] warning: assertion got status unknown.
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/gmp/array.i:14:[value] warning: assertion got status unknown.
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/array.1.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/array.1.res.oracle
index 498ed5963724f4744bfc94d7ccc3e1bb654b7d6f..68983f1bb26a5427d21afcff8c79eee0b51ab90e 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/array.1.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/array.1.res.oracle
@@ -9,7 +9,7 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
   T1[0..2] ∈ {0}
   T2[0..3] ∈ {0}
 tests/gmp/array.i:10:[value] entering loop for the first time
@@ -18,7 +18,7 @@ tests/gmp/array.i:13:[value] warning: assertion got status unknown.
 [value] using specification for function __gmpz_init_set_si
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 tests/gmp/array.i:14:[value] warning: assertion got status unknown.
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/at.0.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/at.0.res.oracle
index e746117125e352e58d9dec4d017e88e7c87a7c5e..9e07fcf99607964bedb81371aa42b9bb791f9ab3 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/at.0.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/at.0.res.oracle
@@ -9,12 +9,12 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
   A ∈ {0}
 [value] using specification for function __e_acsl_memory_init
-[value] using specification for function __store_block
-[value] using specification for function __full_init
-[value] using specification for function __delete_block
+[value] using specification for function __e_acsl_store_block
+[value] using specification for function __e_acsl_full_init
+[value] using specification for function __e_acsl_delete_block
 [value] using specification for function __e_acsl_assert
 tests/gmp/at.i:12:[value] cannot evaluate ACSL term, \at() on a C label is unsupported
 tests/gmp/at.i:12:[value] warning: assertion got status unknown.
@@ -24,9 +24,9 @@ tests/gmp/at.i:52:[value] cannot evaluate ACSL term, \at() on a C label is unsup
 tests/gmp/at.i:52:[value] warning: assertion got status unknown.
 tests/gmp/at.i:53:[value] cannot evaluate ACSL term, \at() on a C label is unsupported
 tests/gmp/at.i:53:[value] warning: assertion got status unknown.
-[value] using specification for function __initialize
-[value] using specification for function __valid_read
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+[value] using specification for function __e_acsl_initialize
+[value] using specification for function __e_acsl_valid_read
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/gmp/at.i:30:[value] cannot evaluate ACSL term, \at() on a C label is unsupported
 tests/gmp/at.i:30:[value] warning: assertion got status unknown.
 tests/gmp/at.i:32:[value] cannot evaluate ACSL term, \at() on a C label is unsupported
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/at.1.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/at.1.res.oracle
index af51807c41e0fb34c8f9f473dbb7fff6765ee398..b397498aea11268be4b857cf7ee973527fe85f32 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/at.1.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/at.1.res.oracle
@@ -9,16 +9,16 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
   A ∈ {0}
 [value] using specification for function __e_acsl_memory_init
-[value] using specification for function __store_block
-[value] using specification for function __full_init
-[value] using specification for function __delete_block
+[value] using specification for function __e_acsl_store_block
+[value] using specification for function __e_acsl_full_init
+[value] using specification for function __e_acsl_delete_block
 [value] using specification for function __gmpz_init_set_si
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 [value] using specification for function __gmpz_init
 [value] using specification for function __gmpz_add
@@ -31,8 +31,8 @@ tests/gmp/at.i:52:[value] cannot evaluate ACSL term, \at() on a C label is unsup
 tests/gmp/at.i:52:[value] warning: assertion got status unknown.
 tests/gmp/at.i:53:[value] cannot evaluate ACSL term, \at() on a C label is unsupported
 tests/gmp/at.i:53:[value] warning: assertion got status unknown.
-[value] using specification for function __initialize
-[value] using specification for function __valid_read
+[value] using specification for function __e_acsl_initialize
+[value] using specification for function __e_acsl_valid_read
 tests/gmp/at.i:30:[value] cannot evaluate ACSL term, \at() on a C label is unsupported
 tests/gmp/at.i:30:[value] warning: assertion got status unknown.
 tests/gmp/at.i:32:[value] cannot evaluate ACSL term, \at() on a C label is unsupported
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/cast.0.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/cast.0.res.oracle
index f98f864d40ed796f04c2593c72ac29d8f3f852d2..1d4b881cde000c9b9407b3f00775a5d89b8b6292 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/cast.0.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/cast.0.res.oracle
@@ -9,6 +9,6 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 [value] using specification for function __e_acsl_assert
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/cast.1.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/cast.1.res.oracle
index 1e5f50428de44a67dcd4cdac6cb9303c22201ce2..7bc91fe31c30dd01c91811122604db9c73a039c1 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/cast.1.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/cast.1.res.oracle
@@ -9,11 +9,11 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 [value] using specification for function __gmpz_init_set_si
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 [value] using specification for function __gmpz_init_set_ui
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/comparison.0.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/comparison.0.res.oracle
index f98f864d40ed796f04c2593c72ac29d8f3f852d2..1d4b881cde000c9b9407b3f00775a5d89b8b6292 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/comparison.0.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/comparison.0.res.oracle
@@ -9,6 +9,6 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 [value] using specification for function __e_acsl_assert
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/comparison.1.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/comparison.1.res.oracle
index e2c5cc7f3fef05bd3e8b6c7840dad652f12c0a52..84d3e3426cca27ca89664c2b20d499aebea73e40 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/comparison.1.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/comparison.1.res.oracle
@@ -9,11 +9,11 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 [value] using specification for function __gmpz_init_set_si
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 [value] using specification for function __gmpz_init
 [value] using specification for function __gmpz_neg
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_arith.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_arith.c
index cb52636935130b983d2a5538c58b45ac68bae7a0..4c78ec8a8c4f854da1d34845e5b84c7a0835c8ef 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_arith.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_arith.c
@@ -29,33 +29,33 @@ int main(void)
                   (char *)"x/3 == -1",17);
   /*@ assert 0xffffffffffffffffffffff/0xffffffffffffffffffffff ≡ 1; */
   {
-    mpz_t __e_acsl;
-    mpz_t __e_acsl_2;
-    int __e_acsl_div_guard;
-    mpz_t __e_acsl_div;
-    mpz_t __e_acsl_3;
-    int __e_acsl_eq;
-    __gmpz_init_set_str(__e_acsl,"309485009821345068724781055",10);
-    __gmpz_init_set_si(__e_acsl_2,0L);
-    __e_acsl_div_guard = __gmpz_cmp((__mpz_struct const *)(__e_acsl),
-                                    (__mpz_struct const *)(__e_acsl_2));
-    __gmpz_init(__e_acsl_div);
+    mpz_t __gen_e_acsl_;
+    mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_div_guard;
+    mpz_t __gen_e_acsl_div;
+    mpz_t __gen_e_acsl__3;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_str(__gen_e_acsl_,"309485009821345068724781055",10);
+    __gmpz_init_set_si(__gen_e_acsl__2,0L);
+    __gen_e_acsl_div_guard = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_),
+                                        (__mpz_struct const *)(__gen_e_acsl__2));
+    __gmpz_init(__gen_e_acsl_div);
     /*@ assert E_ACSL: 0xffffffffffffffffffffff ≢ 0; */
-    __e_acsl_assert(! (__e_acsl_div_guard == 0),(char *)"Assertion",
+    __e_acsl_assert(! (__gen_e_acsl_div_guard == 0),(char *)"Assertion",
                     (char *)"main",(char *)"0xffffffffffffffffffffff == 0",
                     18);
-    __gmpz_tdiv_q(__e_acsl_div,(__mpz_struct const *)(__e_acsl),
-                  (__mpz_struct const *)(__e_acsl));
-    __gmpz_init_set_si(__e_acsl_3,(long)1);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_div),
-                             (__mpz_struct const *)(__e_acsl_3));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    __gmpz_tdiv_q(__gen_e_acsl_div,(__mpz_struct const *)(__gen_e_acsl_),
+                  (__mpz_struct const *)(__gen_e_acsl_));
+    __gmpz_init_set_si(__gen_e_acsl__3,(long)1);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_div),
+                                 (__mpz_struct const *)(__gen_e_acsl__3));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"0xffffffffffffffffffffff/0xffffffffffffffffffffff == 1",
                     18);
-    __gmpz_clear(__e_acsl);
-    __gmpz_clear(__e_acsl_2);
-    __gmpz_clear(__e_acsl_div);
-    __gmpz_clear(__e_acsl_3);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl__2);
+    __gmpz_clear(__gen_e_acsl_div);
+    __gmpz_clear(__gen_e_acsl__3);
   }
   /*@ assert x%2 ≡ -1; */
   __e_acsl_assert(x % 2 == -1,(char *)"Assertion",(char *)"main",
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_arith2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_arith2.c
index 93e2d041f672c9051158d12bbf39b98455eaadfd..a14b2e7caaf6790a59a23e17cb2c0f9c7c94fb71 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_arith2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_arith2.c
@@ -8,557 +8,562 @@ int main(void)
   y = 2;
   /*@ assert -3 ≡ x; */
   {
-    mpz_t __e_acsl;
-    mpz_t __e_acsl_neg;
-    mpz_t __e_acsl_x;
-    int __e_acsl_eq;
-    __gmpz_init_set_si(__e_acsl,(long)3);
-    __gmpz_init(__e_acsl_neg);
-    __gmpz_neg(__e_acsl_neg,(__mpz_struct const *)(__e_acsl));
-    __gmpz_init_set_si(__e_acsl_x,(long)x);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_neg),
-                             (__mpz_struct const *)(__e_acsl_x));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_;
+    mpz_t __gen_e_acsl_neg;
+    mpz_t __gen_e_acsl_x;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_,(long)3);
+    __gmpz_init(__gen_e_acsl_neg);
+    __gmpz_neg(__gen_e_acsl_neg,(__mpz_struct const *)(__gen_e_acsl_));
+    __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_neg),
+                                 (__mpz_struct const *)(__gen_e_acsl_x));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"-3 == x",10);
-    __gmpz_clear(__e_acsl);
-    __gmpz_clear(__e_acsl_neg);
-    __gmpz_clear(__e_acsl_x);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl_neg);
+    __gmpz_clear(__gen_e_acsl_x);
   }
   /*@ assert x ≡ -3; */
   {
-    mpz_t __e_acsl_x_2;
-    mpz_t __e_acsl_2;
-    mpz_t __e_acsl_neg_2;
-    int __e_acsl_eq_2;
-    __gmpz_init_set_si(__e_acsl_x_2,(long)x);
-    __gmpz_init_set_si(__e_acsl_2,(long)3);
-    __gmpz_init(__e_acsl_neg_2);
-    __gmpz_neg(__e_acsl_neg_2,(__mpz_struct const *)(__e_acsl_2));
-    __e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_2),
-                               (__mpz_struct const *)(__e_acsl_neg_2));
-    __e_acsl_assert(__e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"x == -3",11);
-    __gmpz_clear(__e_acsl_x_2);
-    __gmpz_clear(__e_acsl_2);
-    __gmpz_clear(__e_acsl_neg_2);
+    mpz_t __gen_e_acsl_x_2;
+    mpz_t __gen_e_acsl__2;
+    mpz_t __gen_e_acsl_neg_2;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_si(__gen_e_acsl_x_2,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)3);
+    __gmpz_init(__gen_e_acsl_neg_2);
+    __gmpz_neg(__gen_e_acsl_neg_2,(__mpz_struct const *)(__gen_e_acsl__2));
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_2),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_2));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x == -3",11);
+    __gmpz_clear(__gen_e_acsl_x_2);
+    __gmpz_clear(__gen_e_acsl__2);
+    __gmpz_clear(__gen_e_acsl_neg_2);
   }
   /*@ assert 0 ≢ ~0; */
   {
-    mpz_t __e_acsl_3;
-    mpz_t __e_acsl_bnot;
-    int __e_acsl_ne;
-    __gmpz_init_set_si(__e_acsl_3,(long)0);
-    __gmpz_init(__e_acsl_bnot);
-    __gmpz_com(__e_acsl_bnot,(__mpz_struct const *)(__e_acsl_3));
-    __e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__e_acsl_3),
-                             (__mpz_struct const *)(__e_acsl_bnot));
-    __e_acsl_assert(__e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__3;
+    mpz_t __gen_e_acsl_bnot;
+    int __gen_e_acsl_ne;
+    __gmpz_init_set_si(__gen_e_acsl__3,(long)0);
+    __gmpz_init(__gen_e_acsl_bnot);
+    __gmpz_com(__gen_e_acsl_bnot,(__mpz_struct const *)(__gen_e_acsl__3));
+    __gen_e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__3),
+                                 (__mpz_struct const *)(__gen_e_acsl_bnot));
+    __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
                     (char *)"0 != ~0",12);
-    __gmpz_clear(__e_acsl_3);
-    __gmpz_clear(__e_acsl_bnot);
+    __gmpz_clear(__gen_e_acsl__3);
+    __gmpz_clear(__gen_e_acsl_bnot);
   }
   /*@ assert x+1 ≡ -2; */
   {
-    mpz_t __e_acsl_x_3;
-    mpz_t __e_acsl_4;
-    mpz_t __e_acsl_add;
-    mpz_t __e_acsl_5;
-    mpz_t __e_acsl_neg_3;
-    int __e_acsl_eq_3;
-    __gmpz_init_set_si(__e_acsl_x_3,(long)x);
-    __gmpz_init_set_si(__e_acsl_4,(long)1);
-    __gmpz_init(__e_acsl_add);
-    __gmpz_add(__e_acsl_add,(__mpz_struct const *)(__e_acsl_x_3),
-               (__mpz_struct const *)(__e_acsl_4));
-    __gmpz_init_set_si(__e_acsl_5,(long)2);
-    __gmpz_init(__e_acsl_neg_3);
-    __gmpz_neg(__e_acsl_neg_3,(__mpz_struct const *)(__e_acsl_5));
-    __e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_add),
-                               (__mpz_struct const *)(__e_acsl_neg_3));
-    __e_acsl_assert(__e_acsl_eq_3 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"x+1 == -2",14);
-    __gmpz_clear(__e_acsl_x_3);
-    __gmpz_clear(__e_acsl_4);
-    __gmpz_clear(__e_acsl_add);
-    __gmpz_clear(__e_acsl_5);
-    __gmpz_clear(__e_acsl_neg_3);
+    mpz_t __gen_e_acsl_x_3;
+    mpz_t __gen_e_acsl__4;
+    mpz_t __gen_e_acsl_add;
+    mpz_t __gen_e_acsl__5;
+    mpz_t __gen_e_acsl_neg_3;
+    int __gen_e_acsl_eq_3;
+    __gmpz_init_set_si(__gen_e_acsl_x_3,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__4,(long)1);
+    __gmpz_init(__gen_e_acsl_add);
+    __gmpz_add(__gen_e_acsl_add,(__mpz_struct const *)(__gen_e_acsl_x_3),
+               (__mpz_struct const *)(__gen_e_acsl__4));
+    __gmpz_init_set_si(__gen_e_acsl__5,(long)2);
+    __gmpz_init(__gen_e_acsl_neg_3);
+    __gmpz_neg(__gen_e_acsl_neg_3,(__mpz_struct const *)(__gen_e_acsl__5));
+    __gen_e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_add),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_3));
+    __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x+1 == -2",14);
+    __gmpz_clear(__gen_e_acsl_x_3);
+    __gmpz_clear(__gen_e_acsl__4);
+    __gmpz_clear(__gen_e_acsl_add);
+    __gmpz_clear(__gen_e_acsl__5);
+    __gmpz_clear(__gen_e_acsl_neg_3);
   }
   /*@ assert x-1 ≡ -4; */
   {
-    mpz_t __e_acsl_x_4;
-    mpz_t __e_acsl_6;
-    mpz_t __e_acsl_sub;
-    mpz_t __e_acsl_7;
-    mpz_t __e_acsl_neg_4;
-    int __e_acsl_eq_4;
-    __gmpz_init_set_si(__e_acsl_x_4,(long)x);
-    __gmpz_init_set_si(__e_acsl_6,(long)1);
-    __gmpz_init(__e_acsl_sub);
-    __gmpz_sub(__e_acsl_sub,(__mpz_struct const *)(__e_acsl_x_4),
-               (__mpz_struct const *)(__e_acsl_6));
-    __gmpz_init_set_si(__e_acsl_7,(long)4);
-    __gmpz_init(__e_acsl_neg_4);
-    __gmpz_neg(__e_acsl_neg_4,(__mpz_struct const *)(__e_acsl_7));
-    __e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_sub),
-                               (__mpz_struct const *)(__e_acsl_neg_4));
-    __e_acsl_assert(__e_acsl_eq_4 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"x-1 == -4",15);
-    __gmpz_clear(__e_acsl_x_4);
-    __gmpz_clear(__e_acsl_6);
-    __gmpz_clear(__e_acsl_sub);
-    __gmpz_clear(__e_acsl_7);
-    __gmpz_clear(__e_acsl_neg_4);
+    mpz_t __gen_e_acsl_x_4;
+    mpz_t __gen_e_acsl__6;
+    mpz_t __gen_e_acsl_sub;
+    mpz_t __gen_e_acsl__7;
+    mpz_t __gen_e_acsl_neg_4;
+    int __gen_e_acsl_eq_4;
+    __gmpz_init_set_si(__gen_e_acsl_x_4,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__6,(long)1);
+    __gmpz_init(__gen_e_acsl_sub);
+    __gmpz_sub(__gen_e_acsl_sub,(__mpz_struct const *)(__gen_e_acsl_x_4),
+               (__mpz_struct const *)(__gen_e_acsl__6));
+    __gmpz_init_set_si(__gen_e_acsl__7,(long)4);
+    __gmpz_init(__gen_e_acsl_neg_4);
+    __gmpz_neg(__gen_e_acsl_neg_4,(__mpz_struct const *)(__gen_e_acsl__7));
+    __gen_e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_sub),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_4));
+    __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x-1 == -4",15);
+    __gmpz_clear(__gen_e_acsl_x_4);
+    __gmpz_clear(__gen_e_acsl__6);
+    __gmpz_clear(__gen_e_acsl_sub);
+    __gmpz_clear(__gen_e_acsl__7);
+    __gmpz_clear(__gen_e_acsl_neg_4);
   }
   /*@ assert x*3 ≡ -9; */
   {
-    mpz_t __e_acsl_x_5;
-    mpz_t __e_acsl_8;
-    mpz_t __e_acsl_mul;
-    mpz_t __e_acsl_9;
-    mpz_t __e_acsl_neg_5;
-    int __e_acsl_eq_5;
-    __gmpz_init_set_si(__e_acsl_x_5,(long)x);
-    __gmpz_init_set_si(__e_acsl_8,(long)3);
-    __gmpz_init(__e_acsl_mul);
-    __gmpz_mul(__e_acsl_mul,(__mpz_struct const *)(__e_acsl_x_5),
-               (__mpz_struct const *)(__e_acsl_8));
-    __gmpz_init_set_si(__e_acsl_9,(long)9);
-    __gmpz_init(__e_acsl_neg_5);
-    __gmpz_neg(__e_acsl_neg_5,(__mpz_struct const *)(__e_acsl_9));
-    __e_acsl_eq_5 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_mul),
-                               (__mpz_struct const *)(__e_acsl_neg_5));
-    __e_acsl_assert(__e_acsl_eq_5 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"x*3 == -9",16);
-    __gmpz_clear(__e_acsl_x_5);
-    __gmpz_clear(__e_acsl_8);
-    __gmpz_clear(__e_acsl_mul);
-    __gmpz_clear(__e_acsl_9);
-    __gmpz_clear(__e_acsl_neg_5);
+    mpz_t __gen_e_acsl_x_5;
+    mpz_t __gen_e_acsl__8;
+    mpz_t __gen_e_acsl_mul;
+    mpz_t __gen_e_acsl__9;
+    mpz_t __gen_e_acsl_neg_5;
+    int __gen_e_acsl_eq_5;
+    __gmpz_init_set_si(__gen_e_acsl_x_5,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__8,(long)3);
+    __gmpz_init(__gen_e_acsl_mul);
+    __gmpz_mul(__gen_e_acsl_mul,(__mpz_struct const *)(__gen_e_acsl_x_5),
+               (__mpz_struct const *)(__gen_e_acsl__8));
+    __gmpz_init_set_si(__gen_e_acsl__9,(long)9);
+    __gmpz_init(__gen_e_acsl_neg_5);
+    __gmpz_neg(__gen_e_acsl_neg_5,(__mpz_struct const *)(__gen_e_acsl__9));
+    __gen_e_acsl_eq_5 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_mul),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_5));
+    __e_acsl_assert(__gen_e_acsl_eq_5 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x*3 == -9",16);
+    __gmpz_clear(__gen_e_acsl_x_5);
+    __gmpz_clear(__gen_e_acsl__8);
+    __gmpz_clear(__gen_e_acsl_mul);
+    __gmpz_clear(__gen_e_acsl__9);
+    __gmpz_clear(__gen_e_acsl_neg_5);
   }
   /*@ assert x/3 ≡ -1; */
   {
-    mpz_t __e_acsl_x_6;
-    mpz_t __e_acsl_10;
-    mpz_t __e_acsl_11;
-    int __e_acsl_div_guard;
-    mpz_t __e_acsl_div;
-    mpz_t __e_acsl_12;
-    mpz_t __e_acsl_neg_6;
-    int __e_acsl_eq_6;
-    __gmpz_init_set_si(__e_acsl_x_6,(long)x);
-    __gmpz_init_set_si(__e_acsl_10,(long)3);
-    __gmpz_init_set_si(__e_acsl_11,0L);
-    __e_acsl_div_guard = __gmpz_cmp((__mpz_struct const *)(__e_acsl_10),
-                                    (__mpz_struct const *)(__e_acsl_11));
-    __gmpz_init(__e_acsl_div);
+    mpz_t __gen_e_acsl_x_6;
+    mpz_t __gen_e_acsl__10;
+    mpz_t __gen_e_acsl__11;
+    int __gen_e_acsl_div_guard;
+    mpz_t __gen_e_acsl_div;
+    mpz_t __gen_e_acsl__12;
+    mpz_t __gen_e_acsl_neg_6;
+    int __gen_e_acsl_eq_6;
+    __gmpz_init_set_si(__gen_e_acsl_x_6,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__10,(long)3);
+    __gmpz_init_set_si(__gen_e_acsl__11,0L);
+    __gen_e_acsl_div_guard = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__10),
+                                        (__mpz_struct const *)(__gen_e_acsl__11));
+    __gmpz_init(__gen_e_acsl_div);
     /*@ assert E_ACSL: 3 ≢ 0; */
-    __e_acsl_assert(! (__e_acsl_div_guard == 0),(char *)"Assertion",
+    __e_acsl_assert(! (__gen_e_acsl_div_guard == 0),(char *)"Assertion",
                     (char *)"main",(char *)"3 == 0",17);
-    __gmpz_tdiv_q(__e_acsl_div,(__mpz_struct const *)(__e_acsl_x_6),
-                  (__mpz_struct const *)(__e_acsl_10));
-    __gmpz_init_set_si(__e_acsl_12,(long)1);
-    __gmpz_init(__e_acsl_neg_6);
-    __gmpz_neg(__e_acsl_neg_6,(__mpz_struct const *)(__e_acsl_12));
-    __e_acsl_eq_6 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_div),
-                               (__mpz_struct const *)(__e_acsl_neg_6));
-    __e_acsl_assert(__e_acsl_eq_6 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"x/3 == -1",17);
-    __gmpz_clear(__e_acsl_x_6);
-    __gmpz_clear(__e_acsl_10);
-    __gmpz_clear(__e_acsl_11);
-    __gmpz_clear(__e_acsl_div);
-    __gmpz_clear(__e_acsl_12);
-    __gmpz_clear(__e_acsl_neg_6);
+    __gmpz_tdiv_q(__gen_e_acsl_div,(__mpz_struct const *)(__gen_e_acsl_x_6),
+                  (__mpz_struct const *)(__gen_e_acsl__10));
+    __gmpz_init_set_si(__gen_e_acsl__12,(long)1);
+    __gmpz_init(__gen_e_acsl_neg_6);
+    __gmpz_neg(__gen_e_acsl_neg_6,(__mpz_struct const *)(__gen_e_acsl__12));
+    __gen_e_acsl_eq_6 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_div),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_6));
+    __e_acsl_assert(__gen_e_acsl_eq_6 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x/3 == -1",17);
+    __gmpz_clear(__gen_e_acsl_x_6);
+    __gmpz_clear(__gen_e_acsl__10);
+    __gmpz_clear(__gen_e_acsl__11);
+    __gmpz_clear(__gen_e_acsl_div);
+    __gmpz_clear(__gen_e_acsl__12);
+    __gmpz_clear(__gen_e_acsl_neg_6);
   }
   /*@ assert 0xffffffffffffffffffffff/0xffffffffffffffffffffff ≡ 1; */
   {
-    mpz_t __e_acsl_13;
-    mpz_t __e_acsl_14;
-    int __e_acsl_div_guard_2;
-    mpz_t __e_acsl_div_2;
-    mpz_t __e_acsl_15;
-    int __e_acsl_eq_7;
-    __gmpz_init_set_str(__e_acsl_13,"309485009821345068724781055",10);
-    __gmpz_init_set_si(__e_acsl_14,0L);
-    __e_acsl_div_guard_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_13),
-                                      (__mpz_struct const *)(__e_acsl_14));
-    __gmpz_init(__e_acsl_div_2);
+    mpz_t __gen_e_acsl__13;
+    mpz_t __gen_e_acsl__14;
+    int __gen_e_acsl_div_guard_2;
+    mpz_t __gen_e_acsl_div_2;
+    mpz_t __gen_e_acsl__15;
+    int __gen_e_acsl_eq_7;
+    __gmpz_init_set_str(__gen_e_acsl__13,"309485009821345068724781055",10);
+    __gmpz_init_set_si(__gen_e_acsl__14,0L);
+    __gen_e_acsl_div_guard_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__13),
+                                          (__mpz_struct const *)(__gen_e_acsl__14));
+    __gmpz_init(__gen_e_acsl_div_2);
     /*@ assert E_ACSL: 0xffffffffffffffffffffff ≢ 0; */
-    __e_acsl_assert(! (__e_acsl_div_guard_2 == 0),(char *)"Assertion",
+    __e_acsl_assert(! (__gen_e_acsl_div_guard_2 == 0),(char *)"Assertion",
                     (char *)"main",(char *)"0xffffffffffffffffffffff == 0",
                     18);
-    __gmpz_tdiv_q(__e_acsl_div_2,(__mpz_struct const *)(__e_acsl_13),
-                  (__mpz_struct const *)(__e_acsl_13));
-    __gmpz_init_set_si(__e_acsl_15,(long)1);
-    __e_acsl_eq_7 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_div_2),
-                               (__mpz_struct const *)(__e_acsl_15));
-    __e_acsl_assert(__e_acsl_eq_7 == 0,(char *)"Assertion",(char *)"main",
+    __gmpz_tdiv_q(__gen_e_acsl_div_2,
+                  (__mpz_struct const *)(__gen_e_acsl__13),
+                  (__mpz_struct const *)(__gen_e_acsl__13));
+    __gmpz_init_set_si(__gen_e_acsl__15,(long)1);
+    __gen_e_acsl_eq_7 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_div_2),
+                                   (__mpz_struct const *)(__gen_e_acsl__15));
+    __e_acsl_assert(__gen_e_acsl_eq_7 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"0xffffffffffffffffffffff/0xffffffffffffffffffffff == 1",
                     18);
-    __gmpz_clear(__e_acsl_13);
-    __gmpz_clear(__e_acsl_14);
-    __gmpz_clear(__e_acsl_div_2);
-    __gmpz_clear(__e_acsl_15);
+    __gmpz_clear(__gen_e_acsl__13);
+    __gmpz_clear(__gen_e_acsl__14);
+    __gmpz_clear(__gen_e_acsl_div_2);
+    __gmpz_clear(__gen_e_acsl__15);
   }
   /*@ assert x%2 ≡ -1; */
   {
-    mpz_t __e_acsl_x_7;
-    mpz_t __e_acsl_16;
-    mpz_t __e_acsl_17;
-    int __e_acsl_mod_guard;
-    mpz_t __e_acsl_mod;
-    mpz_t __e_acsl_18;
-    mpz_t __e_acsl_neg_7;
-    int __e_acsl_eq_8;
-    __gmpz_init_set_si(__e_acsl_x_7,(long)x);
-    __gmpz_init_set_si(__e_acsl_16,(long)2);
-    __gmpz_init_set_si(__e_acsl_17,0L);
-    __e_acsl_mod_guard = __gmpz_cmp((__mpz_struct const *)(__e_acsl_16),
-                                    (__mpz_struct const *)(__e_acsl_17));
-    __gmpz_init(__e_acsl_mod);
+    mpz_t __gen_e_acsl_x_7;
+    mpz_t __gen_e_acsl__16;
+    mpz_t __gen_e_acsl__17;
+    int __gen_e_acsl_mod_guard;
+    mpz_t __gen_e_acsl_mod;
+    mpz_t __gen_e_acsl__18;
+    mpz_t __gen_e_acsl_neg_7;
+    int __gen_e_acsl_eq_8;
+    __gmpz_init_set_si(__gen_e_acsl_x_7,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__16,(long)2);
+    __gmpz_init_set_si(__gen_e_acsl__17,0L);
+    __gen_e_acsl_mod_guard = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__16),
+                                        (__mpz_struct const *)(__gen_e_acsl__17));
+    __gmpz_init(__gen_e_acsl_mod);
     /*@ assert E_ACSL: 2 ≢ 0; */
-    __e_acsl_assert(! (__e_acsl_mod_guard == 0),(char *)"Assertion",
+    __e_acsl_assert(! (__gen_e_acsl_mod_guard == 0),(char *)"Assertion",
                     (char *)"main",(char *)"2 == 0",19);
-    __gmpz_tdiv_r(__e_acsl_mod,(__mpz_struct const *)(__e_acsl_x_7),
-                  (__mpz_struct const *)(__e_acsl_16));
-    __gmpz_init_set_si(__e_acsl_18,(long)1);
-    __gmpz_init(__e_acsl_neg_7);
-    __gmpz_neg(__e_acsl_neg_7,(__mpz_struct const *)(__e_acsl_18));
-    __e_acsl_eq_8 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_mod),
-                               (__mpz_struct const *)(__e_acsl_neg_7));
-    __e_acsl_assert(__e_acsl_eq_8 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"x%2 == -1",19);
-    __gmpz_clear(__e_acsl_x_7);
-    __gmpz_clear(__e_acsl_16);
-    __gmpz_clear(__e_acsl_17);
-    __gmpz_clear(__e_acsl_mod);
-    __gmpz_clear(__e_acsl_18);
-    __gmpz_clear(__e_acsl_neg_7);
+    __gmpz_tdiv_r(__gen_e_acsl_mod,(__mpz_struct const *)(__gen_e_acsl_x_7),
+                  (__mpz_struct const *)(__gen_e_acsl__16));
+    __gmpz_init_set_si(__gen_e_acsl__18,(long)1);
+    __gmpz_init(__gen_e_acsl_neg_7);
+    __gmpz_neg(__gen_e_acsl_neg_7,(__mpz_struct const *)(__gen_e_acsl__18));
+    __gen_e_acsl_eq_8 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_mod),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_7));
+    __e_acsl_assert(__gen_e_acsl_eq_8 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x%2 == -1",19);
+    __gmpz_clear(__gen_e_acsl_x_7);
+    __gmpz_clear(__gen_e_acsl__16);
+    __gmpz_clear(__gen_e_acsl__17);
+    __gmpz_clear(__gen_e_acsl_mod);
+    __gmpz_clear(__gen_e_acsl__18);
+    __gmpz_clear(__gen_e_acsl_neg_7);
   }
   /*@ assert -3%-2 ≡ -1; */
   {
-    mpz_t __e_acsl_19;
-    mpz_t __e_acsl_neg_8;
-    mpz_t __e_acsl_20;
-    mpz_t __e_acsl_neg_9;
-    mpz_t __e_acsl_21;
-    int __e_acsl_mod_guard_2;
-    mpz_t __e_acsl_mod_2;
-    mpz_t __e_acsl_22;
-    mpz_t __e_acsl_neg_10;
-    int __e_acsl_eq_9;
-    __gmpz_init_set_si(__e_acsl_19,(long)3);
-    __gmpz_init(__e_acsl_neg_8);
-    __gmpz_neg(__e_acsl_neg_8,(__mpz_struct const *)(__e_acsl_19));
-    __gmpz_init_set_si(__e_acsl_20,(long)2);
-    __gmpz_init(__e_acsl_neg_9);
-    __gmpz_neg(__e_acsl_neg_9,(__mpz_struct const *)(__e_acsl_20));
-    __gmpz_init_set_si(__e_acsl_21,0L);
-    __e_acsl_mod_guard_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_neg_9),
-                                      (__mpz_struct const *)(__e_acsl_21));
-    __gmpz_init(__e_acsl_mod_2);
+    mpz_t __gen_e_acsl__19;
+    mpz_t __gen_e_acsl_neg_8;
+    mpz_t __gen_e_acsl__20;
+    mpz_t __gen_e_acsl_neg_9;
+    mpz_t __gen_e_acsl__21;
+    int __gen_e_acsl_mod_guard_2;
+    mpz_t __gen_e_acsl_mod_2;
+    mpz_t __gen_e_acsl__22;
+    mpz_t __gen_e_acsl_neg_10;
+    int __gen_e_acsl_eq_9;
+    __gmpz_init_set_si(__gen_e_acsl__19,(long)3);
+    __gmpz_init(__gen_e_acsl_neg_8);
+    __gmpz_neg(__gen_e_acsl_neg_8,(__mpz_struct const *)(__gen_e_acsl__19));
+    __gmpz_init_set_si(__gen_e_acsl__20,(long)2);
+    __gmpz_init(__gen_e_acsl_neg_9);
+    __gmpz_neg(__gen_e_acsl_neg_9,(__mpz_struct const *)(__gen_e_acsl__20));
+    __gmpz_init_set_si(__gen_e_acsl__21,0L);
+    __gen_e_acsl_mod_guard_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_neg_9),
+                                          (__mpz_struct const *)(__gen_e_acsl__21));
+    __gmpz_init(__gen_e_acsl_mod_2);
     /*@ assert E_ACSL: -2 ≢ 0; */
-    __e_acsl_assert(! (__e_acsl_mod_guard_2 == 0),(char *)"Assertion",
+    __e_acsl_assert(! (__gen_e_acsl_mod_guard_2 == 0),(char *)"Assertion",
                     (char *)"main",(char *)"-2 == 0",20);
-    __gmpz_tdiv_r(__e_acsl_mod_2,(__mpz_struct const *)(__e_acsl_neg_8),
-                  (__mpz_struct const *)(__e_acsl_neg_9));
-    __gmpz_init_set_si(__e_acsl_22,(long)1);
-    __gmpz_init(__e_acsl_neg_10);
-    __gmpz_neg(__e_acsl_neg_10,(__mpz_struct const *)(__e_acsl_22));
-    __e_acsl_eq_9 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_mod_2),
-                               (__mpz_struct const *)(__e_acsl_neg_10));
-    __e_acsl_assert(__e_acsl_eq_9 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"-3%-2 == -1",20);
-    __gmpz_clear(__e_acsl_19);
-    __gmpz_clear(__e_acsl_neg_8);
-    __gmpz_clear(__e_acsl_20);
-    __gmpz_clear(__e_acsl_neg_9);
-    __gmpz_clear(__e_acsl_21);
-    __gmpz_clear(__e_acsl_mod_2);
-    __gmpz_clear(__e_acsl_22);
-    __gmpz_clear(__e_acsl_neg_10);
+    __gmpz_tdiv_r(__gen_e_acsl_mod_2,
+                  (__mpz_struct const *)(__gen_e_acsl_neg_8),
+                  (__mpz_struct const *)(__gen_e_acsl_neg_9));
+    __gmpz_init_set_si(__gen_e_acsl__22,(long)1);
+    __gmpz_init(__gen_e_acsl_neg_10);
+    __gmpz_neg(__gen_e_acsl_neg_10,(__mpz_struct const *)(__gen_e_acsl__22));
+    __gen_e_acsl_eq_9 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_mod_2),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_10));
+    __e_acsl_assert(__gen_e_acsl_eq_9 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"-3%-2 == -1",20);
+    __gmpz_clear(__gen_e_acsl__19);
+    __gmpz_clear(__gen_e_acsl_neg_8);
+    __gmpz_clear(__gen_e_acsl__20);
+    __gmpz_clear(__gen_e_acsl_neg_9);
+    __gmpz_clear(__gen_e_acsl__21);
+    __gmpz_clear(__gen_e_acsl_mod_2);
+    __gmpz_clear(__gen_e_acsl__22);
+    __gmpz_clear(__gen_e_acsl_neg_10);
   }
   /*@ assert 3%-2 ≡ 1; */
   {
-    mpz_t __e_acsl_23;
-    mpz_t __e_acsl_24;
-    mpz_t __e_acsl_neg_11;
-    mpz_t __e_acsl_25;
-    int __e_acsl_mod_guard_3;
-    mpz_t __e_acsl_mod_3;
-    mpz_t __e_acsl_26;
-    int __e_acsl_eq_10;
-    __gmpz_init_set_si(__e_acsl_23,(long)3);
-    __gmpz_init_set_si(__e_acsl_24,(long)2);
-    __gmpz_init(__e_acsl_neg_11);
-    __gmpz_neg(__e_acsl_neg_11,(__mpz_struct const *)(__e_acsl_24));
-    __gmpz_init_set_si(__e_acsl_25,0L);
-    __e_acsl_mod_guard_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_neg_11),
-                                      (__mpz_struct const *)(__e_acsl_25));
-    __gmpz_init(__e_acsl_mod_3);
+    mpz_t __gen_e_acsl__23;
+    mpz_t __gen_e_acsl__24;
+    mpz_t __gen_e_acsl_neg_11;
+    mpz_t __gen_e_acsl__25;
+    int __gen_e_acsl_mod_guard_3;
+    mpz_t __gen_e_acsl_mod_3;
+    mpz_t __gen_e_acsl__26;
+    int __gen_e_acsl_eq_10;
+    __gmpz_init_set_si(__gen_e_acsl__23,(long)3);
+    __gmpz_init_set_si(__gen_e_acsl__24,(long)2);
+    __gmpz_init(__gen_e_acsl_neg_11);
+    __gmpz_neg(__gen_e_acsl_neg_11,(__mpz_struct const *)(__gen_e_acsl__24));
+    __gmpz_init_set_si(__gen_e_acsl__25,0L);
+    __gen_e_acsl_mod_guard_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_neg_11),
+                                          (__mpz_struct const *)(__gen_e_acsl__25));
+    __gmpz_init(__gen_e_acsl_mod_3);
     /*@ assert E_ACSL: -2 ≢ 0; */
-    __e_acsl_assert(! (__e_acsl_mod_guard_3 == 0),(char *)"Assertion",
+    __e_acsl_assert(! (__gen_e_acsl_mod_guard_3 == 0),(char *)"Assertion",
                     (char *)"main",(char *)"-2 == 0",21);
-    __gmpz_tdiv_r(__e_acsl_mod_3,(__mpz_struct const *)(__e_acsl_23),
-                  (__mpz_struct const *)(__e_acsl_neg_11));
-    __gmpz_init_set_si(__e_acsl_26,(long)1);
-    __e_acsl_eq_10 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_mod_3),
-                                (__mpz_struct const *)(__e_acsl_26));
-    __e_acsl_assert(__e_acsl_eq_10 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"3%-2 == 1",21);
-    __gmpz_clear(__e_acsl_23);
-    __gmpz_clear(__e_acsl_24);
-    __gmpz_clear(__e_acsl_neg_11);
-    __gmpz_clear(__e_acsl_25);
-    __gmpz_clear(__e_acsl_mod_3);
-    __gmpz_clear(__e_acsl_26);
+    __gmpz_tdiv_r(__gen_e_acsl_mod_3,
+                  (__mpz_struct const *)(__gen_e_acsl__23),
+                  (__mpz_struct const *)(__gen_e_acsl_neg_11));
+    __gmpz_init_set_si(__gen_e_acsl__26,(long)1);
+    __gen_e_acsl_eq_10 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_mod_3),
+                                    (__mpz_struct const *)(__gen_e_acsl__26));
+    __e_acsl_assert(__gen_e_acsl_eq_10 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"3%-2 == 1",21);
+    __gmpz_clear(__gen_e_acsl__23);
+    __gmpz_clear(__gen_e_acsl__24);
+    __gmpz_clear(__gen_e_acsl_neg_11);
+    __gmpz_clear(__gen_e_acsl__25);
+    __gmpz_clear(__gen_e_acsl_mod_3);
+    __gmpz_clear(__gen_e_acsl__26);
   }
   /*@ assert ((x*2+(3+y))-4)+(x-y) ≡ -10; */
   {
-    mpz_t __e_acsl_x_8;
-    mpz_t __e_acsl_27;
-    mpz_t __e_acsl_mul_2;
-    mpz_t __e_acsl_28;
-    mpz_t __e_acsl_y;
-    mpz_t __e_acsl_add_2;
-    mpz_t __e_acsl_add_3;
-    mpz_t __e_acsl_29;
-    mpz_t __e_acsl_sub_2;
-    mpz_t __e_acsl_sub_3;
-    mpz_t __e_acsl_add_4;
-    mpz_t __e_acsl_30;
-    mpz_t __e_acsl_neg_12;
-    int __e_acsl_eq_11;
-    __gmpz_init_set_si(__e_acsl_x_8,(long)x);
-    __gmpz_init_set_si(__e_acsl_27,(long)2);
-    __gmpz_init(__e_acsl_mul_2);
-    __gmpz_mul(__e_acsl_mul_2,(__mpz_struct const *)(__e_acsl_x_8),
-               (__mpz_struct const *)(__e_acsl_27));
-    __gmpz_init_set_si(__e_acsl_28,(long)3);
-    __gmpz_init_set_si(__e_acsl_y,(long)y);
-    __gmpz_init(__e_acsl_add_2);
-    __gmpz_add(__e_acsl_add_2,(__mpz_struct const *)(__e_acsl_28),
-               (__mpz_struct const *)(__e_acsl_y));
-    __gmpz_init(__e_acsl_add_3);
-    __gmpz_add(__e_acsl_add_3,(__mpz_struct const *)(__e_acsl_mul_2),
-               (__mpz_struct const *)(__e_acsl_add_2));
-    __gmpz_init_set_si(__e_acsl_29,(long)4);
-    __gmpz_init(__e_acsl_sub_2);
-    __gmpz_sub(__e_acsl_sub_2,(__mpz_struct const *)(__e_acsl_add_3),
-               (__mpz_struct const *)(__e_acsl_29));
-    __gmpz_init(__e_acsl_sub_3);
-    __gmpz_sub(__e_acsl_sub_3,(__mpz_struct const *)(__e_acsl_x_8),
-               (__mpz_struct const *)(__e_acsl_y));
-    __gmpz_init(__e_acsl_add_4);
-    __gmpz_add(__e_acsl_add_4,(__mpz_struct const *)(__e_acsl_sub_2),
-               (__mpz_struct const *)(__e_acsl_sub_3));
-    __gmpz_init_set_si(__e_acsl_30,(long)10);
-    __gmpz_init(__e_acsl_neg_12);
-    __gmpz_neg(__e_acsl_neg_12,(__mpz_struct const *)(__e_acsl_30));
-    __e_acsl_eq_11 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_add_4),
-                                (__mpz_struct const *)(__e_acsl_neg_12));
-    __e_acsl_assert(__e_acsl_eq_11 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"((x*2+(3+y))-4)+(x-y) == -10",23);
-    __gmpz_clear(__e_acsl_x_8);
-    __gmpz_clear(__e_acsl_27);
-    __gmpz_clear(__e_acsl_mul_2);
-    __gmpz_clear(__e_acsl_28);
-    __gmpz_clear(__e_acsl_y);
-    __gmpz_clear(__e_acsl_add_2);
-    __gmpz_clear(__e_acsl_add_3);
-    __gmpz_clear(__e_acsl_29);
-    __gmpz_clear(__e_acsl_sub_2);
-    __gmpz_clear(__e_acsl_sub_3);
-    __gmpz_clear(__e_acsl_add_4);
-    __gmpz_clear(__e_acsl_30);
-    __gmpz_clear(__e_acsl_neg_12);
+    mpz_t __gen_e_acsl_x_8;
+    mpz_t __gen_e_acsl__27;
+    mpz_t __gen_e_acsl_mul_2;
+    mpz_t __gen_e_acsl__28;
+    mpz_t __gen_e_acsl_y;
+    mpz_t __gen_e_acsl_add_2;
+    mpz_t __gen_e_acsl_add_3;
+    mpz_t __gen_e_acsl__29;
+    mpz_t __gen_e_acsl_sub_2;
+    mpz_t __gen_e_acsl_sub_3;
+    mpz_t __gen_e_acsl_add_4;
+    mpz_t __gen_e_acsl__30;
+    mpz_t __gen_e_acsl_neg_12;
+    int __gen_e_acsl_eq_11;
+    __gmpz_init_set_si(__gen_e_acsl_x_8,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__27,(long)2);
+    __gmpz_init(__gen_e_acsl_mul_2);
+    __gmpz_mul(__gen_e_acsl_mul_2,(__mpz_struct const *)(__gen_e_acsl_x_8),
+               (__mpz_struct const *)(__gen_e_acsl__27));
+    __gmpz_init_set_si(__gen_e_acsl__28,(long)3);
+    __gmpz_init_set_si(__gen_e_acsl_y,(long)y);
+    __gmpz_init(__gen_e_acsl_add_2);
+    __gmpz_add(__gen_e_acsl_add_2,(__mpz_struct const *)(__gen_e_acsl__28),
+               (__mpz_struct const *)(__gen_e_acsl_y));
+    __gmpz_init(__gen_e_acsl_add_3);
+    __gmpz_add(__gen_e_acsl_add_3,(__mpz_struct const *)(__gen_e_acsl_mul_2),
+               (__mpz_struct const *)(__gen_e_acsl_add_2));
+    __gmpz_init_set_si(__gen_e_acsl__29,(long)4);
+    __gmpz_init(__gen_e_acsl_sub_2);
+    __gmpz_sub(__gen_e_acsl_sub_2,(__mpz_struct const *)(__gen_e_acsl_add_3),
+               (__mpz_struct const *)(__gen_e_acsl__29));
+    __gmpz_init(__gen_e_acsl_sub_3);
+    __gmpz_sub(__gen_e_acsl_sub_3,(__mpz_struct const *)(__gen_e_acsl_x_8),
+               (__mpz_struct const *)(__gen_e_acsl_y));
+    __gmpz_init(__gen_e_acsl_add_4);
+    __gmpz_add(__gen_e_acsl_add_4,(__mpz_struct const *)(__gen_e_acsl_sub_2),
+               (__mpz_struct const *)(__gen_e_acsl_sub_3));
+    __gmpz_init_set_si(__gen_e_acsl__30,(long)10);
+    __gmpz_init(__gen_e_acsl_neg_12);
+    __gmpz_neg(__gen_e_acsl_neg_12,(__mpz_struct const *)(__gen_e_acsl__30));
+    __gen_e_acsl_eq_11 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_add_4),
+                                    (__mpz_struct const *)(__gen_e_acsl_neg_12));
+    __e_acsl_assert(__gen_e_acsl_eq_11 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"((x*2+(3+y))-4)+(x-y) == -10",23);
+    __gmpz_clear(__gen_e_acsl_x_8);
+    __gmpz_clear(__gen_e_acsl__27);
+    __gmpz_clear(__gen_e_acsl_mul_2);
+    __gmpz_clear(__gen_e_acsl__28);
+    __gmpz_clear(__gen_e_acsl_y);
+    __gmpz_clear(__gen_e_acsl_add_2);
+    __gmpz_clear(__gen_e_acsl_add_3);
+    __gmpz_clear(__gen_e_acsl__29);
+    __gmpz_clear(__gen_e_acsl_sub_2);
+    __gmpz_clear(__gen_e_acsl_sub_3);
+    __gmpz_clear(__gen_e_acsl_add_4);
+    __gmpz_clear(__gen_e_acsl__30);
+    __gmpz_clear(__gen_e_acsl_neg_12);
   }
   /*@ assert (0≡1) ≡ !(0≡0); */
   {
-    mpz_t __e_acsl_31;
-    mpz_t __e_acsl_32;
-    int __e_acsl_eq_12;
-    mpz_t __e_acsl_33;
-    int __e_acsl_eq_13;
-    mpz_t __e_acsl_34;
-    int __e_acsl_not;
-    mpz_t __e_acsl_35;
-    int __e_acsl_eq_14;
-    __gmpz_init_set_si(__e_acsl_31,(long)0);
-    __gmpz_init_set_si(__e_acsl_32,(long)1);
-    __e_acsl_eq_12 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_31),
-                                (__mpz_struct const *)(__e_acsl_32));
-    __gmpz_init_set_si(__e_acsl_33,(long)(__e_acsl_eq_12 == 0));
-    __e_acsl_eq_13 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_31),
-                                (__mpz_struct const *)(__e_acsl_31));
-    __gmpz_init_set_si(__e_acsl_34,(long)(__e_acsl_eq_13 == 0));
-    __e_acsl_not = __gmpz_cmp((__mpz_struct const *)(__e_acsl_34),
-                              (__mpz_struct const *)(__e_acsl_31));
-    __gmpz_init_set_si(__e_acsl_35,(long)(__e_acsl_not == 0));
-    __e_acsl_eq_14 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_33),
-                                (__mpz_struct const *)(__e_acsl_35));
-    __e_acsl_assert(__e_acsl_eq_14 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"(0==1) == !(0==0)",25);
-    __gmpz_clear(__e_acsl_31);
-    __gmpz_clear(__e_acsl_32);
-    __gmpz_clear(__e_acsl_33);
-    __gmpz_clear(__e_acsl_34);
-    __gmpz_clear(__e_acsl_35);
+    mpz_t __gen_e_acsl__31;
+    mpz_t __gen_e_acsl__32;
+    int __gen_e_acsl_eq_12;
+    mpz_t __gen_e_acsl__33;
+    int __gen_e_acsl_eq_13;
+    mpz_t __gen_e_acsl__34;
+    int __gen_e_acsl_not;
+    mpz_t __gen_e_acsl__35;
+    int __gen_e_acsl_eq_14;
+    __gmpz_init_set_si(__gen_e_acsl__31,(long)0);
+    __gmpz_init_set_si(__gen_e_acsl__32,(long)1);
+    __gen_e_acsl_eq_12 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__31),
+                                    (__mpz_struct const *)(__gen_e_acsl__32));
+    __gmpz_init_set_si(__gen_e_acsl__33,(long)(__gen_e_acsl_eq_12 == 0));
+    __gen_e_acsl_eq_13 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__31),
+                                    (__mpz_struct const *)(__gen_e_acsl__31));
+    __gmpz_init_set_si(__gen_e_acsl__34,(long)(__gen_e_acsl_eq_13 == 0));
+    __gen_e_acsl_not = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__34),
+                                  (__mpz_struct const *)(__gen_e_acsl__31));
+    __gmpz_init_set_si(__gen_e_acsl__35,(long)(__gen_e_acsl_not == 0));
+    __gen_e_acsl_eq_14 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__33),
+                                    (__mpz_struct const *)(__gen_e_acsl__35));
+    __e_acsl_assert(__gen_e_acsl_eq_14 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"(0==1) == !(0==0)",25);
+    __gmpz_clear(__gen_e_acsl__31);
+    __gmpz_clear(__gen_e_acsl__32);
+    __gmpz_clear(__gen_e_acsl__33);
+    __gmpz_clear(__gen_e_acsl__34);
+    __gmpz_clear(__gen_e_acsl__35);
   }
   /*@ assert (0≤-1) ≡ (0>0); */
   {
-    mpz_t __e_acsl_36;
-    mpz_t __e_acsl_37;
-    mpz_t __e_acsl_neg_13;
-    int __e_acsl_le;
-    mpz_t __e_acsl_38;
-    int __e_acsl_gt;
-    mpz_t __e_acsl_39;
-    int __e_acsl_eq_15;
-    __gmpz_init_set_si(__e_acsl_36,(long)0);
-    __gmpz_init_set_si(__e_acsl_37,(long)1);
-    __gmpz_init(__e_acsl_neg_13);
-    __gmpz_neg(__e_acsl_neg_13,(__mpz_struct const *)(__e_acsl_37));
-    __e_acsl_le = __gmpz_cmp((__mpz_struct const *)(__e_acsl_36),
-                             (__mpz_struct const *)(__e_acsl_neg_13));
-    __gmpz_init_set_si(__e_acsl_38,(long)(__e_acsl_le <= 0));
-    __e_acsl_gt = __gmpz_cmp((__mpz_struct const *)(__e_acsl_36),
-                             (__mpz_struct const *)(__e_acsl_36));
-    __gmpz_init_set_si(__e_acsl_39,(long)(__e_acsl_gt > 0));
-    __e_acsl_eq_15 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_38),
-                                (__mpz_struct const *)(__e_acsl_39));
-    __e_acsl_assert(__e_acsl_eq_15 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"(0<=-1) == (0>0)",26);
-    __gmpz_clear(__e_acsl_36);
-    __gmpz_clear(__e_acsl_37);
-    __gmpz_clear(__e_acsl_neg_13);
-    __gmpz_clear(__e_acsl_38);
-    __gmpz_clear(__e_acsl_39);
+    mpz_t __gen_e_acsl__36;
+    mpz_t __gen_e_acsl__37;
+    mpz_t __gen_e_acsl_neg_13;
+    int __gen_e_acsl_le;
+    mpz_t __gen_e_acsl__38;
+    int __gen_e_acsl_gt;
+    mpz_t __gen_e_acsl__39;
+    int __gen_e_acsl_eq_15;
+    __gmpz_init_set_si(__gen_e_acsl__36,(long)0);
+    __gmpz_init_set_si(__gen_e_acsl__37,(long)1);
+    __gmpz_init(__gen_e_acsl_neg_13);
+    __gmpz_neg(__gen_e_acsl_neg_13,(__mpz_struct const *)(__gen_e_acsl__37));
+    __gen_e_acsl_le = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__36),
+                                 (__mpz_struct const *)(__gen_e_acsl_neg_13));
+    __gmpz_init_set_si(__gen_e_acsl__38,(long)(__gen_e_acsl_le <= 0));
+    __gen_e_acsl_gt = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__36),
+                                 (__mpz_struct const *)(__gen_e_acsl__36));
+    __gmpz_init_set_si(__gen_e_acsl__39,(long)(__gen_e_acsl_gt > 0));
+    __gen_e_acsl_eq_15 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__38),
+                                    (__mpz_struct const *)(__gen_e_acsl__39));
+    __e_acsl_assert(__gen_e_acsl_eq_15 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"(0<=-1) == (0>0)",26);
+    __gmpz_clear(__gen_e_acsl__36);
+    __gmpz_clear(__gen_e_acsl__37);
+    __gmpz_clear(__gen_e_acsl_neg_13);
+    __gmpz_clear(__gen_e_acsl__38);
+    __gmpz_clear(__gen_e_acsl__39);
   }
   /*@ assert (0≥-1) ≡ (0≤0); */
   {
-    mpz_t __e_acsl_40;
-    mpz_t __e_acsl_41;
-    mpz_t __e_acsl_neg_14;
-    int __e_acsl_ge;
-    mpz_t __e_acsl_42;
-    int __e_acsl_le_2;
-    mpz_t __e_acsl_43;
-    int __e_acsl_eq_16;
-    __gmpz_init_set_si(__e_acsl_40,(long)0);
-    __gmpz_init_set_si(__e_acsl_41,(long)1);
-    __gmpz_init(__e_acsl_neg_14);
-    __gmpz_neg(__e_acsl_neg_14,(__mpz_struct const *)(__e_acsl_41));
-    __e_acsl_ge = __gmpz_cmp((__mpz_struct const *)(__e_acsl_40),
-                             (__mpz_struct const *)(__e_acsl_neg_14));
-    __gmpz_init_set_si(__e_acsl_42,(long)(__e_acsl_ge >= 0));
-    __e_acsl_le_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_40),
-                               (__mpz_struct const *)(__e_acsl_40));
-    __gmpz_init_set_si(__e_acsl_43,(long)(__e_acsl_le_2 <= 0));
-    __e_acsl_eq_16 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_42),
-                                (__mpz_struct const *)(__e_acsl_43));
-    __e_acsl_assert(__e_acsl_eq_16 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"(0>=-1) == (0<=0)",27);
-    __gmpz_clear(__e_acsl_40);
-    __gmpz_clear(__e_acsl_41);
-    __gmpz_clear(__e_acsl_neg_14);
-    __gmpz_clear(__e_acsl_42);
-    __gmpz_clear(__e_acsl_43);
+    mpz_t __gen_e_acsl__40;
+    mpz_t __gen_e_acsl__41;
+    mpz_t __gen_e_acsl_neg_14;
+    int __gen_e_acsl_ge;
+    mpz_t __gen_e_acsl__42;
+    int __gen_e_acsl_le_2;
+    mpz_t __gen_e_acsl__43;
+    int __gen_e_acsl_eq_16;
+    __gmpz_init_set_si(__gen_e_acsl__40,(long)0);
+    __gmpz_init_set_si(__gen_e_acsl__41,(long)1);
+    __gmpz_init(__gen_e_acsl_neg_14);
+    __gmpz_neg(__gen_e_acsl_neg_14,(__mpz_struct const *)(__gen_e_acsl__41));
+    __gen_e_acsl_ge = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__40),
+                                 (__mpz_struct const *)(__gen_e_acsl_neg_14));
+    __gmpz_init_set_si(__gen_e_acsl__42,(long)(__gen_e_acsl_ge >= 0));
+    __gen_e_acsl_le_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__40),
+                                   (__mpz_struct const *)(__gen_e_acsl__40));
+    __gmpz_init_set_si(__gen_e_acsl__43,(long)(__gen_e_acsl_le_2 <= 0));
+    __gen_e_acsl_eq_16 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__42),
+                                    (__mpz_struct const *)(__gen_e_acsl__43));
+    __e_acsl_assert(__gen_e_acsl_eq_16 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"(0>=-1) == (0<=0)",27);
+    __gmpz_clear(__gen_e_acsl__40);
+    __gmpz_clear(__gen_e_acsl__41);
+    __gmpz_clear(__gen_e_acsl_neg_14);
+    __gmpz_clear(__gen_e_acsl__42);
+    __gmpz_clear(__gen_e_acsl__43);
   }
   /*@ assert (0≢1) ≡ !(0≢0); */
   {
-    mpz_t __e_acsl_44;
-    mpz_t __e_acsl_45;
-    int __e_acsl_ne_2;
-    mpz_t __e_acsl_46;
-    int __e_acsl_ne_3;
-    mpz_t __e_acsl_47;
-    int __e_acsl_not_2;
-    mpz_t __e_acsl_48;
-    int __e_acsl_eq_17;
-    __gmpz_init_set_si(__e_acsl_44,(long)0);
-    __gmpz_init_set_si(__e_acsl_45,(long)1);
-    __e_acsl_ne_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_44),
-                               (__mpz_struct const *)(__e_acsl_45));
-    __gmpz_init_set_si(__e_acsl_46,(long)(__e_acsl_ne_2 != 0));
-    __e_acsl_ne_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_44),
-                               (__mpz_struct const *)(__e_acsl_44));
-    __gmpz_init_set_si(__e_acsl_47,(long)(__e_acsl_ne_3 != 0));
-    __e_acsl_not_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_47),
-                                (__mpz_struct const *)(__e_acsl_44));
-    __gmpz_init_set_si(__e_acsl_48,(long)(__e_acsl_not_2 == 0));
-    __e_acsl_eq_17 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_46),
-                                (__mpz_struct const *)(__e_acsl_48));
-    __e_acsl_assert(__e_acsl_eq_17 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"(0!=1) == !(0!=0)",28);
-    __gmpz_clear(__e_acsl_44);
-    __gmpz_clear(__e_acsl_45);
-    __gmpz_clear(__e_acsl_46);
-    __gmpz_clear(__e_acsl_47);
-    __gmpz_clear(__e_acsl_48);
+    mpz_t __gen_e_acsl__44;
+    mpz_t __gen_e_acsl__45;
+    int __gen_e_acsl_ne_2;
+    mpz_t __gen_e_acsl__46;
+    int __gen_e_acsl_ne_3;
+    mpz_t __gen_e_acsl__47;
+    int __gen_e_acsl_not_2;
+    mpz_t __gen_e_acsl__48;
+    int __gen_e_acsl_eq_17;
+    __gmpz_init_set_si(__gen_e_acsl__44,(long)0);
+    __gmpz_init_set_si(__gen_e_acsl__45,(long)1);
+    __gen_e_acsl_ne_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__44),
+                                   (__mpz_struct const *)(__gen_e_acsl__45));
+    __gmpz_init_set_si(__gen_e_acsl__46,(long)(__gen_e_acsl_ne_2 != 0));
+    __gen_e_acsl_ne_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__44),
+                                   (__mpz_struct const *)(__gen_e_acsl__44));
+    __gmpz_init_set_si(__gen_e_acsl__47,(long)(__gen_e_acsl_ne_3 != 0));
+    __gen_e_acsl_not_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__47),
+                                    (__mpz_struct const *)(__gen_e_acsl__44));
+    __gmpz_init_set_si(__gen_e_acsl__48,(long)(__gen_e_acsl_not_2 == 0));
+    __gen_e_acsl_eq_17 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__46),
+                                    (__mpz_struct const *)(__gen_e_acsl__48));
+    __e_acsl_assert(__gen_e_acsl_eq_17 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"(0!=1) == !(0!=0)",28);
+    __gmpz_clear(__gen_e_acsl__44);
+    __gmpz_clear(__gen_e_acsl__45);
+    __gmpz_clear(__gen_e_acsl__46);
+    __gmpz_clear(__gen_e_acsl__47);
+    __gmpz_clear(__gen_e_acsl__48);
   }
   /*@ assert (0≢0) ≡ !(1≢0); */
   {
-    mpz_t __e_acsl_49;
-    int __e_acsl_ne_4;
-    mpz_t __e_acsl_50;
-    mpz_t __e_acsl_51;
-    int __e_acsl_ne_5;
-    mpz_t __e_acsl_52;
-    int __e_acsl_not_3;
-    mpz_t __e_acsl_53;
-    int __e_acsl_eq_18;
-    __gmpz_init_set_si(__e_acsl_49,(long)0);
-    __e_acsl_ne_4 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_49),
-                               (__mpz_struct const *)(__e_acsl_49));
-    __gmpz_init_set_si(__e_acsl_50,(long)(__e_acsl_ne_4 != 0));
-    __gmpz_init_set_si(__e_acsl_51,(long)1);
-    __e_acsl_ne_5 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_51),
-                               (__mpz_struct const *)(__e_acsl_49));
-    __gmpz_init_set_si(__e_acsl_52,(long)(__e_acsl_ne_5 != 0));
-    __e_acsl_not_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_52),
-                                (__mpz_struct const *)(__e_acsl_49));
-    __gmpz_init_set_si(__e_acsl_53,(long)(__e_acsl_not_3 == 0));
-    __e_acsl_eq_18 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_50),
-                                (__mpz_struct const *)(__e_acsl_53));
-    __e_acsl_assert(__e_acsl_eq_18 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"(0!=0) == !(1!=0)",30);
-    __gmpz_clear(__e_acsl_49);
-    __gmpz_clear(__e_acsl_50);
-    __gmpz_clear(__e_acsl_51);
-    __gmpz_clear(__e_acsl_52);
-    __gmpz_clear(__e_acsl_53);
+    mpz_t __gen_e_acsl__49;
+    int __gen_e_acsl_ne_4;
+    mpz_t __gen_e_acsl__50;
+    mpz_t __gen_e_acsl__51;
+    int __gen_e_acsl_ne_5;
+    mpz_t __gen_e_acsl__52;
+    int __gen_e_acsl_not_3;
+    mpz_t __gen_e_acsl__53;
+    int __gen_e_acsl_eq_18;
+    __gmpz_init_set_si(__gen_e_acsl__49,(long)0);
+    __gen_e_acsl_ne_4 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__49),
+                                   (__mpz_struct const *)(__gen_e_acsl__49));
+    __gmpz_init_set_si(__gen_e_acsl__50,(long)(__gen_e_acsl_ne_4 != 0));
+    __gmpz_init_set_si(__gen_e_acsl__51,(long)1);
+    __gen_e_acsl_ne_5 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__51),
+                                   (__mpz_struct const *)(__gen_e_acsl__49));
+    __gmpz_init_set_si(__gen_e_acsl__52,(long)(__gen_e_acsl_ne_5 != 0));
+    __gen_e_acsl_not_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__52),
+                                    (__mpz_struct const *)(__gen_e_acsl__49));
+    __gmpz_init_set_si(__gen_e_acsl__53,(long)(__gen_e_acsl_not_3 == 0));
+    __gen_e_acsl_eq_18 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__50),
+                                    (__mpz_struct const *)(__gen_e_acsl__53));
+    __e_acsl_assert(__gen_e_acsl_eq_18 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"(0!=0) == !(1!=0)",30);
+    __gmpz_clear(__gen_e_acsl__49);
+    __gmpz_clear(__gen_e_acsl__50);
+    __gmpz_clear(__gen_e_acsl__51);
+    __gmpz_clear(__gen_e_acsl__52);
+    __gmpz_clear(__gen_e_acsl__53);
   }
   /*@ assert 4/y ≡ 2; */
   {
-    mpz_t __e_acsl_54;
-    mpz_t __e_acsl_y_2;
-    mpz_t __e_acsl_55;
-    int __e_acsl_div_guard_3;
-    mpz_t __e_acsl_div_3;
-    mpz_t __e_acsl_56;
-    int __e_acsl_eq_19;
-    __gmpz_init_set_si(__e_acsl_54,(long)4);
-    __gmpz_init_set_si(__e_acsl_y_2,(long)y);
-    __gmpz_init_set_si(__e_acsl_55,0L);
-    __e_acsl_div_guard_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_y_2),
-                                      (__mpz_struct const *)(__e_acsl_55));
-    __gmpz_init(__e_acsl_div_3);
+    mpz_t __gen_e_acsl__54;
+    mpz_t __gen_e_acsl_y_2;
+    mpz_t __gen_e_acsl__55;
+    int __gen_e_acsl_div_guard_3;
+    mpz_t __gen_e_acsl_div_3;
+    mpz_t __gen_e_acsl__56;
+    int __gen_e_acsl_eq_19;
+    __gmpz_init_set_si(__gen_e_acsl__54,(long)4);
+    __gmpz_init_set_si(__gen_e_acsl_y_2,(long)y);
+    __gmpz_init_set_si(__gen_e_acsl__55,0L);
+    __gen_e_acsl_div_guard_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_y_2),
+                                          (__mpz_struct const *)(__gen_e_acsl__55));
+    __gmpz_init(__gen_e_acsl_div_3);
     /*@ assert E_ACSL: y ≢ 0; */
-    __e_acsl_assert(! (__e_acsl_div_guard_3 == 0),(char *)"Assertion",
+    __e_acsl_assert(! (__gen_e_acsl_div_guard_3 == 0),(char *)"Assertion",
                     (char *)"main",(char *)"y == 0",31);
-    __gmpz_tdiv_q(__e_acsl_div_3,(__mpz_struct const *)(__e_acsl_54),
-                  (__mpz_struct const *)(__e_acsl_y_2));
-    __gmpz_init_set_si(__e_acsl_56,(long)2);
-    __e_acsl_eq_19 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_div_3),
-                                (__mpz_struct const *)(__e_acsl_56));
-    __e_acsl_assert(__e_acsl_eq_19 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"4/y == 2",31);
-    __gmpz_clear(__e_acsl_54);
-    __gmpz_clear(__e_acsl_y_2);
-    __gmpz_clear(__e_acsl_55);
-    __gmpz_clear(__e_acsl_div_3);
-    __gmpz_clear(__e_acsl_56);
+    __gmpz_tdiv_q(__gen_e_acsl_div_3,
+                  (__mpz_struct const *)(__gen_e_acsl__54),
+                  (__mpz_struct const *)(__gen_e_acsl_y_2));
+    __gmpz_init_set_si(__gen_e_acsl__56,(long)2);
+    __gen_e_acsl_eq_19 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_div_3),
+                                    (__mpz_struct const *)(__gen_e_acsl__56));
+    __e_acsl_assert(__gen_e_acsl_eq_19 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"4/y == 2",31);
+    __gmpz_clear(__gen_e_acsl__54);
+    __gmpz_clear(__gen_e_acsl_y_2);
+    __gmpz_clear(__gen_e_acsl__55);
+    __gmpz_clear(__gen_e_acsl_div_3);
+    __gmpz_clear(__gen_e_acsl__56);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_array2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_array2.c
index 45962168679ea0b4e719fa7eb46720bd9c549508..04b89745d9373be092a0147bbf47e337c976fa37 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_array2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_array2.c
@@ -22,31 +22,31 @@ int main(void)
   }
   /*@ assert T1[0] ≡ T2[0]; */
   {
-    mpz_t __e_acsl;
-    mpz_t __e_acsl_2;
-    int __e_acsl_eq;
-    __gmpz_init_set_si(__e_acsl,(long)T1[0]);
-    __gmpz_init_set_si(__e_acsl_2,(long)T2[0]);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl),
-                             (__mpz_struct const *)(__e_acsl_2));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_;
+    mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_,(long)T1[0]);
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)T2[0]);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_),
+                                 (__mpz_struct const *)(__gen_e_acsl__2));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"T1[0] == T2[0]",13);
-    __gmpz_clear(__e_acsl);
-    __gmpz_clear(__e_acsl_2);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl__2);
   }
   /*@ assert T1[1] ≢ T2[1]; */
   {
-    mpz_t __e_acsl_3;
-    mpz_t __e_acsl_4;
-    int __e_acsl_ne;
-    __gmpz_init_set_si(__e_acsl_3,(long)T1[1]);
-    __gmpz_init_set_si(__e_acsl_4,(long)T2[1]);
-    __e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__e_acsl_3),
-                             (__mpz_struct const *)(__e_acsl_4));
-    __e_acsl_assert(__e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__3;
+    mpz_t __gen_e_acsl__4;
+    int __gen_e_acsl_ne;
+    __gmpz_init_set_si(__gen_e_acsl__3,(long)T1[1]);
+    __gmpz_init_set_si(__gen_e_acsl__4,(long)T2[1]);
+    __gen_e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__3),
+                                 (__mpz_struct const *)(__gen_e_acsl__4));
+    __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
                     (char *)"T1[1] != T2[1]",14);
-    __gmpz_clear(__e_acsl_3);
-    __gmpz_clear(__e_acsl_4);
+    __gmpz_clear(__gen_e_acsl__3);
+    __gmpz_clear(__gen_e_acsl__4);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_at.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_at.c
index 32a3edd81ccc395dde770a2e3701a06da567c572..79cc76ee82b8020d2521410da4baff6c054e406a 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_at.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_at.c
@@ -3,177 +3,179 @@ int A = 0;
 /*@ ensures \at(A,Post) ≡ 3; */
 void f(void)
 {
-  int __e_acsl_at_4;
-  int __e_acsl_at_3;
-  int __e_acsl_at_2;
-  int __e_acsl_at;
-  __e_acsl_at_3 = A;
-  __e_acsl_at = A;
+  int __gen_e_acsl_at_4;
+  int __gen_e_acsl_at_3;
+  int __gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
+  __gen_e_acsl_at_3 = A;
+  __gen_e_acsl_at = A;
   A = 1;
-  F: __e_acsl_at_4 = __e_acsl_at_3;
-     __e_acsl_at_2 = A;
+  F: __gen_e_acsl_at_4 = __gen_e_acsl_at_3;
+     __gen_e_acsl_at_2 = A;
      A = 2;
   /*@ assert \at(A,Pre) ≡ 0; */
-  __e_acsl_assert(__e_acsl_at == 0,(char *)"Assertion",(char *)"f",
+  __e_acsl_assert(__gen_e_acsl_at == 0,(char *)"Assertion",(char *)"f",
                   (char *)"\\at(A,Pre) == 0",11);
   /*@ assert \at(A,F) ≡ 1; */
-  __e_acsl_assert(__e_acsl_at_2 == 1,(char *)"Assertion",(char *)"f",
+  __e_acsl_assert(__gen_e_acsl_at_2 == 1,(char *)"Assertion",(char *)"f",
                   (char *)"\\at(A,F) == 1",12);
   /*@ assert \at(A,Here) ≡ 2; */
   __e_acsl_assert(A == 2,(char *)"Assertion",(char *)"f",
                   (char *)"\\at(A,Here) == 2",13);
   /*@ assert \at(\at(A,Pre),F) ≡ 0; */
-  __e_acsl_assert(__e_acsl_at_4 == 0,(char *)"Assertion",(char *)"f",
+  __e_acsl_assert(__gen_e_acsl_at_4 == 0,(char *)"Assertion",(char *)"f",
                   (char *)"\\at(\\at(A,Pre),F) == 0",14);
   A = 3;
   return;
 }
 
 /*@ ensures \at(A,Post) ≡ 3; */
-void __e_acsl_f(void)
+void __gen_e_acsl_f(void)
 {
-  int __e_acsl_at;
+  int __gen_e_acsl_at;
   f();
-  __e_acsl_at = A;
-  __e_acsl_assert(__e_acsl_at == 3,(char *)"Postcondition",(char *)"f",
+  __gen_e_acsl_at = A;
+  __e_acsl_assert(__gen_e_acsl_at == 3,(char *)"Postcondition",(char *)"f",
                   (char *)"\\at(A,Post) == 3",7);
   return;
 }
 
 void g(int *p, int *q)
 {
-  int __e_acsl_at_3;
-  int __e_acsl_at_2;
-  int __e_acsl_at;
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& q),8UL);
-  __initialize((void *)p,sizeof(int));
+  int __gen_e_acsl_at_3;
+  int __gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_initialize((void *)p,sizeof(int));
   *p = 0;
-  __initialize((void *)(p + 1),sizeof(int));
+  __e_acsl_initialize((void *)(p + 1),sizeof(int));
   *(p + 1) = 1;
-  __initialize((void *)q,sizeof(int));
+  __e_acsl_initialize((void *)q,sizeof(int));
   *q = 0;
   L1:
     {
-      int __e_acsl_valid_read_3;
-      __e_acsl_valid_read_3 = __valid_read((void *)q,sizeof(int));
-      __e_acsl_assert(__e_acsl_valid_read_3,(char *)"RTE",(char *)"g",
+      int __gen_e_acsl_valid_read_3;
+      __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)q,sizeof(int));
+      __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"RTE",(char *)"g",
                       (char *)"mem_access: \\valid_read(q)",32);
-      __store_block((void *)(& __e_acsl_at_3),4UL);
-      __e_acsl_at_3 = *q;
+      __e_acsl_store_block((void *)(& __gen_e_acsl_at_3),4UL);
+      __gen_e_acsl_at_3 = *q;
     }
     {
-      int __e_acsl_valid_read;
-      __e_acsl_valid_read = __valid_read((void *)q,sizeof(int));
-      __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"g",
+      int __gen_e_acsl_valid_read;
+      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)q,sizeof(int));
+      __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"g",
                       (char *)"mem_access: \\valid_read(q)",30);
-      __store_block((void *)(& __e_acsl_at),4UL);
-      __e_acsl_at = *q;
+      __e_acsl_store_block((void *)(& __gen_e_acsl_at),4UL);
+      __gen_e_acsl_at = *q;
     }
-    __initialize((void *)p,sizeof(int));
+    __e_acsl_initialize((void *)p,sizeof(int));
   *p = 2;
-  __initialize((void *)(p + 1),sizeof(int));
+  __e_acsl_initialize((void *)(p + 1),sizeof(int));
   *(p + 1) = 3;
-  __initialize((void *)q,sizeof(int));
+  __e_acsl_initialize((void *)q,sizeof(int));
   *q = 1;
   L2:
     {
-      int __e_acsl_valid_read_2;
-      __e_acsl_valid_read_2 = __valid_read((void *)(p + __e_acsl_at),
-                                           sizeof(int));
-      __e_acsl_assert(__e_acsl_valid_read_2,(char *)"RTE",(char *)"g",
-                      (char *)"mem_access: \\valid_read(p+__e_acsl_at)",30);
-      __store_block((void *)(& __e_acsl_at_2),4UL);
-      __e_acsl_at_2 = *(p + __e_acsl_at);
+      int __gen_e_acsl_valid_read_2;
+      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(p + __gen_e_acsl_at),
+                                                      sizeof(int));
+      __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",(char *)"g",
+                      (char *)"mem_access: \\valid_read(p+__gen_e_acsl_at)",
+                      30);
+      __e_acsl_store_block((void *)(& __gen_e_acsl_at_2),4UL);
+      __gen_e_acsl_at_2 = *(p + __gen_e_acsl_at);
     }
     A = 4;
   /*@ assert \at(*(p+\at(*q,L1)),L2) ≡ 2; */
-  __e_acsl_assert(__e_acsl_at_2 == 2,(char *)"Assertion",(char *)"g",
+  __e_acsl_assert(__gen_e_acsl_at_2 == 2,(char *)"Assertion",(char *)"g",
                   (char *)"\\at(*(p+\\at(*q,L1)),L2) == 2",30);
   L3:
     /*@ assert \at(*(p+\at(*q,L1)),Here) ≡ 2; */
     {
-      int __e_acsl_valid_read_4;
-      __e_acsl_valid_read_4 = __valid_read((void *)(p + __e_acsl_at_3),
-                                           sizeof(int));
-      __e_acsl_assert(__e_acsl_valid_read_4,(char *)"RTE",(char *)"g",
-                      (char *)"mem_access: \\valid_read(p+__e_acsl_at_3)",32);
-      __e_acsl_assert(*(p + __e_acsl_at_3) == 2,(char *)"Assertion",
+      int __gen_e_acsl_valid_read_4;
+      __gen_e_acsl_valid_read_4 = __e_acsl_valid_read((void *)(p + __gen_e_acsl_at_3),
+                                                      sizeof(int));
+      __e_acsl_assert(__gen_e_acsl_valid_read_4,(char *)"RTE",(char *)"g",
+                      (char *)"mem_access: \\valid_read(p+__gen_e_acsl_at_3)",
+                      32);
+      __e_acsl_assert(*(p + __gen_e_acsl_at_3) == 2,(char *)"Assertion",
                       (char *)"g",(char *)"\\at(*(p+\\at(*q,L1)),Here) == 2",
                       32);
     }
-    __delete_block((void *)(& p));
-    __delete_block((void *)(& q));
+    __e_acsl_delete_block((void *)(& p));
+    __e_acsl_delete_block((void *)(& q));
     return;
 }
 
 /*@ ensures \result ≡ \old(x); */
 int h(int x)
 {
-  __store_block((void *)(& x),4UL);
-  __delete_block((void *)(& x));
+  __e_acsl_store_block((void *)(& x),4UL);
+  __e_acsl_delete_block((void *)(& x));
   return x;
 }
 
 /*@ ensures \result ≡ \old(x); */
-int __e_acsl_h(int x)
+int __gen_e_acsl_h(int x)
 {
-  int __e_acsl_at;
+  int __gen_e_acsl_at;
   int __retres;
-  __store_block((void *)(& __retres),4UL);
-  __store_block((void *)(& x),4UL);
-  __store_block((void *)(& __e_acsl_at),4UL);
-  __e_acsl_at = x;
+  __e_acsl_store_block((void *)(& __retres),4UL);
+  __e_acsl_store_block((void *)(& x),4UL);
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at),4UL);
+  __gen_e_acsl_at = x;
   __retres = h(x);
-  __e_acsl_assert(__retres == __e_acsl_at,(char *)"Postcondition",
+  __e_acsl_assert(__retres == __gen_e_acsl_at,(char *)"Postcondition",
                   (char *)"h",(char *)"\\result == \\old(x)",38);
-  __delete_block((void *)(& x));
-  __delete_block((void *)(& __retres));
+  __e_acsl_delete_block((void *)(& x));
+  __e_acsl_delete_block((void *)(& __retres));
   return __retres;
 }
 
 int main(void)
 {
-  int __e_acsl_at_3;
-  long __e_acsl_at_2;
-  int __e_acsl_at;
+  int __gen_e_acsl_at_3;
+  long __gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
   int __retres;
   int x;
   int t[2];
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(t),8UL);
-  __store_block((void *)(& x),4UL);
-  __full_init((void *)(& x));
-  x = __e_acsl_h(0);
+  __e_acsl_store_block((void *)(t),8UL);
+  __e_acsl_store_block((void *)(& x),4UL);
+  __e_acsl_full_init((void *)(& x));
+  x = __gen_e_acsl_h(0);
   L:
-    __store_block((void *)(& __e_acsl_at_3),4UL);
-    __e_acsl_at_3 = x;
-    __store_block((void *)(& __e_acsl_at_2),8UL);
-    __e_acsl_at_2 = (long)x + (long)1;
-    __store_block((void *)(& __e_acsl_at),4UL);
-    __e_acsl_at = x;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at_3),4UL);
+    __gen_e_acsl_at_3 = x;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at_2),8UL);
+    __gen_e_acsl_at_2 = (long)x + (long)1;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at),4UL);
+    __gen_e_acsl_at = x;
     /*@ assert x ≡ 0; */
     __e_acsl_assert(x == 0,(char *)"Assertion",(char *)"main",
                     (char *)"x == 0",46);
-    __full_init((void *)(& x));
+    __e_acsl_full_init((void *)(& x));
     x = 1;
-  __full_init((void *)(& x));
+  __e_acsl_full_init((void *)(& x));
   x = 2;
-  __e_acsl_f();
+  __gen_e_acsl_f();
   /*@ assert \at(x,L) ≡ 0; */
-  __e_acsl_assert(__e_acsl_at == 0,(char *)"Assertion",(char *)"main",
+  __e_acsl_assert(__gen_e_acsl_at == 0,(char *)"Assertion",(char *)"main",
                   (char *)"\\at(x,L) == 0",51);
   /*@ assert \at(x+1,L) ≡ 1; */
-  __e_acsl_assert(__e_acsl_at_2 == (long)1,(char *)"Assertion",
+  __e_acsl_assert(__gen_e_acsl_at_2 == (long)1,(char *)"Assertion",
                   (char *)"main",(char *)"\\at(x+1,L) == 1",52);
   /*@ assert \at(x,L)+1 ≡ 1; */
-  __e_acsl_assert((long)__e_acsl_at_3 + (long)1 == (long)1,
+  __e_acsl_assert((long)__gen_e_acsl_at_3 + (long)1 == (long)1,
                   (char *)"Assertion",(char *)"main",
                   (char *)"\\at(x,L)+1 == 1",53);
   g(t,& x);
   __retres = 0;
-  __delete_block((void *)(t));
-  __delete_block((void *)(& x));
+  __e_acsl_delete_block((void *)(t));
+  __e_acsl_delete_block((void *)(& x));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_at2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_at2.c
index 4ed21e95ef35f04002c3fdf34f2485ae4a2b9270..1f55d180a68b8c69dfc58ae4f75f64434eb2bf03 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_at2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_at2.c
@@ -3,316 +3,318 @@ int A = 0;
 /*@ ensures \at(A,Post) ≡ 3; */
 void f(void)
 {
-  int __e_acsl_at_4;
-  int __e_acsl_at_3;
-  int __e_acsl_at_2;
-  int __e_acsl_at;
-  __e_acsl_at_3 = A;
-  __e_acsl_at = A;
+  int __gen_e_acsl_at_4;
+  int __gen_e_acsl_at_3;
+  int __gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
+  __gen_e_acsl_at_3 = A;
+  __gen_e_acsl_at = A;
   A = 1;
-  F: __e_acsl_at_4 = __e_acsl_at_3;
-     __e_acsl_at_2 = A;
+  F: __gen_e_acsl_at_4 = __gen_e_acsl_at_3;
+     __gen_e_acsl_at_2 = A;
      A = 2;
   /*@ assert \at(A,Pre) ≡ 0; */
   {
-    mpz_t __e_acsl;
-    mpz_t __e_acsl_2;
-    int __e_acsl_eq;
-    __gmpz_init_set_si(__e_acsl,(long)__e_acsl_at);
-    __gmpz_init_set_si(__e_acsl_2,(long)0);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl),
-                             (__mpz_struct const *)(__e_acsl_2));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"f",
+    mpz_t __gen_e_acsl_;
+    mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_,(long)__gen_e_acsl_at);
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)0);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_),
+                                 (__mpz_struct const *)(__gen_e_acsl__2));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"f",
                     (char *)"\\at(A,Pre) == 0",11);
-    __gmpz_clear(__e_acsl);
-    __gmpz_clear(__e_acsl_2);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl__2);
   }
   /*@ assert \at(A,F) ≡ 1; */
   {
-    mpz_t __e_acsl_3;
-    mpz_t __e_acsl_4;
-    int __e_acsl_eq_2;
-    __gmpz_init_set_si(__e_acsl_3,(long)__e_acsl_at_2);
-    __gmpz_init_set_si(__e_acsl_4,(long)1);
-    __e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_3),
-                               (__mpz_struct const *)(__e_acsl_4));
-    __e_acsl_assert(__e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"f",
+    mpz_t __gen_e_acsl__3;
+    mpz_t __gen_e_acsl__4;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_si(__gen_e_acsl__3,(long)__gen_e_acsl_at_2);
+    __gmpz_init_set_si(__gen_e_acsl__4,(long)1);
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__3),
+                                   (__mpz_struct const *)(__gen_e_acsl__4));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"f",
                     (char *)"\\at(A,F) == 1",12);
-    __gmpz_clear(__e_acsl_3);
-    __gmpz_clear(__e_acsl_4);
+    __gmpz_clear(__gen_e_acsl__3);
+    __gmpz_clear(__gen_e_acsl__4);
   }
   /*@ assert \at(A,Here) ≡ 2; */
   {
-    mpz_t __e_acsl_5;
-    mpz_t __e_acsl_6;
-    int __e_acsl_eq_3;
-    __gmpz_init_set_si(__e_acsl_5,(long)A);
-    __gmpz_init_set_si(__e_acsl_6,(long)2);
-    __e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_5),
-                               (__mpz_struct const *)(__e_acsl_6));
-    __e_acsl_assert(__e_acsl_eq_3 == 0,(char *)"Assertion",(char *)"f",
+    mpz_t __gen_e_acsl__5;
+    mpz_t __gen_e_acsl__6;
+    int __gen_e_acsl_eq_3;
+    __gmpz_init_set_si(__gen_e_acsl__5,(long)A);
+    __gmpz_init_set_si(__gen_e_acsl__6,(long)2);
+    __gen_e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__5),
+                                   (__mpz_struct const *)(__gen_e_acsl__6));
+    __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",(char *)"f",
                     (char *)"\\at(A,Here) == 2",13);
-    __gmpz_clear(__e_acsl_5);
-    __gmpz_clear(__e_acsl_6);
+    __gmpz_clear(__gen_e_acsl__5);
+    __gmpz_clear(__gen_e_acsl__6);
   }
   /*@ assert \at(\at(A,Pre),F) ≡ 0; */
   {
-    mpz_t __e_acsl_7;
-    mpz_t __e_acsl_8;
-    int __e_acsl_eq_4;
-    __gmpz_init_set_si(__e_acsl_7,(long)__e_acsl_at_4);
-    __gmpz_init_set_si(__e_acsl_8,(long)0);
-    __e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_7),
-                               (__mpz_struct const *)(__e_acsl_8));
-    __e_acsl_assert(__e_acsl_eq_4 == 0,(char *)"Assertion",(char *)"f",
+    mpz_t __gen_e_acsl__7;
+    mpz_t __gen_e_acsl__8;
+    int __gen_e_acsl_eq_4;
+    __gmpz_init_set_si(__gen_e_acsl__7,(long)__gen_e_acsl_at_4);
+    __gmpz_init_set_si(__gen_e_acsl__8,(long)0);
+    __gen_e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__7),
+                                   (__mpz_struct const *)(__gen_e_acsl__8));
+    __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",(char *)"f",
                     (char *)"\\at(\\at(A,Pre),F) == 0",14);
-    __gmpz_clear(__e_acsl_7);
-    __gmpz_clear(__e_acsl_8);
+    __gmpz_clear(__gen_e_acsl__7);
+    __gmpz_clear(__gen_e_acsl__8);
   }
   A = 3;
   return;
 }
 
 /*@ ensures \at(A,Post) ≡ 3; */
-void __e_acsl_f(void)
+void __gen_e_acsl_f(void)
 {
-  int __e_acsl_at;
+  int __gen_e_acsl_at;
   f();
   {
-    mpz_t __e_acsl;
-    mpz_t __e_acsl_2;
-    int __e_acsl_eq;
-    __e_acsl_at = A;
-    __gmpz_init_set_si(__e_acsl,(long)__e_acsl_at);
-    __gmpz_init_set_si(__e_acsl_2,(long)3);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl),
-                             (__mpz_struct const *)(__e_acsl_2));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Postcondition",(char *)"f",
+    mpz_t __gen_e_acsl_;
+    mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_eq;
+    __gen_e_acsl_at = A;
+    __gmpz_init_set_si(__gen_e_acsl_,(long)__gen_e_acsl_at);
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)3);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_),
+                                 (__mpz_struct const *)(__gen_e_acsl__2));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Postcondition",(char *)"f",
                     (char *)"\\at(A,Post) == 3",7);
-    __gmpz_clear(__e_acsl);
-    __gmpz_clear(__e_acsl_2);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl__2);
     return;
   }
 }
 
 void g(int *p, int *q)
 {
-  int __e_acsl_at_3;
-  int __e_acsl_at_2;
-  int __e_acsl_at;
-  __store_block((void *)(& p),8UL);
-  __store_block((void *)(& q),8UL);
-  __initialize((void *)p,sizeof(int));
+  int __gen_e_acsl_at_3;
+  int __gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_initialize((void *)p,sizeof(int));
   *p = 0;
-  __initialize((void *)(p + 1),sizeof(int));
+  __e_acsl_initialize((void *)(p + 1),sizeof(int));
   *(p + 1) = 1;
-  __initialize((void *)q,sizeof(int));
+  __e_acsl_initialize((void *)q,sizeof(int));
   *q = 0;
   L1:
     {
-      int __e_acsl_valid_read_3;
-      __e_acsl_valid_read_3 = __valid_read((void *)q,sizeof(int));
-      __e_acsl_assert(__e_acsl_valid_read_3,(char *)"RTE",(char *)"g",
+      int __gen_e_acsl_valid_read_3;
+      __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)q,sizeof(int));
+      __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"RTE",(char *)"g",
                       (char *)"mem_access: \\valid_read(q)",32);
-      __store_block((void *)(& __e_acsl_at_3),4UL);
-      __e_acsl_at_3 = *q;
+      __e_acsl_store_block((void *)(& __gen_e_acsl_at_3),4UL);
+      __gen_e_acsl_at_3 = *q;
     }
     {
-      int __e_acsl_valid_read;
-      __e_acsl_valid_read = __valid_read((void *)q,sizeof(int));
-      __e_acsl_assert(__e_acsl_valid_read,(char *)"RTE",(char *)"g",
+      int __gen_e_acsl_valid_read;
+      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)q,sizeof(int));
+      __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"g",
                       (char *)"mem_access: \\valid_read(q)",30);
-      __store_block((void *)(& __e_acsl_at),4UL);
-      __e_acsl_at = *q;
+      __e_acsl_store_block((void *)(& __gen_e_acsl_at),4UL);
+      __gen_e_acsl_at = *q;
     }
-    __initialize((void *)p,sizeof(int));
+    __e_acsl_initialize((void *)p,sizeof(int));
   *p = 2;
-  __initialize((void *)(p + 1),sizeof(int));
+  __e_acsl_initialize((void *)(p + 1),sizeof(int));
   *(p + 1) = 3;
-  __initialize((void *)q,sizeof(int));
+  __e_acsl_initialize((void *)q,sizeof(int));
   *q = 1;
   L2:
     {
-      int __e_acsl_valid_read_2;
-      __e_acsl_valid_read_2 = __valid_read((void *)(p + (long)__e_acsl_at),
-                                           sizeof(int));
-      __e_acsl_assert(__e_acsl_valid_read_2,(char *)"RTE",(char *)"g",
-                      (char *)"mem_access: \\valid_read(p+(long)__e_acsl_at)",
+      int __gen_e_acsl_valid_read_2;
+      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(p + (long)__gen_e_acsl_at),
+                                                      sizeof(int));
+      __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",(char *)"g",
+                      (char *)"mem_access: \\valid_read(p+(long)__gen_e_acsl_at)",
                       30);
-      __store_block((void *)(& __e_acsl_at_2),4UL);
-      __e_acsl_at_2 = *(p + (long)__e_acsl_at);
+      __e_acsl_store_block((void *)(& __gen_e_acsl_at_2),4UL);
+      __gen_e_acsl_at_2 = *(p + (long)__gen_e_acsl_at);
     }
     A = 4;
   /*@ assert \at(*(p+\at(*q,L1)),L2) ≡ 2; */
   {
-    mpz_t __e_acsl;
-    mpz_t __e_acsl_2;
-    int __e_acsl_eq;
-    __gmpz_init_set_si(__e_acsl,(long)__e_acsl_at_2);
-    __gmpz_init_set_si(__e_acsl_2,(long)2);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl),
-                             (__mpz_struct const *)(__e_acsl_2));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"g",
+    mpz_t __gen_e_acsl_;
+    mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_,(long)__gen_e_acsl_at_2);
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)2);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_),
+                                 (__mpz_struct const *)(__gen_e_acsl__2));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"g",
                     (char *)"\\at(*(p+\\at(*q,L1)),L2) == 2",30);
-    __gmpz_clear(__e_acsl);
-    __gmpz_clear(__e_acsl_2);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl__2);
   }
   L3:
     /*@ assert \at(*(p+\at(*q,L1)),Here) ≡ 2; */
     {
-      mpz_t __e_acsl_3;
-      mpz_t __e_acsl_4;
-      int __e_acsl_eq_2;
-      __gmpz_init_set_si(__e_acsl_3,(long)*(p + (long)__e_acsl_at_3));
-      __gmpz_init_set_si(__e_acsl_4,(long)2);
-      __e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_3),
-                                 (__mpz_struct const *)(__e_acsl_4));
-      __e_acsl_assert(__e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"g",
+      mpz_t __gen_e_acsl__3;
+      mpz_t __gen_e_acsl__4;
+      int __gen_e_acsl_eq_2;
+      __gmpz_init_set_si(__gen_e_acsl__3,
+                         (long)*(p + (long)__gen_e_acsl_at_3));
+      __gmpz_init_set_si(__gen_e_acsl__4,(long)2);
+      __gen_e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__3),
+                                     (__mpz_struct const *)(__gen_e_acsl__4));
+      __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"g",
                       (char *)"\\at(*(p+\\at(*q,L1)),Here) == 2",32);
-      __gmpz_clear(__e_acsl_3);
-      __gmpz_clear(__e_acsl_4);
+      __gmpz_clear(__gen_e_acsl__3);
+      __gmpz_clear(__gen_e_acsl__4);
     }
-    __delete_block((void *)(& p));
-    __delete_block((void *)(& q));
+    __e_acsl_delete_block((void *)(& p));
+    __e_acsl_delete_block((void *)(& q));
     return;
 }
 
 /*@ ensures \result ≡ \old(x); */
 int h(int x)
 {
-  __store_block((void *)(& x),4UL);
-  __delete_block((void *)(& x));
+  __e_acsl_store_block((void *)(& x),4UL);
+  __e_acsl_delete_block((void *)(& x));
   return x;
 }
 
 /*@ ensures \result ≡ \old(x); */
-int __e_acsl_h(int x)
+int __gen_e_acsl_h(int x)
 {
-  int __e_acsl_at;
+  int __gen_e_acsl_at;
   int __retres;
-  __store_block((void *)(& __retres),4UL);
-  __store_block((void *)(& x),4UL);
-  __store_block((void *)(& __e_acsl_at),4UL);
-  __e_acsl_at = x;
+  __e_acsl_store_block((void *)(& __retres),4UL);
+  __e_acsl_store_block((void *)(& x),4UL);
+  __e_acsl_store_block((void *)(& __gen_e_acsl_at),4UL);
+  __gen_e_acsl_at = x;
   __retres = h(x);
   {
-    mpz_t __e_acsl_result;
-    mpz_t __e_acsl;
-    int __e_acsl_eq;
-    __gmpz_init_set_si(__e_acsl_result,(long)__retres);
-    __gmpz_init_set_si(__e_acsl,(long)__e_acsl_at);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_result),
-                             (__mpz_struct const *)(__e_acsl));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Postcondition",(char *)"h",
+    mpz_t __gen_e_acsl_result;
+    mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_result,(long)__retres);
+    __gmpz_init_set_si(__gen_e_acsl_,(long)__gen_e_acsl_at);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_result),
+                                 (__mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Postcondition",(char *)"h",
                     (char *)"\\result == \\old(x)",38);
-    __delete_block((void *)(& x));
-    __gmpz_clear(__e_acsl_result);
-    __gmpz_clear(__e_acsl);
-    __delete_block((void *)(& __retres));
+    __e_acsl_delete_block((void *)(& x));
+    __gmpz_clear(__gen_e_acsl_result);
+    __gmpz_clear(__gen_e_acsl_);
+    __e_acsl_delete_block((void *)(& __retres));
     return __retres;
   }
 }
 
 int main(void)
 {
-  int __e_acsl_at_3;
-  mpz_t __e_acsl_at_2;
-  int __e_acsl_at;
+  int __gen_e_acsl_at_3;
+  mpz_t __gen_e_acsl_at_2;
+  int __gen_e_acsl_at;
   int __retres;
   int x;
   int t[2];
   __e_acsl_memory_init((int *)0,(char ***)0,8UL);
-  __store_block((void *)(t),8UL);
-  __store_block((void *)(& x),4UL);
-  __full_init((void *)(& x));
-  x = __e_acsl_h(0);
+  __e_acsl_store_block((void *)(t),8UL);
+  __e_acsl_store_block((void *)(& x),4UL);
+  __e_acsl_full_init((void *)(& x));
+  x = __gen_e_acsl_h(0);
   L:
-    __store_block((void *)(& __e_acsl_at_3),4UL);
-    __e_acsl_at_3 = x;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at_3),4UL);
+    __gen_e_acsl_at_3 = x;
     {
-      mpz_t __e_acsl_x_2;
-      mpz_t __e_acsl_4;
-      mpz_t __e_acsl_add;
-      __gmpz_init_set_si(__e_acsl_x_2,(long)x);
-      __gmpz_init_set_si(__e_acsl_4,(long)1);
-      __gmpz_init(__e_acsl_add);
-      __gmpz_add(__e_acsl_add,(__mpz_struct const *)(__e_acsl_x_2),
-                 (__mpz_struct const *)(__e_acsl_4));
-      __gmpz_init_set(__e_acsl_at_2,(__mpz_struct const *)(__e_acsl_add));
-      __gmpz_clear(__e_acsl_x_2);
-      __gmpz_clear(__e_acsl_4);
-      __gmpz_clear(__e_acsl_add);
+      mpz_t __gen_e_acsl_x_2;
+      mpz_t __gen_e_acsl__4;
+      mpz_t __gen_e_acsl_add;
+      __gmpz_init_set_si(__gen_e_acsl_x_2,(long)x);
+      __gmpz_init_set_si(__gen_e_acsl__4,(long)1);
+      __gmpz_init(__gen_e_acsl_add);
+      __gmpz_add(__gen_e_acsl_add,(__mpz_struct const *)(__gen_e_acsl_x_2),
+                 (__mpz_struct const *)(__gen_e_acsl__4));
+      __gmpz_init_set(__gen_e_acsl_at_2,
+                      (__mpz_struct const *)(__gen_e_acsl_add));
+      __gmpz_clear(__gen_e_acsl_x_2);
+      __gmpz_clear(__gen_e_acsl__4);
+      __gmpz_clear(__gen_e_acsl_add);
     }
-    __store_block((void *)(& __e_acsl_at),4UL);
-    __e_acsl_at = x;
+    __e_acsl_store_block((void *)(& __gen_e_acsl_at),4UL);
+    __gen_e_acsl_at = x;
     /*@ assert x ≡ 0; */
     {
-      mpz_t __e_acsl_x;
-      mpz_t __e_acsl;
-      int __e_acsl_eq;
-      __gmpz_init_set_si(__e_acsl_x,(long)x);
-      __gmpz_init_set_si(__e_acsl,(long)0);
-      __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x),
-                               (__mpz_struct const *)(__e_acsl));
-      __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
-                      (char *)"x == 0",46);
-      __gmpz_clear(__e_acsl_x);
-      __gmpz_clear(__e_acsl);
+      mpz_t __gen_e_acsl_x;
+      mpz_t __gen_e_acsl_;
+      int __gen_e_acsl_eq;
+      __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
+      __gmpz_init_set_si(__gen_e_acsl_,(long)0);
+      __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x),
+                                   (__mpz_struct const *)(__gen_e_acsl_));
+      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",
+                      (char *)"main",(char *)"x == 0",46);
+      __gmpz_clear(__gen_e_acsl_x);
+      __gmpz_clear(__gen_e_acsl_);
     }
-    __full_init((void *)(& x));
+    __e_acsl_full_init((void *)(& x));
     x = 1;
-  __full_init((void *)(& x));
+  __e_acsl_full_init((void *)(& x));
   x = 2;
-  __e_acsl_f();
+  __gen_e_acsl_f();
   /*@ assert \at(x,L) ≡ 0; */
   {
-    mpz_t __e_acsl_2;
-    mpz_t __e_acsl_3;
-    int __e_acsl_eq_2;
-    __gmpz_init_set_si(__e_acsl_2,(long)__e_acsl_at);
-    __gmpz_init_set_si(__e_acsl_3,(long)0);
-    __e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_2),
-                               (__mpz_struct const *)(__e_acsl_3));
-    __e_acsl_assert(__e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\at(x,L) == 0",51);
-    __gmpz_clear(__e_acsl_2);
-    __gmpz_clear(__e_acsl_3);
+    mpz_t __gen_e_acsl__2;
+    mpz_t __gen_e_acsl__3;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)__gen_e_acsl_at);
+    __gmpz_init_set_si(__gen_e_acsl__3,(long)0);
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__2),
+                                   (__mpz_struct const *)(__gen_e_acsl__3));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\at(x,L) == 0",51);
+    __gmpz_clear(__gen_e_acsl__2);
+    __gmpz_clear(__gen_e_acsl__3);
   }
   /*@ assert \at(x+1,L) ≡ 1; */
   {
-    mpz_t __e_acsl_5;
-    int __e_acsl_eq_3;
-    __gmpz_init_set_si(__e_acsl_5,(long)1);
-    __e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_at_2),
-                               (__mpz_struct const *)(__e_acsl_5));
-    __e_acsl_assert(__e_acsl_eq_3 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\at(x+1,L) == 1",52);
-    __gmpz_clear(__e_acsl_5);
+    mpz_t __gen_e_acsl__5;
+    int __gen_e_acsl_eq_3;
+    __gmpz_init_set_si(__gen_e_acsl__5,(long)1);
+    __gen_e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_at_2),
+                                   (__mpz_struct const *)(__gen_e_acsl__5));
+    __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\at(x+1,L) == 1",52);
+    __gmpz_clear(__gen_e_acsl__5);
   }
   /*@ assert \at(x,L)+1 ≡ 1; */
   {
-    mpz_t __e_acsl_6;
-    mpz_t __e_acsl_7;
-    mpz_t __e_acsl_add_2;
-    int __e_acsl_eq_4;
-    __gmpz_init_set_si(__e_acsl_6,(long)__e_acsl_at_3);
-    __gmpz_init_set_si(__e_acsl_7,(long)1);
-    __gmpz_init(__e_acsl_add_2);
-    __gmpz_add(__e_acsl_add_2,(__mpz_struct const *)(__e_acsl_6),
-               (__mpz_struct const *)(__e_acsl_7));
-    __e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_add_2),
-                               (__mpz_struct const *)(__e_acsl_7));
-    __e_acsl_assert(__e_acsl_eq_4 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"\\at(x,L)+1 == 1",53);
-    __gmpz_clear(__e_acsl_6);
-    __gmpz_clear(__e_acsl_7);
-    __gmpz_clear(__e_acsl_add_2);
+    mpz_t __gen_e_acsl__6;
+    mpz_t __gen_e_acsl__7;
+    mpz_t __gen_e_acsl_add_2;
+    int __gen_e_acsl_eq_4;
+    __gmpz_init_set_si(__gen_e_acsl__6,(long)__gen_e_acsl_at_3);
+    __gmpz_init_set_si(__gen_e_acsl__7,(long)1);
+    __gmpz_init(__gen_e_acsl_add_2);
+    __gmpz_add(__gen_e_acsl_add_2,(__mpz_struct const *)(__gen_e_acsl__6),
+               (__mpz_struct const *)(__gen_e_acsl__7));
+    __gen_e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_add_2),
+                                   (__mpz_struct const *)(__gen_e_acsl__7));
+    __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\at(x,L)+1 == 1",53);
+    __gmpz_clear(__gen_e_acsl__6);
+    __gmpz_clear(__gen_e_acsl__7);
+    __gmpz_clear(__gen_e_acsl_add_2);
   }
   g(t,& x);
   __retres = 0;
-  __gmpz_clear(__e_acsl_at_2);
-  __delete_block((void *)(t));
-  __delete_block((void *)(& x));
+  __gmpz_clear(__gen_e_acsl_at_2);
+  __e_acsl_delete_block((void *)(t));
+  __e_acsl_delete_block((void *)(& x));
   __e_acsl_memory_clean();
   return __retres;
 }
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_cast2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_cast2.c
index 80154b7123b6521ae50fe8fb69572798ac5937d7..92717cacb28e8af3d03d18c86b3044af9d6b99bb 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_cast2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_cast2.c
@@ -8,89 +8,91 @@ int main(void)
   y = 0;
   /*@ assert (int)x ≡ y; */
   {
-    mpz_t __e_acsl_cast;
-    mpz_t __e_acsl_y;
-    int __e_acsl_eq;
-    __gmpz_init_set_si(__e_acsl_cast,(long)((int)x));
-    __gmpz_init_set_si(__e_acsl_y,(long)y);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_cast),
-                             (__mpz_struct const *)(__e_acsl_y));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_cast;
+    mpz_t __gen_e_acsl_y;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_cast,(long)((int)x));
+    __gmpz_init_set_si(__gen_e_acsl_y,(long)y);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_cast),
+                                 (__mpz_struct const *)(__gen_e_acsl_y));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"(int)x == y",10);
-    __gmpz_clear(__e_acsl_cast);
-    __gmpz_clear(__e_acsl_y);
+    __gmpz_clear(__gen_e_acsl_cast);
+    __gmpz_clear(__gen_e_acsl_y);
   }
   /*@ assert x ≡ (long)y; */
   {
-    mpz_t __e_acsl_x;
-    mpz_t __e_acsl_cast_2;
-    int __e_acsl_eq_2;
-    __gmpz_init_set_si(__e_acsl_x,x);
-    __gmpz_init_set_si(__e_acsl_cast_2,(long)y);
-    __e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x),
-                               (__mpz_struct const *)(__e_acsl_cast_2));
-    __e_acsl_assert(__e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"x == (long)y",11);
-    __gmpz_clear(__e_acsl_x);
-    __gmpz_clear(__e_acsl_cast_2);
+    mpz_t __gen_e_acsl_x;
+    mpz_t __gen_e_acsl_cast_2;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_si(__gen_e_acsl_x,x);
+    __gmpz_init_set_si(__gen_e_acsl_cast_2,(long)y);
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x),
+                                   (__mpz_struct const *)(__gen_e_acsl_cast_2));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x == (long)y",11);
+    __gmpz_clear(__gen_e_acsl_x);
+    __gmpz_clear(__gen_e_acsl_cast_2);
   }
   /*@ assert y ≡ (int)0; */
   {
-    mpz_t __e_acsl_y_2;
-    mpz_t __e_acsl_cast_3;
-    int __e_acsl_eq_3;
-    __gmpz_init_set_si(__e_acsl_y_2,(long)y);
-    __gmpz_init_set_si(__e_acsl_cast_3,(long)0);
-    __e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_y_2),
-                               (__mpz_struct const *)(__e_acsl_cast_3));
-    __e_acsl_assert(__e_acsl_eq_3 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"y == (int)0",13);
-    __gmpz_clear(__e_acsl_y_2);
-    __gmpz_clear(__e_acsl_cast_3);
+    mpz_t __gen_e_acsl_y_2;
+    mpz_t __gen_e_acsl_cast_3;
+    int __gen_e_acsl_eq_3;
+    __gmpz_init_set_si(__gen_e_acsl_y_2,(long)y);
+    __gmpz_init_set_si(__gen_e_acsl_cast_3,(long)0);
+    __gen_e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_y_2),
+                                   (__mpz_struct const *)(__gen_e_acsl_cast_3));
+    __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"y == (int)0",13);
+    __gmpz_clear(__gen_e_acsl_y_2);
+    __gmpz_clear(__gen_e_acsl_cast_3);
   }
   /*@ assert (unsigned int)y ≡ (unsigned int)0; */
   {
-    mpz_t __e_acsl_cast_4;
-    mpz_t __e_acsl_cast_5;
-    int __e_acsl_eq_4;
-    __gmpz_init_set_ui(__e_acsl_cast_4,(unsigned long)((unsigned int)y));
-    __gmpz_init_set_ui(__e_acsl_cast_5,(unsigned long)((unsigned int)0));
-    __e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_cast_4),
-                               (__mpz_struct const *)(__e_acsl_cast_5));
-    __e_acsl_assert(__e_acsl_eq_4 == 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_cast_4;
+    mpz_t __gen_e_acsl_cast_5;
+    int __gen_e_acsl_eq_4;
+    __gmpz_init_set_ui(__gen_e_acsl_cast_4,(unsigned long)((unsigned int)y));
+    __gmpz_init_set_ui(__gen_e_acsl_cast_5,(unsigned long)((unsigned int)0));
+    __gen_e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_cast_4),
+                                   (__mpz_struct const *)(__gen_e_acsl_cast_5));
+    __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"(unsigned int)y == (unsigned int)0",14);
-    __gmpz_clear(__e_acsl_cast_4);
-    __gmpz_clear(__e_acsl_cast_5);
+    __gmpz_clear(__gen_e_acsl_cast_4);
+    __gmpz_clear(__gen_e_acsl_cast_5);
   }
   /*@ assert y ≢ (int)0xfffffffffffffff; */
   {
-    mpz_t __e_acsl_y_3;
-    mpz_t __e_acsl_cast_6;
-    int __e_acsl_ne;
-    __gmpz_init_set_si(__e_acsl_y_3,(long)y);
-    __gmpz_init_set_si(__e_acsl_cast_6,(long)((int)0xfffffffffffffff));
-    __e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__e_acsl_y_3),
-                             (__mpz_struct const *)(__e_acsl_cast_6));
-    __e_acsl_assert(__e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_y_3;
+    mpz_t __gen_e_acsl_cast_6;
+    int __gen_e_acsl_ne;
+    __gmpz_init_set_si(__gen_e_acsl_y_3,(long)y);
+    __gmpz_init_set_si(__gen_e_acsl_cast_6,(long)((int)0xfffffffffffffff));
+    __gen_e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_y_3),
+                                 (__mpz_struct const *)(__gen_e_acsl_cast_6));
+    __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
                     (char *)"y != (int)0xfffffffffffffff",17);
-    __gmpz_clear(__e_acsl_y_3);
-    __gmpz_clear(__e_acsl_cast_6);
+    __gmpz_clear(__gen_e_acsl_y_3);
+    __gmpz_clear(__gen_e_acsl_cast_6);
   }
   /*@ assert (unsigned int)y ≢ (unsigned int)0xfffffffffffffff; */
   {
-    mpz_t __e_acsl_cast_7;
-    mpz_t __e_acsl_cast_8;
-    int __e_acsl_ne_2;
-    __gmpz_init_set_ui(__e_acsl_cast_7,(unsigned long)((unsigned int)y));
-    __gmpz_init_set_ui(__e_acsl_cast_8,
+    mpz_t __gen_e_acsl_cast_7;
+    mpz_t __gen_e_acsl_cast_8;
+    int __gen_e_acsl_ne_2;
+    __gmpz_init_set_ui(__gen_e_acsl_cast_7,(unsigned long)((unsigned int)y));
+    __gmpz_init_set_ui(__gen_e_acsl_cast_8,
                        (unsigned long)((unsigned int)0xfffffffffffffff));
-    __e_acsl_ne_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_cast_7),
-                               (__mpz_struct const *)(__e_acsl_cast_8));
-    __e_acsl_assert(__e_acsl_ne_2 != 0,(char *)"Assertion",(char *)"main",
+    __gen_e_acsl_ne_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_cast_7),
+                                   (__mpz_struct const *)(__gen_e_acsl_cast_8));
+    __e_acsl_assert(__gen_e_acsl_ne_2 != 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"(unsigned int)y != (unsigned int)0xfffffffffffffff",
                     18);
-    __gmpz_clear(__e_acsl_cast_7);
-    __gmpz_clear(__e_acsl_cast_8);
+    __gmpz_clear(__gen_e_acsl_cast_7);
+    __gmpz_clear(__gen_e_acsl_cast_8);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_comparison2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_comparison2.c
index cdc801066d4fcdd5bb22f30c42b9973d34ad4250..778c9c3e56a0ca588a901e77419b45490ac33f05 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_comparison2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_comparison2.c
@@ -9,59 +9,59 @@ int main(void)
   y = 1;
   /*@ assert x < y; */
   {
-    mpz_t __e_acsl_x;
-    mpz_t __e_acsl_y;
-    int __e_acsl_lt;
-    __gmpz_init_set_si(__e_acsl_x,(long)x);
-    __gmpz_init_set_si(__e_acsl_y,(long)y);
-    __e_acsl_lt = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x),
-                             (__mpz_struct const *)(__e_acsl_y));
-    __e_acsl_assert(__e_acsl_lt < 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_x;
+    mpz_t __gen_e_acsl_y;
+    int __gen_e_acsl_lt;
+    __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl_y,(long)y);
+    __gen_e_acsl_lt = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x),
+                                 (__mpz_struct const *)(__gen_e_acsl_y));
+    __e_acsl_assert(__gen_e_acsl_lt < 0,(char *)"Assertion",(char *)"main",
                     (char *)"x < y",7);
-    __gmpz_clear(__e_acsl_x);
-    __gmpz_clear(__e_acsl_y);
+    __gmpz_clear(__gen_e_acsl_x);
+    __gmpz_clear(__gen_e_acsl_y);
   }
   /*@ assert y > x; */
   {
-    mpz_t __e_acsl_y_2;
-    mpz_t __e_acsl_x_2;
-    int __e_acsl_gt;
-    __gmpz_init_set_si(__e_acsl_y_2,(long)y);
-    __gmpz_init_set_si(__e_acsl_x_2,(long)x);
-    __e_acsl_gt = __gmpz_cmp((__mpz_struct const *)(__e_acsl_y_2),
-                             (__mpz_struct const *)(__e_acsl_x_2));
-    __e_acsl_assert(__e_acsl_gt > 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_y_2;
+    mpz_t __gen_e_acsl_x_2;
+    int __gen_e_acsl_gt;
+    __gmpz_init_set_si(__gen_e_acsl_y_2,(long)y);
+    __gmpz_init_set_si(__gen_e_acsl_x_2,(long)x);
+    __gen_e_acsl_gt = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_y_2),
+                                 (__mpz_struct const *)(__gen_e_acsl_x_2));
+    __e_acsl_assert(__gen_e_acsl_gt > 0,(char *)"Assertion",(char *)"main",
                     (char *)"y > x",8);
-    __gmpz_clear(__e_acsl_y_2);
-    __gmpz_clear(__e_acsl_x_2);
+    __gmpz_clear(__gen_e_acsl_y_2);
+    __gmpz_clear(__gen_e_acsl_x_2);
   }
   /*@ assert x ≤ 0; */
   {
-    mpz_t __e_acsl_x_3;
-    mpz_t __e_acsl;
-    int __e_acsl_le;
-    __gmpz_init_set_si(__e_acsl_x_3,(long)x);
-    __gmpz_init_set_si(__e_acsl,(long)0);
-    __e_acsl_le = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_3),
-                             (__mpz_struct const *)(__e_acsl));
-    __e_acsl_assert(__e_acsl_le <= 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_x_3;
+    mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_le;
+    __gmpz_init_set_si(__gen_e_acsl_x_3,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl_,(long)0);
+    __gen_e_acsl_le = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_3),
+                                 (__mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_le <= 0,(char *)"Assertion",(char *)"main",
                     (char *)"x <= 0",9);
-    __gmpz_clear(__e_acsl_x_3);
-    __gmpz_clear(__e_acsl);
+    __gmpz_clear(__gen_e_acsl_x_3);
+    __gmpz_clear(__gen_e_acsl_);
   }
   /*@ assert y ≥ 1; */
   {
-    mpz_t __e_acsl_y_3;
-    mpz_t __e_acsl_2;
-    int __e_acsl_ge;
-    __gmpz_init_set_si(__e_acsl_y_3,(long)y);
-    __gmpz_init_set_si(__e_acsl_2,(long)1);
-    __e_acsl_ge = __gmpz_cmp((__mpz_struct const *)(__e_acsl_y_3),
-                             (__mpz_struct const *)(__e_acsl_2));
-    __e_acsl_assert(__e_acsl_ge >= 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_y_3;
+    mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_ge;
+    __gmpz_init_set_si(__gen_e_acsl_y_3,(long)y);
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)1);
+    __gen_e_acsl_ge = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_y_3),
+                                 (__mpz_struct const *)(__gen_e_acsl__2));
+    __e_acsl_assert(__gen_e_acsl_ge >= 0,(char *)"Assertion",(char *)"main",
                     (char *)"y >= 1",10);
-    __gmpz_clear(__e_acsl_y_3);
-    __gmpz_clear(__e_acsl_2);
+    __gmpz_clear(__gen_e_acsl_y_3);
+    __gmpz_clear(__gen_e_acsl__2);
   }
   s = (char *)"toto";
   /*@ assert s ≡ s; */
@@ -69,189 +69,189 @@ int main(void)
                   12);
   /*@ assert 5 < 18; */
   {
-    mpz_t __e_acsl_3;
-    mpz_t __e_acsl_4;
-    int __e_acsl_lt_2;
-    __gmpz_init_set_si(__e_acsl_3,(long)5);
-    __gmpz_init_set_si(__e_acsl_4,(long)18);
-    __e_acsl_lt_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_3),
-                               (__mpz_struct const *)(__e_acsl_4));
-    __e_acsl_assert(__e_acsl_lt_2 < 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__3;
+    mpz_t __gen_e_acsl__4;
+    int __gen_e_acsl_lt_2;
+    __gmpz_init_set_si(__gen_e_acsl__3,(long)5);
+    __gmpz_init_set_si(__gen_e_acsl__4,(long)18);
+    __gen_e_acsl_lt_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__3),
+                                   (__mpz_struct const *)(__gen_e_acsl__4));
+    __e_acsl_assert(__gen_e_acsl_lt_2 < 0,(char *)"Assertion",(char *)"main",
                     (char *)"5 < 18",15);
-    __gmpz_clear(__e_acsl_3);
-    __gmpz_clear(__e_acsl_4);
+    __gmpz_clear(__gen_e_acsl__3);
+    __gmpz_clear(__gen_e_acsl__4);
   }
   /*@ assert 32 > 3; */
   {
-    mpz_t __e_acsl_5;
-    mpz_t __e_acsl_6;
-    int __e_acsl_gt_2;
-    __gmpz_init_set_si(__e_acsl_5,(long)32);
-    __gmpz_init_set_si(__e_acsl_6,(long)3);
-    __e_acsl_gt_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_5),
-                               (__mpz_struct const *)(__e_acsl_6));
-    __e_acsl_assert(__e_acsl_gt_2 > 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__5;
+    mpz_t __gen_e_acsl__6;
+    int __gen_e_acsl_gt_2;
+    __gmpz_init_set_si(__gen_e_acsl__5,(long)32);
+    __gmpz_init_set_si(__gen_e_acsl__6,(long)3);
+    __gen_e_acsl_gt_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__5),
+                                   (__mpz_struct const *)(__gen_e_acsl__6));
+    __e_acsl_assert(__gen_e_acsl_gt_2 > 0,(char *)"Assertion",(char *)"main",
                     (char *)"32 > 3",16);
-    __gmpz_clear(__e_acsl_5);
-    __gmpz_clear(__e_acsl_6);
+    __gmpz_clear(__gen_e_acsl__5);
+    __gmpz_clear(__gen_e_acsl__6);
   }
   /*@ assert 12 ≤ 13; */
   {
-    mpz_t __e_acsl_7;
-    mpz_t __e_acsl_8;
-    int __e_acsl_le_2;
-    __gmpz_init_set_si(__e_acsl_7,(long)12);
-    __gmpz_init_set_si(__e_acsl_8,(long)13);
-    __e_acsl_le_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_7),
-                               (__mpz_struct const *)(__e_acsl_8));
-    __e_acsl_assert(__e_acsl_le_2 <= 0,(char *)"Assertion",(char *)"main",
-                    (char *)"12 <= 13",17);
-    __gmpz_clear(__e_acsl_7);
-    __gmpz_clear(__e_acsl_8);
+    mpz_t __gen_e_acsl__7;
+    mpz_t __gen_e_acsl__8;
+    int __gen_e_acsl_le_2;
+    __gmpz_init_set_si(__gen_e_acsl__7,(long)12);
+    __gmpz_init_set_si(__gen_e_acsl__8,(long)13);
+    __gen_e_acsl_le_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__7),
+                                   (__mpz_struct const *)(__gen_e_acsl__8));
+    __e_acsl_assert(__gen_e_acsl_le_2 <= 0,(char *)"Assertion",
+                    (char *)"main",(char *)"12 <= 13",17);
+    __gmpz_clear(__gen_e_acsl__7);
+    __gmpz_clear(__gen_e_acsl__8);
   }
   /*@ assert 123 ≥ 12; */
   {
-    mpz_t __e_acsl_9;
-    mpz_t __e_acsl_10;
-    int __e_acsl_ge_2;
-    __gmpz_init_set_si(__e_acsl_9,(long)123);
-    __gmpz_init_set_si(__e_acsl_10,(long)12);
-    __e_acsl_ge_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_9),
-                               (__mpz_struct const *)(__e_acsl_10));
-    __e_acsl_assert(__e_acsl_ge_2 >= 0,(char *)"Assertion",(char *)"main",
-                    (char *)"123 >= 12",18);
-    __gmpz_clear(__e_acsl_9);
-    __gmpz_clear(__e_acsl_10);
+    mpz_t __gen_e_acsl__9;
+    mpz_t __gen_e_acsl__10;
+    int __gen_e_acsl_ge_2;
+    __gmpz_init_set_si(__gen_e_acsl__9,(long)123);
+    __gmpz_init_set_si(__gen_e_acsl__10,(long)12);
+    __gen_e_acsl_ge_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__9),
+                                   (__mpz_struct const *)(__gen_e_acsl__10));
+    __e_acsl_assert(__gen_e_acsl_ge_2 >= 0,(char *)"Assertion",
+                    (char *)"main",(char *)"123 >= 12",18);
+    __gmpz_clear(__gen_e_acsl__9);
+    __gmpz_clear(__gen_e_acsl__10);
   }
   /*@ assert 0xff ≡ 0xff; */
   {
-    mpz_t __e_acsl_11;
-    int __e_acsl_eq;
-    __gmpz_init_set_si(__e_acsl_11,(long)0xff);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_11),
-                             (__mpz_struct const *)(__e_acsl_11));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__11;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl__11,(long)0xff);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__11),
+                                 (__mpz_struct const *)(__gen_e_acsl__11));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"0xff == 0xff",19);
-    __gmpz_clear(__e_acsl_11);
+    __gmpz_clear(__gen_e_acsl__11);
   }
   /*@ assert 1 ≢ 2; */
   {
-    mpz_t __e_acsl_12;
-    mpz_t __e_acsl_13;
-    int __e_acsl_ne;
-    __gmpz_init_set_si(__e_acsl_12,(long)1);
-    __gmpz_init_set_si(__e_acsl_13,(long)2);
-    __e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__e_acsl_12),
-                             (__mpz_struct const *)(__e_acsl_13));
-    __e_acsl_assert(__e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__12;
+    mpz_t __gen_e_acsl__13;
+    int __gen_e_acsl_ne;
+    __gmpz_init_set_si(__gen_e_acsl__12,(long)1);
+    __gmpz_init_set_si(__gen_e_acsl__13,(long)2);
+    __gen_e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__12),
+                                 (__mpz_struct const *)(__gen_e_acsl__13));
+    __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
                     (char *)"1 != 2",20);
-    __gmpz_clear(__e_acsl_12);
-    __gmpz_clear(__e_acsl_13);
+    __gmpz_clear(__gen_e_acsl__12);
+    __gmpz_clear(__gen_e_acsl__13);
   }
   /*@ assert -5 < 18; */
   {
-    mpz_t __e_acsl_14;
-    mpz_t __e_acsl_neg;
-    mpz_t __e_acsl_15;
-    int __e_acsl_lt_3;
-    __gmpz_init_set_si(__e_acsl_14,(long)5);
-    __gmpz_init(__e_acsl_neg);
-    __gmpz_neg(__e_acsl_neg,(__mpz_struct const *)(__e_acsl_14));
-    __gmpz_init_set_si(__e_acsl_15,(long)18);
-    __e_acsl_lt_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_neg),
-                               (__mpz_struct const *)(__e_acsl_15));
-    __e_acsl_assert(__e_acsl_lt_3 < 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__14;
+    mpz_t __gen_e_acsl_neg;
+    mpz_t __gen_e_acsl__15;
+    int __gen_e_acsl_lt_3;
+    __gmpz_init_set_si(__gen_e_acsl__14,(long)5);
+    __gmpz_init(__gen_e_acsl_neg);
+    __gmpz_neg(__gen_e_acsl_neg,(__mpz_struct const *)(__gen_e_acsl__14));
+    __gmpz_init_set_si(__gen_e_acsl__15,(long)18);
+    __gen_e_acsl_lt_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_neg),
+                                   (__mpz_struct const *)(__gen_e_acsl__15));
+    __e_acsl_assert(__gen_e_acsl_lt_3 < 0,(char *)"Assertion",(char *)"main",
                     (char *)"-5 < 18",22);
-    __gmpz_clear(__e_acsl_14);
-    __gmpz_clear(__e_acsl_neg);
-    __gmpz_clear(__e_acsl_15);
+    __gmpz_clear(__gen_e_acsl__14);
+    __gmpz_clear(__gen_e_acsl_neg);
+    __gmpz_clear(__gen_e_acsl__15);
   }
   /*@ assert 32 > -3; */
   {
-    mpz_t __e_acsl_16;
-    mpz_t __e_acsl_17;
-    mpz_t __e_acsl_neg_2;
-    int __e_acsl_gt_3;
-    __gmpz_init_set_si(__e_acsl_16,(long)32);
-    __gmpz_init_set_si(__e_acsl_17,(long)3);
-    __gmpz_init(__e_acsl_neg_2);
-    __gmpz_neg(__e_acsl_neg_2,(__mpz_struct const *)(__e_acsl_17));
-    __e_acsl_gt_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_16),
-                               (__mpz_struct const *)(__e_acsl_neg_2));
-    __e_acsl_assert(__e_acsl_gt_3 > 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__16;
+    mpz_t __gen_e_acsl__17;
+    mpz_t __gen_e_acsl_neg_2;
+    int __gen_e_acsl_gt_3;
+    __gmpz_init_set_si(__gen_e_acsl__16,(long)32);
+    __gmpz_init_set_si(__gen_e_acsl__17,(long)3);
+    __gmpz_init(__gen_e_acsl_neg_2);
+    __gmpz_neg(__gen_e_acsl_neg_2,(__mpz_struct const *)(__gen_e_acsl__17));
+    __gen_e_acsl_gt_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__16),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_2));
+    __e_acsl_assert(__gen_e_acsl_gt_3 > 0,(char *)"Assertion",(char *)"main",
                     (char *)"32 > -3",23);
-    __gmpz_clear(__e_acsl_16);
-    __gmpz_clear(__e_acsl_17);
-    __gmpz_clear(__e_acsl_neg_2);
+    __gmpz_clear(__gen_e_acsl__16);
+    __gmpz_clear(__gen_e_acsl__17);
+    __gmpz_clear(__gen_e_acsl_neg_2);
   }
   /*@ assert -12 ≤ 13; */
   {
-    mpz_t __e_acsl_18;
-    mpz_t __e_acsl_neg_3;
-    mpz_t __e_acsl_19;
-    int __e_acsl_le_3;
-    __gmpz_init_set_si(__e_acsl_18,(long)12);
-    __gmpz_init(__e_acsl_neg_3);
-    __gmpz_neg(__e_acsl_neg_3,(__mpz_struct const *)(__e_acsl_18));
-    __gmpz_init_set_si(__e_acsl_19,(long)13);
-    __e_acsl_le_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_neg_3),
-                               (__mpz_struct const *)(__e_acsl_19));
-    __e_acsl_assert(__e_acsl_le_3 <= 0,(char *)"Assertion",(char *)"main",
-                    (char *)"-12 <= 13",24);
-    __gmpz_clear(__e_acsl_18);
-    __gmpz_clear(__e_acsl_neg_3);
-    __gmpz_clear(__e_acsl_19);
+    mpz_t __gen_e_acsl__18;
+    mpz_t __gen_e_acsl_neg_3;
+    mpz_t __gen_e_acsl__19;
+    int __gen_e_acsl_le_3;
+    __gmpz_init_set_si(__gen_e_acsl__18,(long)12);
+    __gmpz_init(__gen_e_acsl_neg_3);
+    __gmpz_neg(__gen_e_acsl_neg_3,(__mpz_struct const *)(__gen_e_acsl__18));
+    __gmpz_init_set_si(__gen_e_acsl__19,(long)13);
+    __gen_e_acsl_le_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_neg_3),
+                                   (__mpz_struct const *)(__gen_e_acsl__19));
+    __e_acsl_assert(__gen_e_acsl_le_3 <= 0,(char *)"Assertion",
+                    (char *)"main",(char *)"-12 <= 13",24);
+    __gmpz_clear(__gen_e_acsl__18);
+    __gmpz_clear(__gen_e_acsl_neg_3);
+    __gmpz_clear(__gen_e_acsl__19);
   }
   /*@ assert 123 ≥ -12; */
   {
-    mpz_t __e_acsl_20;
-    mpz_t __e_acsl_21;
-    mpz_t __e_acsl_neg_4;
-    int __e_acsl_ge_3;
-    __gmpz_init_set_si(__e_acsl_20,(long)123);
-    __gmpz_init_set_si(__e_acsl_21,(long)12);
-    __gmpz_init(__e_acsl_neg_4);
-    __gmpz_neg(__e_acsl_neg_4,(__mpz_struct const *)(__e_acsl_21));
-    __e_acsl_ge_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_20),
-                               (__mpz_struct const *)(__e_acsl_neg_4));
-    __e_acsl_assert(__e_acsl_ge_3 >= 0,(char *)"Assertion",(char *)"main",
-                    (char *)"123 >= -12",25);
-    __gmpz_clear(__e_acsl_20);
-    __gmpz_clear(__e_acsl_21);
-    __gmpz_clear(__e_acsl_neg_4);
+    mpz_t __gen_e_acsl__20;
+    mpz_t __gen_e_acsl__21;
+    mpz_t __gen_e_acsl_neg_4;
+    int __gen_e_acsl_ge_3;
+    __gmpz_init_set_si(__gen_e_acsl__20,(long)123);
+    __gmpz_init_set_si(__gen_e_acsl__21,(long)12);
+    __gmpz_init(__gen_e_acsl_neg_4);
+    __gmpz_neg(__gen_e_acsl_neg_4,(__mpz_struct const *)(__gen_e_acsl__21));
+    __gen_e_acsl_ge_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__20),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_4));
+    __e_acsl_assert(__gen_e_acsl_ge_3 >= 0,(char *)"Assertion",
+                    (char *)"main",(char *)"123 >= -12",25);
+    __gmpz_clear(__gen_e_acsl__20);
+    __gmpz_clear(__gen_e_acsl__21);
+    __gmpz_clear(__gen_e_acsl_neg_4);
   }
   /*@ assert -0xff ≡ -0xff; */
   {
-    mpz_t __e_acsl_22;
-    mpz_t __e_acsl_neg_5;
-    int __e_acsl_eq_2;
-    __gmpz_init_set_si(__e_acsl_22,(long)0xff);
-    __gmpz_init(__e_acsl_neg_5);
-    __gmpz_neg(__e_acsl_neg_5,(__mpz_struct const *)(__e_acsl_22));
-    __e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_neg_5),
-                               (__mpz_struct const *)(__e_acsl_neg_5));
-    __e_acsl_assert(__e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"main",
-                    (char *)"-0xff == -0xff",26);
-    __gmpz_clear(__e_acsl_22);
-    __gmpz_clear(__e_acsl_neg_5);
+    mpz_t __gen_e_acsl__22;
+    mpz_t __gen_e_acsl_neg_5;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_si(__gen_e_acsl__22,(long)0xff);
+    __gmpz_init(__gen_e_acsl_neg_5);
+    __gmpz_neg(__gen_e_acsl_neg_5,(__mpz_struct const *)(__gen_e_acsl__22));
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_neg_5),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_5));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"-0xff == -0xff",26);
+    __gmpz_clear(__gen_e_acsl__22);
+    __gmpz_clear(__gen_e_acsl_neg_5);
   }
   /*@ assert 1 ≢ -2; */
   {
-    mpz_t __e_acsl_23;
-    mpz_t __e_acsl_24;
-    mpz_t __e_acsl_neg_6;
-    int __e_acsl_ne_2;
-    __gmpz_init_set_si(__e_acsl_23,(long)1);
-    __gmpz_init_set_si(__e_acsl_24,(long)2);
-    __gmpz_init(__e_acsl_neg_6);
-    __gmpz_neg(__e_acsl_neg_6,(__mpz_struct const *)(__e_acsl_24));
-    __e_acsl_ne_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_23),
-                               (__mpz_struct const *)(__e_acsl_neg_6));
-    __e_acsl_assert(__e_acsl_ne_2 != 0,(char *)"Assertion",(char *)"main",
-                    (char *)"1 != -2",27);
-    __gmpz_clear(__e_acsl_23);
-    __gmpz_clear(__e_acsl_24);
-    __gmpz_clear(__e_acsl_neg_6);
+    mpz_t __gen_e_acsl__23;
+    mpz_t __gen_e_acsl__24;
+    mpz_t __gen_e_acsl_neg_6;
+    int __gen_e_acsl_ne_2;
+    __gmpz_init_set_si(__gen_e_acsl__23,(long)1);
+    __gmpz_init_set_si(__gen_e_acsl__24,(long)2);
+    __gmpz_init(__gen_e_acsl_neg_6);
+    __gmpz_neg(__gen_e_acsl_neg_6,(__mpz_struct const *)(__gen_e_acsl__24));
+    __gen_e_acsl_ne_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__23),
+                                   (__mpz_struct const *)(__gen_e_acsl_neg_6));
+    __e_acsl_assert(__gen_e_acsl_ne_2 != 0,(char *)"Assertion",
+                    (char *)"main",(char *)"1 != -2",27);
+    __gmpz_clear(__gen_e_acsl__23);
+    __gmpz_clear(__gen_e_acsl__24);
+    __gmpz_clear(__gen_e_acsl_neg_6);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant.c
index 0ef4de0651a91572189d6703fc9d36515e1bb95a..6c4f43d862a81edebb4f9b8f3dc7ff888a39ab88 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant.c
@@ -20,16 +20,16 @@ int main(void)
       0xffffffffffffffffffffffffffffffff;
   */
   {
-    mpz_t __e_acsl;
-    int __e_acsl_eq;
-    __gmpz_init_set_str(__e_acsl,"340282366920938463463374607431768211455",
-                        10);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl),
-                             (__mpz_struct const *)(__e_acsl));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_str(__gen_e_acsl_,
+                        "340282366920938463463374607431768211455",10);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_),
+                                 (__mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"0xffffffffffffffffffffffffffffffff == 0xffffffffffffffffffffffffffffffff",
                     11);
-    __gmpz_clear(__e_acsl);
+    __gmpz_clear(__gen_e_acsl_);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant2.c
index 63573f0eee6c3f2bcc6a78c3afd5d6c5260b5d6b..28047909daab237e0edd0ce71db4539903dddfcc 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant2.c
@@ -5,57 +5,59 @@ int main(void)
   int x;
   /*@ assert 0 ≡ 0; */
   {
-    mpz_t __e_acsl;
-    int __e_acsl_eq;
-    __gmpz_init_set_si(__e_acsl,(long)0);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl),
-                             (__mpz_struct const *)(__e_acsl));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_,(long)0);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_),
+                                 (__mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"0 == 0",6);
-    __gmpz_clear(__e_acsl);
+    __gmpz_clear(__gen_e_acsl_);
   }
   x = 0;
   x ++;
   /*@ assert 0 ≢ 1; */
   {
-    mpz_t __e_acsl_2;
-    mpz_t __e_acsl_3;
-    int __e_acsl_ne;
-    __gmpz_init_set_si(__e_acsl_2,(long)0);
-    __gmpz_init_set_si(__e_acsl_3,(long)1);
-    __e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__e_acsl_2),
-                             (__mpz_struct const *)(__e_acsl_3));
-    __e_acsl_assert(__e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__2;
+    mpz_t __gen_e_acsl__3;
+    int __gen_e_acsl_ne;
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)0);
+    __gmpz_init_set_si(__gen_e_acsl__3,(long)1);
+    __gen_e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__2),
+                                 (__mpz_struct const *)(__gen_e_acsl__3));
+    __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
                     (char *)"0 != 1",8);
-    __gmpz_clear(__e_acsl_2);
-    __gmpz_clear(__e_acsl_3);
+    __gmpz_clear(__gen_e_acsl__2);
+    __gmpz_clear(__gen_e_acsl__3);
   }
   /*@ assert 1152921504606846975 ≡ 0xfffffffffffffff; */
   {
-    mpz_t __e_acsl_4;
-    int __e_acsl_eq_2;
-    __gmpz_init_set_ui(__e_acsl_4,1152921504606846975);
-    __e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_4),
-                               (__mpz_struct const *)(__e_acsl_4));
-    __e_acsl_assert(__e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__4;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_ui(__gen_e_acsl__4,1152921504606846975);
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__4),
+                                   (__mpz_struct const *)(__gen_e_acsl__4));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"1152921504606846975 == 0xfffffffffffffff",9);
-    __gmpz_clear(__e_acsl_4);
+    __gmpz_clear(__gen_e_acsl__4);
   }
   /*@ assert
       0xffffffffffffffffffffffffffffffff ≡
       0xffffffffffffffffffffffffffffffff;
   */
   {
-    mpz_t __e_acsl_5;
-    int __e_acsl_eq_3;
-    __gmpz_init_set_str(__e_acsl_5,"340282366920938463463374607431768211455",
-                        10);
-    __e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_5),
-                               (__mpz_struct const *)(__e_acsl_5));
-    __e_acsl_assert(__e_acsl_eq_3 == 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl__5;
+    int __gen_e_acsl_eq_3;
+    __gmpz_init_set_str(__gen_e_acsl__5,
+                        "340282366920938463463374607431768211455",10);
+    __gen_e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__5),
+                                   (__mpz_struct const *)(__gen_e_acsl__5));
+    __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
+                    (char *)"main",
                     (char *)"0xffffffffffffffffffffffffffffffff == 0xffffffffffffffffffffffffffffffff",
                     11);
-    __gmpz_clear(__e_acsl_5);
+    __gmpz_clear(__gen_e_acsl__5);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_longlong.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_longlong.c
index 1224d72f1a1369c9b7b2206310b08e566814ad9b..80d96913a91c545a6522a98d157b34ca6826dd15 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_longlong.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_longlong.c
@@ -30,48 +30,48 @@ int main(void)
   x = my_pow((unsigned int)2,(unsigned int)63);
   /*@ assert (2*x+1)%2 ≡ 1; */
   {
-    mpz_t __e_acsl;
-    mpz_t __e_acsl_x;
-    mpz_t __e_acsl_mul;
-    mpz_t __e_acsl_2;
-    mpz_t __e_acsl_add;
-    mpz_t __e_acsl_3;
-    int __e_acsl_mod_guard;
-    mpz_t __e_acsl_mod;
-    unsigned long __e_acsl_4;
-    __gmpz_init_set_si(__e_acsl,(long)2);
-    __gmpz_init(__e_acsl_x);
-    __gmpz_import(__e_acsl_x,1UL,1,8UL,0,0UL,(void const *)(& x));
-    __gmpz_init(__e_acsl_mul);
-    __gmpz_mul(__e_acsl_mul,(__mpz_struct const *)(__e_acsl),
-               (__mpz_struct const *)(__e_acsl_x));
-    __gmpz_init_set_si(__e_acsl_2,(long)1);
-    __gmpz_init(__e_acsl_add);
-    __gmpz_add(__e_acsl_add,(__mpz_struct const *)(__e_acsl_mul),
-               (__mpz_struct const *)(__e_acsl_2));
-    __gmpz_init_set_si(__e_acsl_3,0L);
-    __e_acsl_mod_guard = __gmpz_cmp((__mpz_struct const *)(__e_acsl),
-                                    (__mpz_struct const *)(__e_acsl_3));
-    __gmpz_init(__e_acsl_mod);
+    mpz_t __gen_e_acsl_;
+    mpz_t __gen_e_acsl_x;
+    mpz_t __gen_e_acsl_mul;
+    mpz_t __gen_e_acsl__2;
+    mpz_t __gen_e_acsl_add;
+    mpz_t __gen_e_acsl__3;
+    int __gen_e_acsl_mod_guard;
+    mpz_t __gen_e_acsl_mod;
+    unsigned long __gen_e_acsl__4;
+    __gmpz_init_set_si(__gen_e_acsl_,(long)2);
+    __gmpz_init(__gen_e_acsl_x);
+    __gmpz_import(__gen_e_acsl_x,1UL,1,8UL,0,0UL,(void const *)(& x));
+    __gmpz_init(__gen_e_acsl_mul);
+    __gmpz_mul(__gen_e_acsl_mul,(__mpz_struct const *)(__gen_e_acsl_),
+               (__mpz_struct const *)(__gen_e_acsl_x));
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)1);
+    __gmpz_init(__gen_e_acsl_add);
+    __gmpz_add(__gen_e_acsl_add,(__mpz_struct const *)(__gen_e_acsl_mul),
+               (__mpz_struct const *)(__gen_e_acsl__2));
+    __gmpz_init_set_si(__gen_e_acsl__3,0L);
+    __gen_e_acsl_mod_guard = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_),
+                                        (__mpz_struct const *)(__gen_e_acsl__3));
+    __gmpz_init(__gen_e_acsl_mod);
     /*@ assert E_ACSL: 2 ≢ 0; */
-    __e_acsl_assert(! (__e_acsl_mod_guard == 0),(char *)"Assertion",
+    __e_acsl_assert(! (__gen_e_acsl_mod_guard == 0),(char *)"Assertion",
                     (char *)"main",(char *)"2 == 0",17);
-    __gmpz_tdiv_r(__e_acsl_mod,(__mpz_struct const *)(__e_acsl_add),
-                  (__mpz_struct const *)(__e_acsl));
-    __e_acsl_4 = __gmpz_get_ui((__mpz_struct const *)(__e_acsl_mod));
+    __gmpz_tdiv_r(__gen_e_acsl_mod,(__mpz_struct const *)(__gen_e_acsl_add),
+                  (__mpz_struct const *)(__gen_e_acsl_));
+    __gen_e_acsl__4 = __gmpz_get_ui((__mpz_struct const *)(__gen_e_acsl_mod));
     /*@ assert
         Value: ptr_comparison:
-          \pointer_comparable((void *)__e_acsl_4, (void *)1);
+          \pointer_comparable((void *)__gen_e_acsl__4, (void *)1);
     */
-    __e_acsl_assert(__e_acsl_4 == 1,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl__4 == 1,(char *)"Assertion",(char *)"main",
                     (char *)"(2*x+1)%2 == 1",17);
-    __gmpz_clear(__e_acsl);
-    __gmpz_clear(__e_acsl_x);
-    __gmpz_clear(__e_acsl_mul);
-    __gmpz_clear(__e_acsl_2);
-    __gmpz_clear(__e_acsl_add);
-    __gmpz_clear(__e_acsl_3);
-    __gmpz_clear(__e_acsl_mod);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl_x);
+    __gmpz_clear(__gen_e_acsl_mul);
+    __gmpz_clear(__gen_e_acsl__2);
+    __gmpz_clear(__gen_e_acsl_add);
+    __gmpz_clear(__gen_e_acsl__3);
+    __gmpz_clear(__gen_e_acsl_mod);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_longlong2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_longlong2.c
index e826153f1d5f7be53c675dea7e19502d3bf99cca..d086ece432a9053c229fdae548a1959b8f540037 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_longlong2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_longlong2.c
@@ -30,49 +30,49 @@ int main(void)
   x = my_pow((unsigned int)2,(unsigned int)63);
   /*@ assert (2*x+1)%2 ≡ 1; */
   {
-    mpz_t __e_acsl;
-    mpz_t __e_acsl_x;
-    mpz_t __e_acsl_mul;
-    mpz_t __e_acsl_2;
-    mpz_t __e_acsl_add;
-    mpz_t __e_acsl_3;
-    int __e_acsl_mod_guard;
-    mpz_t __e_acsl_mod;
-    int __e_acsl_eq;
-    __gmpz_init_set_si(__e_acsl,(long)2);
-    __gmpz_init(__e_acsl_x);
-    __gmpz_import(__e_acsl_x,1UL,1,8UL,0,0UL,(void const *)(& x));
-    __gmpz_init(__e_acsl_mul);
-    __gmpz_mul(__e_acsl_mul,(__mpz_struct const *)(__e_acsl),
-               (__mpz_struct const *)(__e_acsl_x));
-    __gmpz_init_set_si(__e_acsl_2,(long)1);
-    __gmpz_init(__e_acsl_add);
-    __gmpz_add(__e_acsl_add,(__mpz_struct const *)(__e_acsl_mul),
-               (__mpz_struct const *)(__e_acsl_2));
-    __gmpz_init_set_si(__e_acsl_3,0L);
-    __e_acsl_mod_guard = __gmpz_cmp((__mpz_struct const *)(__e_acsl),
-                                    (__mpz_struct const *)(__e_acsl_3));
-    __gmpz_init(__e_acsl_mod);
+    mpz_t __gen_e_acsl_;
+    mpz_t __gen_e_acsl_x;
+    mpz_t __gen_e_acsl_mul;
+    mpz_t __gen_e_acsl__2;
+    mpz_t __gen_e_acsl_add;
+    mpz_t __gen_e_acsl__3;
+    int __gen_e_acsl_mod_guard;
+    mpz_t __gen_e_acsl_mod;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_,(long)2);
+    __gmpz_init(__gen_e_acsl_x);
+    __gmpz_import(__gen_e_acsl_x,1UL,1,8UL,0,0UL,(void const *)(& x));
+    __gmpz_init(__gen_e_acsl_mul);
+    __gmpz_mul(__gen_e_acsl_mul,(__mpz_struct const *)(__gen_e_acsl_),
+               (__mpz_struct const *)(__gen_e_acsl_x));
+    __gmpz_init_set_si(__gen_e_acsl__2,(long)1);
+    __gmpz_init(__gen_e_acsl_add);
+    __gmpz_add(__gen_e_acsl_add,(__mpz_struct const *)(__gen_e_acsl_mul),
+               (__mpz_struct const *)(__gen_e_acsl__2));
+    __gmpz_init_set_si(__gen_e_acsl__3,0L);
+    __gen_e_acsl_mod_guard = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_),
+                                        (__mpz_struct const *)(__gen_e_acsl__3));
+    __gmpz_init(__gen_e_acsl_mod);
     /*@ assert E_ACSL: 2 ≢ 0; */
-    __e_acsl_assert(! (__e_acsl_mod_guard == 0),(char *)"Assertion",
+    __e_acsl_assert(! (__gen_e_acsl_mod_guard == 0),(char *)"Assertion",
                     (char *)"main",(char *)"2 == 0",17);
-    __gmpz_tdiv_r(__e_acsl_mod,(__mpz_struct const *)(__e_acsl_add),
-                  (__mpz_struct const *)(__e_acsl));
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_mod),
-                             (__mpz_struct const *)(__e_acsl_2));
+    __gmpz_tdiv_r(__gen_e_acsl_mod,(__mpz_struct const *)(__gen_e_acsl_add),
+                  (__mpz_struct const *)(__gen_e_acsl_));
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_mod),
+                                 (__mpz_struct const *)(__gen_e_acsl__2));
     /*@ assert
         Value: ptr_comparison:
-          \pointer_comparable((void *)__e_acsl_eq, (void *)0);
+          \pointer_comparable((void *)__gen_e_acsl_eq, (void *)0);
     */
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"(2*x+1)%2 == 1",17);
-    __gmpz_clear(__e_acsl);
-    __gmpz_clear(__e_acsl_x);
-    __gmpz_clear(__e_acsl_mul);
-    __gmpz_clear(__e_acsl_2);
-    __gmpz_clear(__e_acsl_add);
-    __gmpz_clear(__e_acsl_3);
-    __gmpz_clear(__e_acsl_mod);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl_x);
+    __gmpz_clear(__gen_e_acsl_mul);
+    __gmpz_clear(__gen_e_acsl__2);
+    __gmpz_clear(__gen_e_acsl_add);
+    __gmpz_clear(__gen_e_acsl__3);
+    __gmpz_clear(__gen_e_acsl_mod);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_not2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_not2.c
index a4e08db42387cd95b993a2db18b8ed1eb7c5b3c2..8ee1e05a971bcdfa474a748f2bc43fb0e952fce0 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_not2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_not2.c
@@ -6,32 +6,32 @@ int main(void)
   x = 0;
   /*@ assert x ≡ 0; */
   {
-    mpz_t __e_acsl_x;
-    mpz_t __e_acsl;
-    int __e_acsl_eq;
-    __gmpz_init_set_si(__e_acsl_x,(long)x);
-    __gmpz_init_set_si(__e_acsl,0L);
-    __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x),
-                             (__mpz_struct const *)(__e_acsl));
-    __e_acsl_assert(__e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+    mpz_t __gen_e_acsl_x;
+    mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl_,0L);
+    __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x),
+                                 (__mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
                     (char *)"x == 0",6);
-    __gmpz_clear(__e_acsl_x);
-    __gmpz_clear(__e_acsl);
+    __gmpz_clear(__gen_e_acsl_x);
+    __gmpz_clear(__gen_e_acsl_);
   }
   if (x) {
     /*@ assert x ≢ 0; */
     {
-      mpz_t __e_acsl_x_2;
-      mpz_t __e_acsl_2;
-      int __e_acsl_ne;
-      __gmpz_init_set_si(__e_acsl_x_2,(long)x);
-      __gmpz_init_set_si(__e_acsl_2,0L);
-      __e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_2),
-                               (__mpz_struct const *)(__e_acsl_2));
-      __e_acsl_assert(__e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
-                      (char *)"x != 0",7);
-      __gmpz_clear(__e_acsl_x_2);
-      __gmpz_clear(__e_acsl_2);
+      mpz_t __gen_e_acsl_x_2;
+      mpz_t __gen_e_acsl__2;
+      int __gen_e_acsl_ne;
+      __gmpz_init_set_si(__gen_e_acsl_x_2,(long)x);
+      __gmpz_init_set_si(__gen_e_acsl__2,0L);
+      __gen_e_acsl_ne = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_2),
+                                   (__mpz_struct const *)(__gen_e_acsl__2));
+      __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",
+                      (char *)"main",(char *)"x != 0",7);
+      __gmpz_clear(__gen_e_acsl_x_2);
+      __gmpz_clear(__gen_e_acsl__2);
     }
   }
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif.c
index ebb70a9adb8eb536d6eb675da0da41e49bcd3585..5842faede2f97bd4828c7fd3c496924537422c6a 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif.c
@@ -4,84 +4,84 @@ int main(void)
   int __retres;
   /*@ assert ∀ ℤ x; 0 ≤ x ≤ 1 ⇒ x ≡ 0 ∨ x ≡ 1; */
   {
-    int __e_acsl_forall;
-    int __e_acsl_x;
-    __e_acsl_forall = 1;
-    __e_acsl_x = 0;
+    int __gen_e_acsl_forall;
+    int __gen_e_acsl_x;
+    __gen_e_acsl_forall = 1;
+    __gen_e_acsl_x = 0;
     while (1) {
-      if (__e_acsl_x <= 1) ; else break;
+      if (__gen_e_acsl_x <= 1) ; else break;
       {
-        int __e_acsl_or;
-        if (__e_acsl_x == 0) __e_acsl_or = 1;
-        else __e_acsl_or = __e_acsl_x == 1;
-        if (__e_acsl_or) ;
+        int __gen_e_acsl_or;
+        if (__gen_e_acsl_x == 0) __gen_e_acsl_or = 1;
+        else __gen_e_acsl_or = __gen_e_acsl_x == 1;
+        if (__gen_e_acsl_or) ;
         else {
-          __e_acsl_forall = 0;
+          __gen_e_acsl_forall = 0;
           goto e_acsl_end_loop1;
         }
       }
-      __e_acsl_x ++;
+      __gen_e_acsl_x ++;
     }
     e_acsl_end_loop1: ;
-    __e_acsl_assert(__e_acsl_forall,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall integer x; 0 <= x <= 1 ==> x == 0 || x == 1",
                     9);
   }
   /*@ assert ∀ ℤ x; 0 < x ≤ 1 ⇒ x ≡ 1; */
   {
-    int __e_acsl_forall_2;
-    int __e_acsl_x_2;
-    __e_acsl_forall_2 = 1;
-    __e_acsl_x_2 = 0 + 1;
+    int __gen_e_acsl_forall_2;
+    int __gen_e_acsl_x_2;
+    __gen_e_acsl_forall_2 = 1;
+    __gen_e_acsl_x_2 = 0 + 1;
     while (1) {
-      if (__e_acsl_x_2 <= 1) ; else break;
-      if (__e_acsl_x_2 == 1) ;
+      if (__gen_e_acsl_x_2 <= 1) ; else break;
+      if (__gen_e_acsl_x_2 == 1) ;
       else {
-        __e_acsl_forall_2 = 0;
+        __gen_e_acsl_forall_2 = 0;
         goto e_acsl_end_loop2;
       }
-      __e_acsl_x_2 ++;
+      __gen_e_acsl_x_2 ++;
     }
     e_acsl_end_loop2: ;
-    __e_acsl_assert(__e_acsl_forall_2,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall integer x; 0 < x <= 1 ==> x == 1",10);
   }
   /*@ assert ∀ ℤ x; 0 < x < 1 ⇒ \false; */
   {
-    int __e_acsl_forall_3;
-    int __e_acsl_x_3;
-    __e_acsl_forall_3 = 1;
-    __e_acsl_x_3 = 0 + 1;
+    int __gen_e_acsl_forall_3;
+    int __gen_e_acsl_x_3;
+    __gen_e_acsl_forall_3 = 1;
+    __gen_e_acsl_x_3 = 0 + 1;
     while (1) {
-      if (__e_acsl_x_3 < 1) ; else break;
+      if (__gen_e_acsl_x_3 < 1) ; else break;
       if (0) ;
       else {
-        __e_acsl_forall_3 = 0;
+        __gen_e_acsl_forall_3 = 0;
         goto e_acsl_end_loop3;
       }
-      __e_acsl_x_3 ++;
+      __gen_e_acsl_x_3 ++;
     }
     e_acsl_end_loop3: ;
-    __e_acsl_assert(__e_acsl_forall_3,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall_3,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall integer x; 0 < x < 1 ==> \\false",11);
   }
   /*@ assert ∀ ℤ x; 0 ≤ x < 1 ⇒ x ≡ 0; */
   {
-    int __e_acsl_forall_4;
-    int __e_acsl_x_4;
-    __e_acsl_forall_4 = 1;
-    __e_acsl_x_4 = 0;
+    int __gen_e_acsl_forall_4;
+    int __gen_e_acsl_x_4;
+    __gen_e_acsl_forall_4 = 1;
+    __gen_e_acsl_x_4 = 0;
     while (1) {
-      if (__e_acsl_x_4 < 1) ; else break;
-      if (__e_acsl_x_4 == 0) ;
+      if (__gen_e_acsl_x_4 < 1) ; else break;
+      if (__gen_e_acsl_x_4 == 0) ;
       else {
-        __e_acsl_forall_4 = 0;
+        __gen_e_acsl_forall_4 = 0;
         goto e_acsl_end_loop4;
       }
-      __e_acsl_x_4 ++;
+      __gen_e_acsl_x_4 ++;
     }
     e_acsl_end_loop4: ;
-    __e_acsl_assert(__e_acsl_forall_4,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall_4,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall integer x; 0 <= x < 1 ==> x == 0",12);
   }
   /*@ assert
@@ -89,53 +89,54 @@ int main(void)
         0 ≤ x < 2 ∧ 0 ≤ y < 5 ∧ 0 ≤ z ≤ y ⇒ x+z ≤ y+1;
   */
   {
-    int __e_acsl_forall_5;
-    int __e_acsl_x_5;
-    int __e_acsl_y;
-    int __e_acsl_z;
-    __e_acsl_forall_5 = 1;
-    __e_acsl_x_5 = 0;
+    int __gen_e_acsl_forall_5;
+    int __gen_e_acsl_x_5;
+    int __gen_e_acsl_y;
+    int __gen_e_acsl_z;
+    __gen_e_acsl_forall_5 = 1;
+    __gen_e_acsl_x_5 = 0;
     while (1) {
-      if (__e_acsl_x_5 < 2) ; else break;
-      __e_acsl_y = 0;
+      if (__gen_e_acsl_x_5 < 2) ; else break;
+      __gen_e_acsl_y = 0;
       while (1) {
-        if (__e_acsl_y < 5) ; else break;
-        __e_acsl_z = 0;
+        if (__gen_e_acsl_y < 5) ; else break;
+        __gen_e_acsl_z = 0;
         while (1) {
-          if (__e_acsl_z <= __e_acsl_y) ; else break;
-          if (__e_acsl_x_5 + __e_acsl_z <= __e_acsl_y + 1) ;
+          if (__gen_e_acsl_z <= __gen_e_acsl_y) ; else break;
+          if (__gen_e_acsl_x_5 + __gen_e_acsl_z <= __gen_e_acsl_y + 1) 
+            ;
           else {
-            __e_acsl_forall_5 = 0;
+            __gen_e_acsl_forall_5 = 0;
             goto e_acsl_end_loop5;
           }
-          __e_acsl_z ++;
+          __gen_e_acsl_z ++;
         }
-        __e_acsl_y ++;
+        __gen_e_acsl_y ++;
       }
-      __e_acsl_x_5 ++;
+      __gen_e_acsl_x_5 ++;
     }
     e_acsl_end_loop5: ;
-    __e_acsl_assert(__e_acsl_forall_5,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall_5,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall integer x, integer y, integer z;\n  0 <= x < 2 && 0 <= y < 5 && 0 <= z <= y ==> x+z <= y+1",
                     16);
   }
   /*@ assert ∃ int x; 0 ≤ x < 10 ∧ x ≡ 5; */
   {
-    int __e_acsl_exists;
-    int __e_acsl_x_6;
-    __e_acsl_exists = 0;
-    __e_acsl_x_6 = 0;
+    int __gen_e_acsl_exists;
+    int __gen_e_acsl_x_6;
+    __gen_e_acsl_exists = 0;
+    __gen_e_acsl_x_6 = 0;
     while (1) {
-      if (__e_acsl_x_6 < 10) ; else break;
-      if (! (__e_acsl_x_6 == 5)) ;
+      if (__gen_e_acsl_x_6 < 10) ; else break;
+      if (! (__gen_e_acsl_x_6 == 5)) ;
       else {
-        __e_acsl_exists = 1;
+        __gen_e_acsl_exists = 1;
         goto e_acsl_end_loop6;
       }
-      __e_acsl_x_6 ++;
+      __gen_e_acsl_x_6 ++;
     }
     e_acsl_end_loop6: ;
-    __e_acsl_assert(__e_acsl_exists,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_exists,(char *)"Assertion",(char *)"main",
                     (char *)"\\exists int x; 0 <= x < 10 && x == 5",21);
   }
   /*@ assert
@@ -144,42 +145,42 @@ int main(void)
         x%2 ≡ 0 ⇒ (∃ ℤ y; 0 ≤ y ≤ x/2 ∧ x ≡ 2*y);
   */
   {
-    int __e_acsl_forall_6;
-    int __e_acsl_x_7;
-    __e_acsl_forall_6 = 1;
-    __e_acsl_x_7 = 0;
+    int __gen_e_acsl_forall_6;
+    int __gen_e_acsl_x_7;
+    __gen_e_acsl_forall_6 = 1;
+    __gen_e_acsl_x_7 = 0;
     while (1) {
-      if (__e_acsl_x_7 < 10) ; else break;
+      if (__gen_e_acsl_x_7 < 10) ; else break;
       {
-        int __e_acsl_implies;
-        if (! (__e_acsl_x_7 % 2 == 0)) __e_acsl_implies = 1;
+        int __gen_e_acsl_implies;
+        if (! (__gen_e_acsl_x_7 % 2 == 0)) __gen_e_acsl_implies = 1;
         else {
-          int __e_acsl_exists_2;
-          int __e_acsl_y_2;
-          __e_acsl_exists_2 = 0;
-          __e_acsl_y_2 = 0;
+          int __gen_e_acsl_exists_2;
+          int __gen_e_acsl_y_2;
+          __gen_e_acsl_exists_2 = 0;
+          __gen_e_acsl_y_2 = 0;
           while (1) {
-            if (__e_acsl_y_2 <= __e_acsl_x_7 / 2) ; else break;
-            if (! (__e_acsl_x_7 == 2 * __e_acsl_y_2)) ;
+            if (__gen_e_acsl_y_2 <= __gen_e_acsl_x_7 / 2) ; else break;
+            if (! (__gen_e_acsl_x_7 == 2 * __gen_e_acsl_y_2)) ;
             else {
-              __e_acsl_exists_2 = 1;
+              __gen_e_acsl_exists_2 = 1;
               goto e_acsl_end_loop7;
             }
-            __e_acsl_y_2 ++;
+            __gen_e_acsl_y_2 ++;
           }
           e_acsl_end_loop7: ;
-          __e_acsl_implies = __e_acsl_exists_2;
+          __gen_e_acsl_implies = __gen_e_acsl_exists_2;
         }
-        if (__e_acsl_implies) ;
+        if (__gen_e_acsl_implies) ;
         else {
-          __e_acsl_forall_6 = 0;
+          __gen_e_acsl_forall_6 = 0;
           goto e_acsl_end_loop8;
         }
       }
-      __e_acsl_x_7 ++;
+      __gen_e_acsl_x_7 ++;
     }
     e_acsl_end_loop8: ;
-    __e_acsl_assert(__e_acsl_forall_6,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall_6,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall int x;\n  0 <= x < 10 ==> x%2 == 0 ==> (\\exists integer y; 0 <= y <= x/2 && x == 2*y)",
                     25);
   }
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif2.c
index 2bce3b4498a1fa4a77187499aeeac7d8e8a4a7cc..14ccacd711a9c19340ced205a3bfb249264beb21 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif2.c
@@ -4,408 +4,424 @@ int main(void)
   int __retres;
   /*@ assert ∀ ℤ x; 0 ≤ x ≤ 1 ⇒ x ≡ 0 ∨ x ≡ 1; */
   {
-    int __e_acsl_forall;
-    mpz_t __e_acsl_x;
-    __e_acsl_forall = 1;
-    __gmpz_init(__e_acsl_x);
+    int __gen_e_acsl_forall;
+    mpz_t __gen_e_acsl_x;
+    __gen_e_acsl_forall = 1;
+    __gmpz_init(__gen_e_acsl_x);
     {
-      mpz_t __e_acsl_3;
-      __gmpz_init_set_si(__e_acsl_3,(long)0);
-      __gmpz_set(__e_acsl_x,(__mpz_struct const *)(__e_acsl_3));
-      __gmpz_clear(__e_acsl_3);
+      mpz_t __gen_e_acsl__3;
+      __gmpz_init_set_si(__gen_e_acsl__3,(long)0);
+      __gmpz_set(__gen_e_acsl_x,(__mpz_struct const *)(__gen_e_acsl__3));
+      __gmpz_clear(__gen_e_acsl__3);
     }
     while (1) {
       {
-        mpz_t __e_acsl_4;
-        int __e_acsl_le;
-        __gmpz_init_set_si(__e_acsl_4,(long)1);
-        __e_acsl_le = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x),
-                                 (__mpz_struct const *)(__e_acsl_4));
-        if (__e_acsl_le <= 0) ; else break;
-        __gmpz_clear(__e_acsl_4);
+        mpz_t __gen_e_acsl__4;
+        int __gen_e_acsl_le;
+        __gmpz_init_set_si(__gen_e_acsl__4,(long)1);
+        __gen_e_acsl_le = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x),
+                                     (__mpz_struct const *)(__gen_e_acsl__4));
+        if (__gen_e_acsl_le <= 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__4);
       }
       {
-        mpz_t __e_acsl;
-        int __e_acsl_eq;
-        int __e_acsl_or;
-        __gmpz_init_set_si(__e_acsl,(long)0);
-        __e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x),
-                                 (__mpz_struct const *)(__e_acsl));
-        if (__e_acsl_eq == 0) __e_acsl_or = 1;
+        mpz_t __gen_e_acsl_;
+        int __gen_e_acsl_eq;
+        int __gen_e_acsl_or;
+        __gmpz_init_set_si(__gen_e_acsl_,(long)0);
+        __gen_e_acsl_eq = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x),
+                                     (__mpz_struct const *)(__gen_e_acsl_));
+        if (__gen_e_acsl_eq == 0) __gen_e_acsl_or = 1;
         else {
-          mpz_t __e_acsl_2;
-          int __e_acsl_eq_2;
-          __gmpz_init_set_si(__e_acsl_2,(long)1);
-          __e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x),
-                                     (__mpz_struct const *)(__e_acsl_2));
-          __e_acsl_or = __e_acsl_eq_2 == 0;
-          __gmpz_clear(__e_acsl_2);
+          mpz_t __gen_e_acsl__2;
+          int __gen_e_acsl_eq_2;
+          __gmpz_init_set_si(__gen_e_acsl__2,(long)1);
+          __gen_e_acsl_eq_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x),
+                                         (__mpz_struct const *)(__gen_e_acsl__2));
+          __gen_e_acsl_or = __gen_e_acsl_eq_2 == 0;
+          __gmpz_clear(__gen_e_acsl__2);
         }
-        __gmpz_clear(__e_acsl);
-        if (__e_acsl_or) ;
+        __gmpz_clear(__gen_e_acsl_);
+        if (__gen_e_acsl_or) ;
         else {
-          __e_acsl_forall = 0;
+          __gen_e_acsl_forall = 0;
           goto e_acsl_end_loop1;
         }
       }
       {
-        mpz_t __e_acsl_5;
-        mpz_t __e_acsl_add;
-        __gmpz_init_set_si(__e_acsl_5,1L);
-        __gmpz_init(__e_acsl_add);
-        __gmpz_add(__e_acsl_add,(__mpz_struct const *)(__e_acsl_x),
-                   (__mpz_struct const *)(__e_acsl_5));
-        __gmpz_set(__e_acsl_x,(__mpz_struct const *)(__e_acsl_add));
-        __gmpz_clear(__e_acsl_5);
-        __gmpz_clear(__e_acsl_add);
+        mpz_t __gen_e_acsl__5;
+        mpz_t __gen_e_acsl_add;
+        __gmpz_init_set_si(__gen_e_acsl__5,1L);
+        __gmpz_init(__gen_e_acsl_add);
+        __gmpz_add(__gen_e_acsl_add,(__mpz_struct const *)(__gen_e_acsl_x),
+                   (__mpz_struct const *)(__gen_e_acsl__5));
+        __gmpz_set(__gen_e_acsl_x,(__mpz_struct const *)(__gen_e_acsl_add));
+        __gmpz_clear(__gen_e_acsl__5);
+        __gmpz_clear(__gen_e_acsl_add);
       }
     }
     e_acsl_end_loop1: ;
-    __e_acsl_assert(__e_acsl_forall,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall integer x; 0 <= x <= 1 ==> x == 0 || x == 1",
                     9);
-    __gmpz_clear(__e_acsl_x);
+    __gmpz_clear(__gen_e_acsl_x);
   }
   /*@ assert ∀ ℤ x; 0 < x ≤ 1 ⇒ x ≡ 1; */
   {
-    int __e_acsl_forall_2;
-    mpz_t __e_acsl_x_2;
-    __e_acsl_forall_2 = 1;
-    __gmpz_init(__e_acsl_x_2);
+    int __gen_e_acsl_forall_2;
+    mpz_t __gen_e_acsl_x_2;
+    __gen_e_acsl_forall_2 = 1;
+    __gmpz_init(__gen_e_acsl_x_2);
     {
-      mpz_t __e_acsl_7;
-      mpz_t __e_acsl_8;
-      mpz_t __e_acsl_add_2;
-      __gmpz_init_set_si(__e_acsl_7,(long)0);
-      __gmpz_init_set_si(__e_acsl_8,1L);
-      __gmpz_init(__e_acsl_add_2);
-      __gmpz_add(__e_acsl_add_2,(__mpz_struct const *)(__e_acsl_7),
-                 (__mpz_struct const *)(__e_acsl_8));
-      __gmpz_set(__e_acsl_x_2,(__mpz_struct const *)(__e_acsl_add_2));
-      __gmpz_clear(__e_acsl_7);
-      __gmpz_clear(__e_acsl_8);
-      __gmpz_clear(__e_acsl_add_2);
+      mpz_t __gen_e_acsl__7;
+      mpz_t __gen_e_acsl__8;
+      mpz_t __gen_e_acsl_add_2;
+      __gmpz_init_set_si(__gen_e_acsl__7,(long)0);
+      __gmpz_init_set_si(__gen_e_acsl__8,1L);
+      __gmpz_init(__gen_e_acsl_add_2);
+      __gmpz_add(__gen_e_acsl_add_2,(__mpz_struct const *)(__gen_e_acsl__7),
+                 (__mpz_struct const *)(__gen_e_acsl__8));
+      __gmpz_set(__gen_e_acsl_x_2,(__mpz_struct const *)(__gen_e_acsl_add_2));
+      __gmpz_clear(__gen_e_acsl__7);
+      __gmpz_clear(__gen_e_acsl__8);
+      __gmpz_clear(__gen_e_acsl_add_2);
     }
     while (1) {
       {
-        mpz_t __e_acsl_9;
-        int __e_acsl_le_2;
-        __gmpz_init_set_si(__e_acsl_9,(long)1);
-        __e_acsl_le_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_2),
-                                   (__mpz_struct const *)(__e_acsl_9));
-        if (__e_acsl_le_2 <= 0) ; else break;
-        __gmpz_clear(__e_acsl_9);
+        mpz_t __gen_e_acsl__9;
+        int __gen_e_acsl_le_2;
+        __gmpz_init_set_si(__gen_e_acsl__9,(long)1);
+        __gen_e_acsl_le_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_2),
+                                       (__mpz_struct const *)(__gen_e_acsl__9));
+        if (__gen_e_acsl_le_2 <= 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__9);
       }
       {
-        mpz_t __e_acsl_6;
-        int __e_acsl_eq_3;
-        __gmpz_init_set_si(__e_acsl_6,(long)1);
-        __e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_2),
-                                   (__mpz_struct const *)(__e_acsl_6));
-        __gmpz_clear(__e_acsl_6);
-        if (__e_acsl_eq_3 == 0) ;
+        mpz_t __gen_e_acsl__6;
+        int __gen_e_acsl_eq_3;
+        __gmpz_init_set_si(__gen_e_acsl__6,(long)1);
+        __gen_e_acsl_eq_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_2),
+                                       (__mpz_struct const *)(__gen_e_acsl__6));
+        __gmpz_clear(__gen_e_acsl__6);
+        if (__gen_e_acsl_eq_3 == 0) ;
         else {
-          __e_acsl_forall_2 = 0;
+          __gen_e_acsl_forall_2 = 0;
           goto e_acsl_end_loop2;
         }
       }
       {
-        mpz_t __e_acsl_10;
-        mpz_t __e_acsl_add_3;
-        __gmpz_init_set_si(__e_acsl_10,1L);
-        __gmpz_init(__e_acsl_add_3);
-        __gmpz_add(__e_acsl_add_3,(__mpz_struct const *)(__e_acsl_x_2),
-                   (__mpz_struct const *)(__e_acsl_10));
-        __gmpz_set(__e_acsl_x_2,(__mpz_struct const *)(__e_acsl_add_3));
-        __gmpz_clear(__e_acsl_10);
-        __gmpz_clear(__e_acsl_add_3);
+        mpz_t __gen_e_acsl__10;
+        mpz_t __gen_e_acsl_add_3;
+        __gmpz_init_set_si(__gen_e_acsl__10,1L);
+        __gmpz_init(__gen_e_acsl_add_3);
+        __gmpz_add(__gen_e_acsl_add_3,
+                   (__mpz_struct const *)(__gen_e_acsl_x_2),
+                   (__mpz_struct const *)(__gen_e_acsl__10));
+        __gmpz_set(__gen_e_acsl_x_2,
+                   (__mpz_struct const *)(__gen_e_acsl_add_3));
+        __gmpz_clear(__gen_e_acsl__10);
+        __gmpz_clear(__gen_e_acsl_add_3);
       }
     }
     e_acsl_end_loop2: ;
-    __e_acsl_assert(__e_acsl_forall_2,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall integer x; 0 < x <= 1 ==> x == 1",10);
-    __gmpz_clear(__e_acsl_x_2);
+    __gmpz_clear(__gen_e_acsl_x_2);
   }
   /*@ assert ∀ ℤ x; 0 < x < 1 ⇒ \false; */
   {
-    int __e_acsl_forall_3;
-    mpz_t __e_acsl_x_3;
-    __e_acsl_forall_3 = 1;
-    __gmpz_init(__e_acsl_x_3);
+    int __gen_e_acsl_forall_3;
+    mpz_t __gen_e_acsl_x_3;
+    __gen_e_acsl_forall_3 = 1;
+    __gmpz_init(__gen_e_acsl_x_3);
     {
-      mpz_t __e_acsl_11;
-      mpz_t __e_acsl_12;
-      mpz_t __e_acsl_add_4;
-      __gmpz_init_set_si(__e_acsl_11,(long)0);
-      __gmpz_init_set_si(__e_acsl_12,1L);
-      __gmpz_init(__e_acsl_add_4);
-      __gmpz_add(__e_acsl_add_4,(__mpz_struct const *)(__e_acsl_11),
-                 (__mpz_struct const *)(__e_acsl_12));
-      __gmpz_set(__e_acsl_x_3,(__mpz_struct const *)(__e_acsl_add_4));
-      __gmpz_clear(__e_acsl_11);
-      __gmpz_clear(__e_acsl_12);
-      __gmpz_clear(__e_acsl_add_4);
+      mpz_t __gen_e_acsl__11;
+      mpz_t __gen_e_acsl__12;
+      mpz_t __gen_e_acsl_add_4;
+      __gmpz_init_set_si(__gen_e_acsl__11,(long)0);
+      __gmpz_init_set_si(__gen_e_acsl__12,1L);
+      __gmpz_init(__gen_e_acsl_add_4);
+      __gmpz_add(__gen_e_acsl_add_4,(__mpz_struct const *)(__gen_e_acsl__11),
+                 (__mpz_struct const *)(__gen_e_acsl__12));
+      __gmpz_set(__gen_e_acsl_x_3,(__mpz_struct const *)(__gen_e_acsl_add_4));
+      __gmpz_clear(__gen_e_acsl__11);
+      __gmpz_clear(__gen_e_acsl__12);
+      __gmpz_clear(__gen_e_acsl_add_4);
     }
     while (1) {
       {
-        mpz_t __e_acsl_13;
-        int __e_acsl_lt;
-        __gmpz_init_set_si(__e_acsl_13,(long)1);
-        __e_acsl_lt = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_3),
-                                 (__mpz_struct const *)(__e_acsl_13));
-        if (__e_acsl_lt < 0) ; else break;
-        __gmpz_clear(__e_acsl_13);
+        mpz_t __gen_e_acsl__13;
+        int __gen_e_acsl_lt;
+        __gmpz_init_set_si(__gen_e_acsl__13,(long)1);
+        __gen_e_acsl_lt = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_3),
+                                     (__mpz_struct const *)(__gen_e_acsl__13));
+        if (__gen_e_acsl_lt < 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__13);
       }
       if (0) ;
       else {
-        __e_acsl_forall_3 = 0;
+        __gen_e_acsl_forall_3 = 0;
         goto e_acsl_end_loop3;
       }
       {
-        mpz_t __e_acsl_14;
-        mpz_t __e_acsl_add_5;
-        __gmpz_init_set_si(__e_acsl_14,1L);
-        __gmpz_init(__e_acsl_add_5);
-        __gmpz_add(__e_acsl_add_5,(__mpz_struct const *)(__e_acsl_x_3),
-                   (__mpz_struct const *)(__e_acsl_14));
-        __gmpz_set(__e_acsl_x_3,(__mpz_struct const *)(__e_acsl_add_5));
-        __gmpz_clear(__e_acsl_14);
-        __gmpz_clear(__e_acsl_add_5);
+        mpz_t __gen_e_acsl__14;
+        mpz_t __gen_e_acsl_add_5;
+        __gmpz_init_set_si(__gen_e_acsl__14,1L);
+        __gmpz_init(__gen_e_acsl_add_5);
+        __gmpz_add(__gen_e_acsl_add_5,
+                   (__mpz_struct const *)(__gen_e_acsl_x_3),
+                   (__mpz_struct const *)(__gen_e_acsl__14));
+        __gmpz_set(__gen_e_acsl_x_3,
+                   (__mpz_struct const *)(__gen_e_acsl_add_5));
+        __gmpz_clear(__gen_e_acsl__14);
+        __gmpz_clear(__gen_e_acsl_add_5);
       }
     }
     e_acsl_end_loop3: ;
-    __e_acsl_assert(__e_acsl_forall_3,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall_3,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall integer x; 0 < x < 1 ==> \\false",11);
-    __gmpz_clear(__e_acsl_x_3);
+    __gmpz_clear(__gen_e_acsl_x_3);
   }
   /*@ assert ∀ ℤ x; 0 ≤ x < 1 ⇒ x ≡ 0; */
   {
-    int __e_acsl_forall_4;
-    mpz_t __e_acsl_x_4;
-    __e_acsl_forall_4 = 1;
-    __gmpz_init(__e_acsl_x_4);
+    int __gen_e_acsl_forall_4;
+    mpz_t __gen_e_acsl_x_4;
+    __gen_e_acsl_forall_4 = 1;
+    __gmpz_init(__gen_e_acsl_x_4);
     {
-      mpz_t __e_acsl_16;
-      __gmpz_init_set_si(__e_acsl_16,(long)0);
-      __gmpz_set(__e_acsl_x_4,(__mpz_struct const *)(__e_acsl_16));
-      __gmpz_clear(__e_acsl_16);
+      mpz_t __gen_e_acsl__16;
+      __gmpz_init_set_si(__gen_e_acsl__16,(long)0);
+      __gmpz_set(__gen_e_acsl_x_4,(__mpz_struct const *)(__gen_e_acsl__16));
+      __gmpz_clear(__gen_e_acsl__16);
     }
     while (1) {
       {
-        mpz_t __e_acsl_17;
-        int __e_acsl_lt_2;
-        __gmpz_init_set_si(__e_acsl_17,(long)1);
-        __e_acsl_lt_2 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_4),
-                                   (__mpz_struct const *)(__e_acsl_17));
-        if (__e_acsl_lt_2 < 0) ; else break;
-        __gmpz_clear(__e_acsl_17);
+        mpz_t __gen_e_acsl__17;
+        int __gen_e_acsl_lt_2;
+        __gmpz_init_set_si(__gen_e_acsl__17,(long)1);
+        __gen_e_acsl_lt_2 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_4),
+                                       (__mpz_struct const *)(__gen_e_acsl__17));
+        if (__gen_e_acsl_lt_2 < 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__17);
       }
       {
-        mpz_t __e_acsl_15;
-        int __e_acsl_eq_4;
-        __gmpz_init_set_si(__e_acsl_15,(long)0);
-        __e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_4),
-                                   (__mpz_struct const *)(__e_acsl_15));
-        __gmpz_clear(__e_acsl_15);
-        if (__e_acsl_eq_4 == 0) ;
+        mpz_t __gen_e_acsl__15;
+        int __gen_e_acsl_eq_4;
+        __gmpz_init_set_si(__gen_e_acsl__15,(long)0);
+        __gen_e_acsl_eq_4 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_4),
+                                       (__mpz_struct const *)(__gen_e_acsl__15));
+        __gmpz_clear(__gen_e_acsl__15);
+        if (__gen_e_acsl_eq_4 == 0) ;
         else {
-          __e_acsl_forall_4 = 0;
+          __gen_e_acsl_forall_4 = 0;
           goto e_acsl_end_loop4;
         }
       }
       {
-        mpz_t __e_acsl_18;
-        mpz_t __e_acsl_add_6;
-        __gmpz_init_set_si(__e_acsl_18,1L);
-        __gmpz_init(__e_acsl_add_6);
-        __gmpz_add(__e_acsl_add_6,(__mpz_struct const *)(__e_acsl_x_4),
-                   (__mpz_struct const *)(__e_acsl_18));
-        __gmpz_set(__e_acsl_x_4,(__mpz_struct const *)(__e_acsl_add_6));
-        __gmpz_clear(__e_acsl_18);
-        __gmpz_clear(__e_acsl_add_6);
+        mpz_t __gen_e_acsl__18;
+        mpz_t __gen_e_acsl_add_6;
+        __gmpz_init_set_si(__gen_e_acsl__18,1L);
+        __gmpz_init(__gen_e_acsl_add_6);
+        __gmpz_add(__gen_e_acsl_add_6,
+                   (__mpz_struct const *)(__gen_e_acsl_x_4),
+                   (__mpz_struct const *)(__gen_e_acsl__18));
+        __gmpz_set(__gen_e_acsl_x_4,
+                   (__mpz_struct const *)(__gen_e_acsl_add_6));
+        __gmpz_clear(__gen_e_acsl__18);
+        __gmpz_clear(__gen_e_acsl_add_6);
       }
     }
     e_acsl_end_loop4: ;
-    __e_acsl_assert(__e_acsl_forall_4,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall_4,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall integer x; 0 <= x < 1 ==> x == 0",12);
-    __gmpz_clear(__e_acsl_x_4);
+    __gmpz_clear(__gen_e_acsl_x_4);
   }
   /*@ assert
       ∀ ℤ x, ℤ y, ℤ z;
         0 ≤ x < 2 ∧ 0 ≤ y < 5 ∧ 0 ≤ z ≤ y ⇒ x+z ≤ y+1;
   */
   {
-    int __e_acsl_forall_5;
-    mpz_t __e_acsl_x_5;
-    mpz_t __e_acsl_y;
-    mpz_t __e_acsl_z;
-    __e_acsl_forall_5 = 1;
-    __gmpz_init(__e_acsl_x_5);
-    __gmpz_init(__e_acsl_y);
-    __gmpz_init(__e_acsl_z);
+    int __gen_e_acsl_forall_5;
+    mpz_t __gen_e_acsl_x_5;
+    mpz_t __gen_e_acsl_y;
+    mpz_t __gen_e_acsl_z;
+    __gen_e_acsl_forall_5 = 1;
+    __gmpz_init(__gen_e_acsl_x_5);
+    __gmpz_init(__gen_e_acsl_y);
+    __gmpz_init(__gen_e_acsl_z);
     {
-      mpz_t __e_acsl_25;
-      __gmpz_init_set_si(__e_acsl_25,(long)0);
-      __gmpz_set(__e_acsl_x_5,(__mpz_struct const *)(__e_acsl_25));
-      __gmpz_clear(__e_acsl_25);
+      mpz_t __gen_e_acsl__25;
+      __gmpz_init_set_si(__gen_e_acsl__25,(long)0);
+      __gmpz_set(__gen_e_acsl_x_5,(__mpz_struct const *)(__gen_e_acsl__25));
+      __gmpz_clear(__gen_e_acsl__25);
     }
     while (1) {
       {
-        mpz_t __e_acsl_26;
-        int __e_acsl_lt_4;
-        __gmpz_init_set_si(__e_acsl_26,(long)2);
-        __e_acsl_lt_4 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_5),
-                                   (__mpz_struct const *)(__e_acsl_26));
-        if (__e_acsl_lt_4 < 0) ; else break;
-        __gmpz_clear(__e_acsl_26);
+        mpz_t __gen_e_acsl__26;
+        int __gen_e_acsl_lt_4;
+        __gmpz_init_set_si(__gen_e_acsl__26,(long)2);
+        __gen_e_acsl_lt_4 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_5),
+                                       (__mpz_struct const *)(__gen_e_acsl__26));
+        if (__gen_e_acsl_lt_4 < 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__26);
       }
       {
-        mpz_t __e_acsl_22;
-        __gmpz_init_set_si(__e_acsl_22,(long)0);
-        __gmpz_set(__e_acsl_y,(__mpz_struct const *)(__e_acsl_22));
-        __gmpz_clear(__e_acsl_22);
+        mpz_t __gen_e_acsl__22;
+        __gmpz_init_set_si(__gen_e_acsl__22,(long)0);
+        __gmpz_set(__gen_e_acsl_y,(__mpz_struct const *)(__gen_e_acsl__22));
+        __gmpz_clear(__gen_e_acsl__22);
       }
       while (1) {
         {
-          mpz_t __e_acsl_23;
-          int __e_acsl_lt_3;
-          __gmpz_init_set_si(__e_acsl_23,(long)5);
-          __e_acsl_lt_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_y),
-                                     (__mpz_struct const *)(__e_acsl_23));
-          if (__e_acsl_lt_3 < 0) ; else break;
-          __gmpz_clear(__e_acsl_23);
+          mpz_t __gen_e_acsl__23;
+          int __gen_e_acsl_lt_3;
+          __gmpz_init_set_si(__gen_e_acsl__23,(long)5);
+          __gen_e_acsl_lt_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_y),
+                                         (__mpz_struct const *)(__gen_e_acsl__23));
+          if (__gen_e_acsl_lt_3 < 0) ; else break;
+          __gmpz_clear(__gen_e_acsl__23);
         }
         {
-          mpz_t __e_acsl_20;
-          __gmpz_init_set_si(__e_acsl_20,(long)0);
-          __gmpz_set(__e_acsl_z,(__mpz_struct const *)(__e_acsl_20));
-          __gmpz_clear(__e_acsl_20);
+          mpz_t __gen_e_acsl__20;
+          __gmpz_init_set_si(__gen_e_acsl__20,(long)0);
+          __gmpz_set(__gen_e_acsl_z,(__mpz_struct const *)(__gen_e_acsl__20));
+          __gmpz_clear(__gen_e_acsl__20);
         }
         while (1) {
           {
-            int __e_acsl_le_4;
-            __e_acsl_le_4 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_z),
-                                       (__mpz_struct const *)(__e_acsl_y));
-            if (__e_acsl_le_4 <= 0) ; else break;
+            int __gen_e_acsl_le_4;
+            __gen_e_acsl_le_4 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_z),
+                                           (__mpz_struct const *)(__gen_e_acsl_y));
+            if (__gen_e_acsl_le_4 <= 0) ; else break;
           }
           {
-            mpz_t __e_acsl_add_7;
-            mpz_t __e_acsl_19;
-            mpz_t __e_acsl_add_8;
-            int __e_acsl_le_3;
-            __gmpz_init(__e_acsl_add_7);
-            __gmpz_add(__e_acsl_add_7,(__mpz_struct const *)(__e_acsl_x_5),
-                       (__mpz_struct const *)(__e_acsl_z));
-            __gmpz_init_set_si(__e_acsl_19,(long)1);
-            __gmpz_init(__e_acsl_add_8);
-            __gmpz_add(__e_acsl_add_8,(__mpz_struct const *)(__e_acsl_y),
-                       (__mpz_struct const *)(__e_acsl_19));
-            __e_acsl_le_3 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_add_7),
-                                       (__mpz_struct const *)(__e_acsl_add_8));
-            __gmpz_clear(__e_acsl_add_7);
-            __gmpz_clear(__e_acsl_19);
-            __gmpz_clear(__e_acsl_add_8);
-            if (__e_acsl_le_3 <= 0) ;
+            mpz_t __gen_e_acsl_add_7;
+            mpz_t __gen_e_acsl__19;
+            mpz_t __gen_e_acsl_add_8;
+            int __gen_e_acsl_le_3;
+            __gmpz_init(__gen_e_acsl_add_7);
+            __gmpz_add(__gen_e_acsl_add_7,
+                       (__mpz_struct const *)(__gen_e_acsl_x_5),
+                       (__mpz_struct const *)(__gen_e_acsl_z));
+            __gmpz_init_set_si(__gen_e_acsl__19,(long)1);
+            __gmpz_init(__gen_e_acsl_add_8);
+            __gmpz_add(__gen_e_acsl_add_8,
+                       (__mpz_struct const *)(__gen_e_acsl_y),
+                       (__mpz_struct const *)(__gen_e_acsl__19));
+            __gen_e_acsl_le_3 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_add_7),
+                                           (__mpz_struct const *)(__gen_e_acsl_add_8));
+            __gmpz_clear(__gen_e_acsl_add_7);
+            __gmpz_clear(__gen_e_acsl__19);
+            __gmpz_clear(__gen_e_acsl_add_8);
+            if (__gen_e_acsl_le_3 <= 0) ;
             else {
-              __e_acsl_forall_5 = 0;
+              __gen_e_acsl_forall_5 = 0;
               goto e_acsl_end_loop5;
             }
           }
           {
-            mpz_t __e_acsl_21;
-            mpz_t __e_acsl_add_9;
-            __gmpz_init_set_si(__e_acsl_21,1L);
-            __gmpz_init(__e_acsl_add_9);
-            __gmpz_add(__e_acsl_add_9,(__mpz_struct const *)(__e_acsl_z),
-                       (__mpz_struct const *)(__e_acsl_21));
-            __gmpz_set(__e_acsl_z,(__mpz_struct const *)(__e_acsl_add_9));
-            __gmpz_clear(__e_acsl_21);
-            __gmpz_clear(__e_acsl_add_9);
+            mpz_t __gen_e_acsl__21;
+            mpz_t __gen_e_acsl_add_9;
+            __gmpz_init_set_si(__gen_e_acsl__21,1L);
+            __gmpz_init(__gen_e_acsl_add_9);
+            __gmpz_add(__gen_e_acsl_add_9,
+                       (__mpz_struct const *)(__gen_e_acsl_z),
+                       (__mpz_struct const *)(__gen_e_acsl__21));
+            __gmpz_set(__gen_e_acsl_z,
+                       (__mpz_struct const *)(__gen_e_acsl_add_9));
+            __gmpz_clear(__gen_e_acsl__21);
+            __gmpz_clear(__gen_e_acsl_add_9);
           }
         }
         {
-          mpz_t __e_acsl_24;
-          mpz_t __e_acsl_add_10;
-          __gmpz_init_set_si(__e_acsl_24,1L);
-          __gmpz_init(__e_acsl_add_10);
-          __gmpz_add(__e_acsl_add_10,(__mpz_struct const *)(__e_acsl_y),
-                     (__mpz_struct const *)(__e_acsl_24));
-          __gmpz_set(__e_acsl_y,(__mpz_struct const *)(__e_acsl_add_10));
-          __gmpz_clear(__e_acsl_24);
-          __gmpz_clear(__e_acsl_add_10);
+          mpz_t __gen_e_acsl__24;
+          mpz_t __gen_e_acsl_add_10;
+          __gmpz_init_set_si(__gen_e_acsl__24,1L);
+          __gmpz_init(__gen_e_acsl_add_10);
+          __gmpz_add(__gen_e_acsl_add_10,
+                     (__mpz_struct const *)(__gen_e_acsl_y),
+                     (__mpz_struct const *)(__gen_e_acsl__24));
+          __gmpz_set(__gen_e_acsl_y,
+                     (__mpz_struct const *)(__gen_e_acsl_add_10));
+          __gmpz_clear(__gen_e_acsl__24);
+          __gmpz_clear(__gen_e_acsl_add_10);
         }
       }
       {
-        mpz_t __e_acsl_27;
-        mpz_t __e_acsl_add_11;
-        __gmpz_init_set_si(__e_acsl_27,1L);
-        __gmpz_init(__e_acsl_add_11);
-        __gmpz_add(__e_acsl_add_11,(__mpz_struct const *)(__e_acsl_x_5),
-                   (__mpz_struct const *)(__e_acsl_27));
-        __gmpz_set(__e_acsl_x_5,(__mpz_struct const *)(__e_acsl_add_11));
-        __gmpz_clear(__e_acsl_27);
-        __gmpz_clear(__e_acsl_add_11);
+        mpz_t __gen_e_acsl__27;
+        mpz_t __gen_e_acsl_add_11;
+        __gmpz_init_set_si(__gen_e_acsl__27,1L);
+        __gmpz_init(__gen_e_acsl_add_11);
+        __gmpz_add(__gen_e_acsl_add_11,
+                   (__mpz_struct const *)(__gen_e_acsl_x_5),
+                   (__mpz_struct const *)(__gen_e_acsl__27));
+        __gmpz_set(__gen_e_acsl_x_5,
+                   (__mpz_struct const *)(__gen_e_acsl_add_11));
+        __gmpz_clear(__gen_e_acsl__27);
+        __gmpz_clear(__gen_e_acsl_add_11);
       }
     }
     e_acsl_end_loop5: ;
-    __e_acsl_assert(__e_acsl_forall_5,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall_5,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall integer x, integer y, integer z;\n  0 <= x < 2 && 0 <= y < 5 && 0 <= z <= y ==> x+z <= y+1",
                     16);
-    __gmpz_clear(__e_acsl_x_5);
-    __gmpz_clear(__e_acsl_y);
-    __gmpz_clear(__e_acsl_z);
+    __gmpz_clear(__gen_e_acsl_x_5);
+    __gmpz_clear(__gen_e_acsl_y);
+    __gmpz_clear(__gen_e_acsl_z);
   }
   /*@ assert ∃ int x; 0 ≤ x < 10 ∧ x ≡ 5; */
   {
-    int __e_acsl_exists;
-    mpz_t __e_acsl_x_6;
-    __e_acsl_exists = 0;
-    __gmpz_init(__e_acsl_x_6);
+    int __gen_e_acsl_exists;
+    mpz_t __gen_e_acsl_x_6;
+    __gen_e_acsl_exists = 0;
+    __gmpz_init(__gen_e_acsl_x_6);
     {
-      mpz_t __e_acsl_29;
-      __gmpz_init_set_si(__e_acsl_29,(long)0);
-      __gmpz_set(__e_acsl_x_6,(__mpz_struct const *)(__e_acsl_29));
-      __gmpz_clear(__e_acsl_29);
+      mpz_t __gen_e_acsl__29;
+      __gmpz_init_set_si(__gen_e_acsl__29,(long)0);
+      __gmpz_set(__gen_e_acsl_x_6,(__mpz_struct const *)(__gen_e_acsl__29));
+      __gmpz_clear(__gen_e_acsl__29);
     }
     while (1) {
       {
-        mpz_t __e_acsl_30;
-        int __e_acsl_lt_5;
-        __gmpz_init_set_si(__e_acsl_30,(long)10);
-        __e_acsl_lt_5 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_6),
-                                   (__mpz_struct const *)(__e_acsl_30));
-        if (__e_acsl_lt_5 < 0) ; else break;
-        __gmpz_clear(__e_acsl_30);
+        mpz_t __gen_e_acsl__30;
+        int __gen_e_acsl_lt_5;
+        __gmpz_init_set_si(__gen_e_acsl__30,(long)10);
+        __gen_e_acsl_lt_5 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_6),
+                                       (__mpz_struct const *)(__gen_e_acsl__30));
+        if (__gen_e_acsl_lt_5 < 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__30);
       }
       {
-        mpz_t __e_acsl_28;
-        int __e_acsl_eq_5;
-        __gmpz_init_set_si(__e_acsl_28,(long)5);
-        __e_acsl_eq_5 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_6),
-                                   (__mpz_struct const *)(__e_acsl_28));
-        __gmpz_clear(__e_acsl_28);
-        if (! (__e_acsl_eq_5 == 0)) ;
+        mpz_t __gen_e_acsl__28;
+        int __gen_e_acsl_eq_5;
+        __gmpz_init_set_si(__gen_e_acsl__28,(long)5);
+        __gen_e_acsl_eq_5 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_6),
+                                       (__mpz_struct const *)(__gen_e_acsl__28));
+        __gmpz_clear(__gen_e_acsl__28);
+        if (! (__gen_e_acsl_eq_5 == 0)) ;
         else {
-          __e_acsl_exists = 1;
+          __gen_e_acsl_exists = 1;
           goto e_acsl_end_loop6;
         }
       }
       {
-        mpz_t __e_acsl_31;
-        mpz_t __e_acsl_add_12;
-        __gmpz_init_set_si(__e_acsl_31,1L);
-        __gmpz_init(__e_acsl_add_12);
-        __gmpz_add(__e_acsl_add_12,(__mpz_struct const *)(__e_acsl_x_6),
-                   (__mpz_struct const *)(__e_acsl_31));
-        __gmpz_set(__e_acsl_x_6,(__mpz_struct const *)(__e_acsl_add_12));
-        __gmpz_clear(__e_acsl_31);
-        __gmpz_clear(__e_acsl_add_12);
+        mpz_t __gen_e_acsl__31;
+        mpz_t __gen_e_acsl_add_12;
+        __gmpz_init_set_si(__gen_e_acsl__31,1L);
+        __gmpz_init(__gen_e_acsl_add_12);
+        __gmpz_add(__gen_e_acsl_add_12,
+                   (__mpz_struct const *)(__gen_e_acsl_x_6),
+                   (__mpz_struct const *)(__gen_e_acsl__31));
+        __gmpz_set(__gen_e_acsl_x_6,
+                   (__mpz_struct const *)(__gen_e_acsl_add_12));
+        __gmpz_clear(__gen_e_acsl__31);
+        __gmpz_clear(__gen_e_acsl_add_12);
       }
     }
     e_acsl_end_loop6: ;
-    __e_acsl_assert(__e_acsl_exists,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_exists,(char *)"Assertion",(char *)"main",
                     (char *)"\\exists int x; 0 <= x < 10 && x == 5",21);
-    __gmpz_clear(__e_acsl_x_6);
+    __gmpz_clear(__gen_e_acsl_x_6);
   }
   /*@ assert
       ∀ int x;
@@ -413,145 +429,150 @@ int main(void)
         x%2 ≡ 0 ⇒ (∃ ℤ y; 0 ≤ y ≤ x/2 ∧ x ≡ 2*y);
   */
   {
-    int __e_acsl_forall_6;
-    mpz_t __e_acsl_x_7;
-    __e_acsl_forall_6 = 1;
-    __gmpz_init(__e_acsl_x_7);
+    int __gen_e_acsl_forall_6;
+    mpz_t __gen_e_acsl_x_7;
+    __gen_e_acsl_forall_6 = 1;
+    __gmpz_init(__gen_e_acsl_x_7);
     {
-      mpz_t __e_acsl_39;
-      __gmpz_init_set_si(__e_acsl_39,(long)0);
-      __gmpz_set(__e_acsl_x_7,(__mpz_struct const *)(__e_acsl_39));
-      __gmpz_clear(__e_acsl_39);
+      mpz_t __gen_e_acsl__39;
+      __gmpz_init_set_si(__gen_e_acsl__39,(long)0);
+      __gmpz_set(__gen_e_acsl_x_7,(__mpz_struct const *)(__gen_e_acsl__39));
+      __gmpz_clear(__gen_e_acsl__39);
     }
     while (1) {
       {
-        mpz_t __e_acsl_40;
-        int __e_acsl_lt_6;
-        __gmpz_init_set_si(__e_acsl_40,(long)10);
-        __e_acsl_lt_6 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_7),
-                                   (__mpz_struct const *)(__e_acsl_40));
-        if (__e_acsl_lt_6 < 0) ; else break;
-        __gmpz_clear(__e_acsl_40);
+        mpz_t __gen_e_acsl__40;
+        int __gen_e_acsl_lt_6;
+        __gmpz_init_set_si(__gen_e_acsl__40,(long)10);
+        __gen_e_acsl_lt_6 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_7),
+                                       (__mpz_struct const *)(__gen_e_acsl__40));
+        if (__gen_e_acsl_lt_6 < 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__40);
       }
       {
-        mpz_t __e_acsl_32;
-        mpz_t __e_acsl_33;
-        int __e_acsl_mod_guard;
-        mpz_t __e_acsl_mod;
-        int __e_acsl_eq_6;
-        int __e_acsl_implies;
-        __gmpz_init_set_si(__e_acsl_32,(long)2);
-        __gmpz_init_set_si(__e_acsl_33,0L);
-        __e_acsl_mod_guard = __gmpz_cmp((__mpz_struct const *)(__e_acsl_32),
-                                        (__mpz_struct const *)(__e_acsl_33));
-        __gmpz_init(__e_acsl_mod);
+        mpz_t __gen_e_acsl__32;
+        mpz_t __gen_e_acsl__33;
+        int __gen_e_acsl_mod_guard;
+        mpz_t __gen_e_acsl_mod;
+        int __gen_e_acsl_eq_6;
+        int __gen_e_acsl_implies;
+        __gmpz_init_set_si(__gen_e_acsl__32,(long)2);
+        __gmpz_init_set_si(__gen_e_acsl__33,0L);
+        __gen_e_acsl_mod_guard = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__32),
+                                            (__mpz_struct const *)(__gen_e_acsl__33));
+        __gmpz_init(__gen_e_acsl_mod);
         /*@ assert E_ACSL: 2 ≢ 0; */
-        __e_acsl_assert(! (__e_acsl_mod_guard == 0),(char *)"Assertion",
+        __e_acsl_assert(! (__gen_e_acsl_mod_guard == 0),(char *)"Assertion",
                         (char *)"main",(char *)"2 == 0",26);
-        __gmpz_tdiv_r(__e_acsl_mod,(__mpz_struct const *)(__e_acsl_x_7),
-                      (__mpz_struct const *)(__e_acsl_32));
-        __e_acsl_eq_6 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_mod),
-                                   (__mpz_struct const *)(__e_acsl_33));
-        if (! (__e_acsl_eq_6 == 0)) __e_acsl_implies = 1;
+        __gmpz_tdiv_r(__gen_e_acsl_mod,
+                      (__mpz_struct const *)(__gen_e_acsl_x_7),
+                      (__mpz_struct const *)(__gen_e_acsl__32));
+        __gen_e_acsl_eq_6 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_mod),
+                                       (__mpz_struct const *)(__gen_e_acsl__33));
+        if (! (__gen_e_acsl_eq_6 == 0)) __gen_e_acsl_implies = 1;
         else {
-          int __e_acsl_exists_2;
-          mpz_t __e_acsl_y_2;
-          __e_acsl_exists_2 = 0;
-          __gmpz_init(__e_acsl_y_2);
+          int __gen_e_acsl_exists_2;
+          mpz_t __gen_e_acsl_y_2;
+          __gen_e_acsl_exists_2 = 0;
+          __gmpz_init(__gen_e_acsl_y_2);
           {
-            mpz_t __e_acsl_35;
-            __gmpz_init_set_si(__e_acsl_35,(long)0);
-            __gmpz_set(__e_acsl_y_2,(__mpz_struct const *)(__e_acsl_35));
-            __gmpz_clear(__e_acsl_35);
+            mpz_t __gen_e_acsl__35;
+            __gmpz_init_set_si(__gen_e_acsl__35,(long)0);
+            __gmpz_set(__gen_e_acsl_y_2,
+                       (__mpz_struct const *)(__gen_e_acsl__35));
+            __gmpz_clear(__gen_e_acsl__35);
           }
           while (1) {
             {
-              mpz_t __e_acsl_36;
-              mpz_t __e_acsl_37;
-              int __e_acsl_div_guard;
-              mpz_t __e_acsl_div;
-              int __e_acsl_le_5;
-              __gmpz_init_set_si(__e_acsl_36,(long)2);
-              __gmpz_init_set_si(__e_acsl_37,0L);
-              __e_acsl_div_guard = __gmpz_cmp((__mpz_struct const *)(__e_acsl_36),
-                                              (__mpz_struct const *)(__e_acsl_37));
-              __gmpz_init(__e_acsl_div);
+              mpz_t __gen_e_acsl__36;
+              mpz_t __gen_e_acsl__37;
+              int __gen_e_acsl_div_guard;
+              mpz_t __gen_e_acsl_div;
+              int __gen_e_acsl_le_5;
+              __gmpz_init_set_si(__gen_e_acsl__36,(long)2);
+              __gmpz_init_set_si(__gen_e_acsl__37,0L);
+              __gen_e_acsl_div_guard = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl__36),
+                                                  (__mpz_struct const *)(__gen_e_acsl__37));
+              __gmpz_init(__gen_e_acsl_div);
               /*@ assert E_ACSL: 2 ≢ 0; */
-              __e_acsl_assert(! (__e_acsl_div_guard == 0),
+              __e_acsl_assert(! (__gen_e_acsl_div_guard == 0),
                               (char *)"Assertion",(char *)"main",
                               (char *)"2 == 0",26);
-              __gmpz_tdiv_q(__e_acsl_div,
-                            (__mpz_struct const *)(__e_acsl_x_7),
-                            (__mpz_struct const *)(__e_acsl_36));
-              __e_acsl_le_5 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_y_2),
-                                         (__mpz_struct const *)(__e_acsl_div));
-              if (__e_acsl_le_5 <= 0) ; else break;
-              __gmpz_clear(__e_acsl_36);
-              __gmpz_clear(__e_acsl_37);
-              __gmpz_clear(__e_acsl_div);
+              __gmpz_tdiv_q(__gen_e_acsl_div,
+                            (__mpz_struct const *)(__gen_e_acsl_x_7),
+                            (__mpz_struct const *)(__gen_e_acsl__36));
+              __gen_e_acsl_le_5 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_y_2),
+                                             (__mpz_struct const *)(__gen_e_acsl_div));
+              if (__gen_e_acsl_le_5 <= 0) ; else break;
+              __gmpz_clear(__gen_e_acsl__36);
+              __gmpz_clear(__gen_e_acsl__37);
+              __gmpz_clear(__gen_e_acsl_div);
             }
             {
-              mpz_t __e_acsl_34;
-              mpz_t __e_acsl_mul;
-              int __e_acsl_eq_7;
-              __gmpz_init_set_si(__e_acsl_34,(long)2);
-              __gmpz_init(__e_acsl_mul);
-              __gmpz_mul(__e_acsl_mul,(__mpz_struct const *)(__e_acsl_34),
-                         (__mpz_struct const *)(__e_acsl_y_2));
-              __e_acsl_eq_7 = __gmpz_cmp((__mpz_struct const *)(__e_acsl_x_7),
-                                         (__mpz_struct const *)(__e_acsl_mul));
-              __gmpz_clear(__e_acsl_34);
-              __gmpz_clear(__e_acsl_mul);
-              if (! (__e_acsl_eq_7 == 0)) ;
+              mpz_t __gen_e_acsl__34;
+              mpz_t __gen_e_acsl_mul;
+              int __gen_e_acsl_eq_7;
+              __gmpz_init_set_si(__gen_e_acsl__34,(long)2);
+              __gmpz_init(__gen_e_acsl_mul);
+              __gmpz_mul(__gen_e_acsl_mul,
+                         (__mpz_struct const *)(__gen_e_acsl__34),
+                         (__mpz_struct const *)(__gen_e_acsl_y_2));
+              __gen_e_acsl_eq_7 = __gmpz_cmp((__mpz_struct const *)(__gen_e_acsl_x_7),
+                                             (__mpz_struct const *)(__gen_e_acsl_mul));
+              __gmpz_clear(__gen_e_acsl__34);
+              __gmpz_clear(__gen_e_acsl_mul);
+              if (! (__gen_e_acsl_eq_7 == 0)) ;
               else {
-                __e_acsl_exists_2 = 1;
+                __gen_e_acsl_exists_2 = 1;
                 goto e_acsl_end_loop7;
               }
             }
             {
-              mpz_t __e_acsl_38;
-              mpz_t __e_acsl_add_13;
-              __gmpz_init_set_si(__e_acsl_38,1L);
-              __gmpz_init(__e_acsl_add_13);
-              __gmpz_add(__e_acsl_add_13,
-                         (__mpz_struct const *)(__e_acsl_y_2),
-                         (__mpz_struct const *)(__e_acsl_38));
-              __gmpz_set(__e_acsl_y_2,
-                         (__mpz_struct const *)(__e_acsl_add_13));
-              __gmpz_clear(__e_acsl_38);
-              __gmpz_clear(__e_acsl_add_13);
+              mpz_t __gen_e_acsl__38;
+              mpz_t __gen_e_acsl_add_13;
+              __gmpz_init_set_si(__gen_e_acsl__38,1L);
+              __gmpz_init(__gen_e_acsl_add_13);
+              __gmpz_add(__gen_e_acsl_add_13,
+                         (__mpz_struct const *)(__gen_e_acsl_y_2),
+                         (__mpz_struct const *)(__gen_e_acsl__38));
+              __gmpz_set(__gen_e_acsl_y_2,
+                         (__mpz_struct const *)(__gen_e_acsl_add_13));
+              __gmpz_clear(__gen_e_acsl__38);
+              __gmpz_clear(__gen_e_acsl_add_13);
             }
           }
           e_acsl_end_loop7: ;
-          __e_acsl_implies = __e_acsl_exists_2;
-          __gmpz_clear(__e_acsl_y_2);
+          __gen_e_acsl_implies = __gen_e_acsl_exists_2;
+          __gmpz_clear(__gen_e_acsl_y_2);
         }
-        __gmpz_clear(__e_acsl_32);
-        __gmpz_clear(__e_acsl_33);
-        __gmpz_clear(__e_acsl_mod);
-        if (__e_acsl_implies) ;
+        __gmpz_clear(__gen_e_acsl__32);
+        __gmpz_clear(__gen_e_acsl__33);
+        __gmpz_clear(__gen_e_acsl_mod);
+        if (__gen_e_acsl_implies) ;
         else {
-          __e_acsl_forall_6 = 0;
+          __gen_e_acsl_forall_6 = 0;
           goto e_acsl_end_loop8;
         }
       }
       {
-        mpz_t __e_acsl_41;
-        mpz_t __e_acsl_add_14;
-        __gmpz_init_set_si(__e_acsl_41,1L);
-        __gmpz_init(__e_acsl_add_14);
-        __gmpz_add(__e_acsl_add_14,(__mpz_struct const *)(__e_acsl_x_7),
-                   (__mpz_struct const *)(__e_acsl_41));
-        __gmpz_set(__e_acsl_x_7,(__mpz_struct const *)(__e_acsl_add_14));
-        __gmpz_clear(__e_acsl_41);
-        __gmpz_clear(__e_acsl_add_14);
+        mpz_t __gen_e_acsl__41;
+        mpz_t __gen_e_acsl_add_14;
+        __gmpz_init_set_si(__gen_e_acsl__41,1L);
+        __gmpz_init(__gen_e_acsl_add_14);
+        __gmpz_add(__gen_e_acsl_add_14,
+                   (__mpz_struct const *)(__gen_e_acsl_x_7),
+                   (__mpz_struct const *)(__gen_e_acsl__41));
+        __gmpz_set(__gen_e_acsl_x_7,
+                   (__mpz_struct const *)(__gen_e_acsl_add_14));
+        __gmpz_clear(__gen_e_acsl__41);
+        __gmpz_clear(__gen_e_acsl_add_14);
       }
     }
     e_acsl_end_loop8: ;
-    __e_acsl_assert(__e_acsl_forall_6,(char *)"Assertion",(char *)"main",
+    __e_acsl_assert(__gen_e_acsl_forall_6,(char *)"Assertion",(char *)"main",
                     (char *)"\\forall int x;\n  0 <= x < 10 ==> x%2 == 0 ==> (\\exists integer y; 0 <= y <= x/2 && x == 2*y)",
                     25);
-    __gmpz_clear(__e_acsl_x_7);
+    __gmpz_clear(__gen_e_acsl_x_7);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/integer_constant.0.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/integer_constant.0.res.oracle
index 72e347a9dd86cdcbf3b17f1bbed69afe26809b6b..2ff8c45458a3144b29d7e48f55468cc2c0e28ba7 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/integer_constant.0.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/integer_constant.0.res.oracle
@@ -9,10 +9,10 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 [value] using specification for function __e_acsl_assert
 [value] using specification for function __gmpz_init_set_str
 [value] using specification for function __gmpz_cmp
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/integer_constant.1.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/integer_constant.1.res.oracle
index 0902645baf685a92604378cae9b4e69668f47bb2..edfe124170d9a363bbaa91463b34b8d0d860156e 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/integer_constant.1.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/integer_constant.1.res.oracle
@@ -9,11 +9,11 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 [value] using specification for function __gmpz_init_set_si
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 [value] using specification for function __gmpz_init_set_ui
 [value] using specification for function __gmpz_init_set_str
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/longlong.0.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/longlong.0.res.oracle
index 662538e38aa62051af9c1ff20a545fa3f83769d4..2f042804fd10bee5818f2a501e1be65734ba2989 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/longlong.0.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/longlong.0.res.oracle
@@ -9,7 +9,7 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 tests/gmp/longlong.i:9:[value] warning: recursive call during value analysis
                  of my_pow (my_pow <- my_pow :: tests/gmp/longlong.i:16 <- main).
                  Using specification of my_pow.
@@ -26,10 +26,10 @@ FRAMAC_SHARE/e-acsl/e_acsl_gmp.h:88:[value] warning: function __gmpz_import: pre
 [value] using specification for function __gmpz_add
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_tdiv_r
 [value] using specification for function __gmpz_get_ui
 tests/gmp/longlong.i:17:[kernel] warning: pointer comparison.
-                  assert \pointer_comparable((void *)__e_acsl_4, (void *)1);
+                  assert \pointer_comparable((void *)__gen_e_acsl__4, (void *)1);
 [value] using specification for function __gmpz_clear
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/longlong.1.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/longlong.1.res.oracle
index f427ed71dbdb6794359520bdb7607831881e06bb..b179c58367a0278736a6301a9621fb54b4903006 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/longlong.1.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/longlong.1.res.oracle
@@ -9,7 +9,7 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 tests/gmp/longlong.i:9:[value] warning: recursive call during value analysis
                  of my_pow (my_pow <- my_pow :: tests/gmp/longlong.i:16 <- main).
                  Using specification of my_pow.
@@ -26,9 +26,9 @@ FRAMAC_SHARE/e-acsl/e_acsl_gmp.h:88:[value] warning: function __gmpz_import: pre
 [value] using specification for function __gmpz_add
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_tdiv_r
 tests/gmp/longlong.i:17:[kernel] warning: pointer comparison.
-                  assert \pointer_comparable((void *)__e_acsl_eq, (void *)0);
+                  assert \pointer_comparable((void *)__gen_e_acsl_eq, (void *)0);
 [value] using specification for function __gmpz_clear
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/not.0.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/not.0.res.oracle
index f98f864d40ed796f04c2593c72ac29d8f3f852d2..1d4b881cde000c9b9407b3f00775a5d89b8b6292 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/not.0.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/not.0.res.oracle
@@ -9,6 +9,6 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 [value] using specification for function __e_acsl_assert
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/not.1.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/not.1.res.oracle
index b6597a3f39be3514e2960533ed29bdfceb38176a..ab685a9dcbfa8f32c5f154df5a1c12fb0b8a68d6 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/not.1.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/not.1.res.oracle
@@ -9,10 +9,10 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 [value] using specification for function __gmpz_init_set_si
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 [value] using specification for function __gmpz_clear
 [value] done for function main
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/quantif.0.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/quantif.0.res.oracle
index 66012aa1b4a7ecf99c6d7ea8924a20fbc20302d9..ae1470a955d07b10b62800273ffeded10fa8f76f 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/quantif.0.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/quantif.0.res.oracle
@@ -9,7 +9,7 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 tests/gmp/quantif.i:9:[value] warning: assertion got status unknown.
 tests/gmp/quantif.i:9:[value] entering loop for the first time
 [value] using specification for function __e_acsl_assert
@@ -21,7 +21,7 @@ tests/gmp/quantif.i:12:[value] warning: assertion got status unknown.
 tests/gmp/quantif.i:12:[value] entering loop for the first time
 tests/gmp/quantif.i:16:[value] warning: assertion got status unknown.
 tests/gmp/quantif.i:16:[value] entering loop for the first time
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/gmp/quantif.i:21:[value] warning: assertion got status unknown.
 tests/gmp/quantif.i:21:[value] entering loop for the first time
 tests/gmp/quantif.i:25:[value] warning: assertion got status unknown.
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/quantif.1.res.oracle b/src/plugins/e-acsl/tests/gmp/oracle/quantif.1.res.oracle
index 36020f554bf807b63bcda828e93672105a8c13d7..96311d73dca3032626a714a8ee5a7ff92d1b19b1 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/quantif.1.res.oracle
+++ b/src/plugins/e-acsl/tests/gmp/oracle/quantif.1.res.oracle
@@ -9,7 +9,7 @@
   __fc_heap_status ∈ [--..--]
   __e_acsl_init ∈ [--..--]
   __e_acsl_internal_heap ∈ [--..--]
-  __heap_size ∈ [--..--]
+  __e_acsl_heap_size ∈ [--..--]
 tests/gmp/quantif.i:9:[value] warning: assertion got status unknown.
 [value] using specification for function __gmpz_init
 [value] using specification for function __gmpz_init_set_si
@@ -19,7 +19,7 @@ tests/gmp/quantif.i:9:[value] entering loop for the first time
 [value] using specification for function __gmpz_cmp
 [value] using specification for function __gmpz_add
 [value] using specification for function __e_acsl_assert
-FRAMAC_SHARE/e-acsl/e_acsl.h:34:[value] warning: function __e_acsl_assert: precondition got status unknown.
+FRAMAC_SHARE/e-acsl/e_acsl.h:43:[value] warning: function __e_acsl_assert: precondition got status unknown.
 tests/gmp/quantif.i:10:[value] warning: assertion got status unknown.
 tests/gmp/quantif.i:10:[value] entering loop for the first time
 tests/gmp/quantif.i:11:[value] warning: assertion got status unknown.