diff --git a/INSTALL.txt b/INSTALL.txt
index 4a0c9ab516498855471074df8d505399e7db7da3..1e0e407b9f60f9f77175a781c9b0e28f115b48f0 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: f18f39371674b0f4c7f38291763044f1) *)
+(* DO NOT EDIT (digest: 3a2bd6bdb1ae972c49dabc09cbadeb27) *)
 
 This is the INSTALL file for the lustre-v6 distribution.
 
@@ -13,8 +13,8 @@ In order to compile this package, you will need:
 
 * ocaml (>= 4.02)
 * findlib
-* lutils for executable lus2lic, executable lus2lic.dbg
-* extlib for executable lus2lic, executable lus2lic.dbg
+* lutils for executable lv6, executable lv6.dbg
+* extlib for executable lv6, executable lv6.dbg
 * rdbg-plugin (>= 1.109) for library lustre-v6
 
 Installing
diff --git a/_oasis b/_oasis
index 0550e5d08185a149d1d37cd78d971ea1dca7fcf5..753fd9d881447135eafc718912f7b00337c8b6d2 100644
--- a/_oasis
+++ b/_oasis
@@ -1,9 +1,9 @@
 OASISFormat: 0.4
 Name:        lustre-v6
-Version:     1.734
+Version:     1.736
 Synopsis:    The Lustre V6 Verimag compiler
 Description: This package contains:
- - lus2lic: the (current) name of the compiler (and interpreter via -exec)
+ - lv6: the (current) name of the compiler (and interpreter via -exec)
  - the lustre-v6 ocaml lib: allows to call the Lustre v6 interpreter from ocaml
  - the lustre-v6 rdbg plugin: allows to debug Lustre v6 program wth rdbg
 Authors:     Erwan Jahier and Pascal Raymond
@@ -21,7 +21,7 @@ SourceRepository master
 
 
 # distribution version (native)
-Executable lus2lic
+Executable lv6
   Install:true
   Path:       src/
   MainIs:     main.ml
@@ -31,7 +31,7 @@ Executable lus2lic
   CompiledObject: native
 
 # debug-able version (bytecode)
-Executable "lus2lic.dbg"
+Executable "lv6.dbg"
   Install:false
   Path:       src/
   MainIs:     main.ml
@@ -51,7 +51,7 @@ Executable "lus2lic.dbg"
 
 Library "lustre-v6"
   XMETADescription: an API to call the Lustre v6 interpreter from rdbg (and ocaml as a side effect)
-  Modules:    Lus2licRun
+  Modules:    Lv6Run
   Path:       src/
   BuildTools: ocamlbuild 
   BuildDepends: str,unix,num,rdbg-plugin (>= 1.109) 
diff --git a/_tags b/_tags
index 15090ec4bc233807cb7c02cb79e3267f0fb8b1bb..700f2a62172a9b85afc9eda7df89412df844bb80 100644
--- a/_tags
+++ b/_tags
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 3ce48e4daebf64bc6bc0cbdb896e21f9)
+# DO NOT EDIT (digest: 1bbce7c5352daeb22141220fb1394d4f)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -14,13 +14,13 @@ true: annot, bin_annot
 ".git": not_hygienic
 "_darcs": -traverse
 "_darcs": not_hygienic
-# Executable lus2lic
+# Executable lv6
 "src/main.native": package(extlib)
 "src/main.native": package(lutils)
 "src/main.native": package(num)
 "src/main.native": package(str)
 "src/main.native": package(unix)
-# Executable lus2lic.dbg
+# Executable lv6.dbg
 "src/main.byte": package(extlib)
 "src/main.byte": package(lutils)
 "src/main.byte": package(num)
diff --git a/lustre-v6.install b/lustre-v6.install
index 444093900456084ab3462abb04fcd18bd7255b07..c87e0671a78b1e6df53e7711d9d35cdd4169b246 100644
--- a/lustre-v6.install
+++ b/lustre-v6.install
@@ -9,6 +9,6 @@ doc: [
 ]
 
 bin: [
-  "utils/lv6"
+  "utils/lus2lic"
   "utils/lustrequiv"
 ]
diff --git a/lv6-ref-man/lv6-ref-man.pdf b/lv6-ref-man/lv6-ref-man.pdf
index 9f7a1bbee3476b878dd7d7a3110cd4a039294990..5befa985f8a6c3a6636cdd6846a689161c01b171 100644
Binary files a/lv6-ref-man/lv6-ref-man.pdf and b/lv6-ref-man/lv6-ref-man.pdf differ
diff --git a/src/genOcamlGlue.ml b/src/genOcamlGlue.ml
index 241b4f28299401d4f96eee49053fc86e47ade351..4f828318dbed8be42990459e51f7b77b9762d32f 100644
--- a/src/genOcamlGlue.ml
+++ b/src/genOcamlGlue.ml
@@ -1,7 +1,7 @@
-(* Time-stamp: <modified the 08/07/2015 (at 17:53) by Erwan Jahier> *)
+(* Time-stamp: <modified the 28/03/2018 (at 11:02) by Erwan Jahier> *)
 
 (* generate ocaml glue code that makes it possible to call lus2lic
-   from ocaml with the current set of arguments (with Lus2licRun.make).
+   from ocaml with the current set of arguments (with Lv6Run.make).
 *)
 open Lv6MainArgs
 
@@ -24,7 +24,7 @@ let (f: string array -> Lv6MainArgs.t -> unit) =
     Printf.fprintf oc "
 let plugin = 
   let args = Array.of_list [%s] in
-  Lus2licRun.make args
+  Lv6Run.make args
 
 let dyn_file = (Dynlink.adapt_filename \"%s\")
 let _ = 
diff --git a/src/lustre-v6.mldylib b/src/lustre-v6.mldylib
index 64f92c559070357c0cf5bd90f3f77b37b28669e5..b73a63246b57f0c4777bf5b67255bf0ab48b1808 100644
--- a/src/lustre-v6.mldylib
+++ b/src/lustre-v6.mldylib
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: d031f6402d873c25d477fea574448e75)
-Lus2licRun
+# DO NOT EDIT (digest: 4cf9f01e783e28cb816b23025ed9d4eb)
+Lv6Run
 SocExecValue
 SocUtils
 Lv6util
diff --git a/src/lustre-v6.mllib b/src/lustre-v6.mllib
index 64f92c559070357c0cf5bd90f3f77b37b28669e5..b73a63246b57f0c4777bf5b67255bf0ab48b1808 100644
--- a/src/lustre-v6.mllib
+++ b/src/lustre-v6.mllib
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: d031f6402d873c25d477fea574448e75)
-Lus2licRun
+# DO NOT EDIT (digest: 4cf9f01e783e28cb816b23025ed9d4eb)
+Lv6Run
 SocExecValue
 SocUtils
 Lv6util
diff --git a/src/lv6MainArgs.ml b/src/lv6MainArgs.ml
index 0d34e5968c9c14429cf3352b8c185ccd9af2c584..79b38a10e76cf46176468ea427987595b6bfa1c8 100644
--- a/src/lv6MainArgs.ml
+++ b/src/lv6MainArgs.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 18/08/2017 (at 15:08) by Erwan Jahier> *)
+(* Time-stamp: <modified the 28/03/2018 (at 11:02) by Erwan Jahier> *)
 (*
 Le manager d'argument adapté de celui de lutin, plus joli
 N.B. solution un peu batarde : les options sont stockées, comme avant, dans Global,
@@ -309,8 +309,8 @@ let mkoptab (opt:t) : unit = (
     mkopt opt ~doc_level:Advanced
       ["-ocaml"]
       (Arg.Unit(function s -> opt.gen_ocaml <- true))
-      ["generate ocaml glue code that makes it possible to call the lus2lic interpreter ";
-       "from ocaml with the current set of arguments (with Lus2licRun.make)"]
+      ["generate ocaml glue code that makes it possible to call the lv6 interpreter ";
+       "from ocaml with the current set of arguments (with Lv6Run.make)"]
     ;
 
     mkopt opt ~doc_level:Advanced
diff --git a/src/lus2licRun.ml b/src/lv6Run.ml
similarity index 96%
rename from src/lus2licRun.ml
rename to src/lv6Run.ml
index 448681a7d177b3de749672733e2d051e84d33532..fa3a3819d3587224186c575ef6ae1293fb8e52a7 100644
--- a/src/lus2licRun.ml
+++ b/src/lv6Run.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 25/03/2018 (at 22:59) by Erwan Jahier> *)
+(* Time-stamp: <modified the 28/03/2018 (at 10:53) by Erwan Jahier> *)
 (*-----------------------------------------------------------------------
 ** Copyright (C) - Verimag.
 *)
@@ -94,7 +94,7 @@ let make_do argv opt =
   let (mems_in  : Data.subst list) = [] in (* XXX todo *)
   let (mems_out : Data.subst list) = [] in (* XXX todo *)
   {
-    id = Printf.sprintf "%s (with lus2lic Version %s)"
+    id = Printf.sprintf "%s (with lv6 Version %s)"
                         (String.concat " " (Array.to_list argv)) Lv6version.str;
     inputs = vntl_i;
     outputs= vntl_o;
@@ -149,7 +149,7 @@ let make argv =
      my_exit opt 1
   | Assert_failure (file, line, col)  -> 
      prerr_string (
-         "\nError: oops, lus2lic internal error\n\tFile \""^ file ^
+         "\nError: oops, lv6 internal error\n\tFile \""^ file ^
            "\", line " ^ (string_of_int line) ^ ", column " ^
              (string_of_int col) ^ "\nError: when compiling lustre program" ^
                (if List.length opt.infiles > 1 then "s " else " ") ^
diff --git a/src/lus2licRun.mli b/src/lv6Run.mli
similarity index 100%
rename from src/lus2licRun.mli
rename to src/lv6Run.mli
diff --git a/src/lv6util.ml b/src/lv6util.ml
index 3897d86e64520ddbbd392960fec57a6997a2f68f..e46ce81de9b7ceed81e388b73cb3d51c3baaa4cb 100644
--- a/src/lv6util.ml
+++ b/src/lv6util.ml
@@ -25,10 +25,10 @@ let (entete : out_channel -> string -> string -> unit) =
    (*   and user = Unix.getlogin () *)
     and hostname = Unix.gethostname ()
     in
-      (* Printf.fprintf oc "-- lus2lic version %s\n" LustreVersion.str; *)
+      (* Printf.fprintf oc "-- lv6 version %s\n" LustreVersion.str; *)
       (* Printf.fprintf oc "-- cmd: %s\n" sys_call; *)
       (* Printf.fprintf oc "-- host: %s date: %s time: %s\n" hostname date time_str  *)
-    Printf.fprintf oc "%s This file was generated by lus2lic version %s. %s\n"
+    Printf.fprintf oc "%s This file was generated by lv6 version %s. %s\n"
       cb Lv6version.str ce;
     Printf.fprintf oc "%s %s %s\n" cb sys_call ce;
     Printf.fprintf oc "%s on %s the %s at %s %s\n" cb hostname date time_str ce
diff --git a/src/lv6version.ml b/src/lv6version.ml
index 8aee69635139c48df8fc2b892eaa42880bbdabc2..9da1d850fce661aebc105ecf1f86851f082293a3 100644
--- a/src/lv6version.ml
+++ b/src/lv6version.ml
@@ -1,7 +1,7 @@
 (** Automatically generated from Makefile *) 
-let tool = "lus2lic"
+let tool = "lv6"
 let branch = "master"
-let commit = "735"
-let sha_1 = "8abbfca9d55f544bd32843ea5f36c6f0860d65b0"
+let commit = "736"
+let sha_1 = "a07e17b8b31c25b6c40eb5e56168e6b07a5f9794"
 let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
 let maintainer = "erwan.jahier@univ-grenoble-alpes.fr"
diff --git a/src/main.ml b/src/main.ml
index a948821ba5dea263ec8a65a25e3d61b05464cb99..902edb0121794fc313c8774d079d935b3b7b7ea9 100644
--- a/src/main.ml
+++ b/src/main.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 25/03/2018 (at 22:27) by Erwan Jahier> *)
+(* Time-stamp: <modified the 28/03/2018 (at 11:00) by Erwan Jahier> *)
 
 open Lv6Verbose
 open AstV6
@@ -332,7 +332,7 @@ let main () = (
        my_exit opt 1
     | Assert_failure (file, line, col)  -> 
       prerr_string (
-        "\nError: oops, lus2lic internal error\n\tFile \""^ file ^
+        "\nError: oops, lv6 internal error\n\tFile \""^ file ^
           "\", line " ^ (string_of_int line) ^ ", column " ^
           (string_of_int col) ^ "\nError: when compiling lustre program" ^
           (if List.length opt.infiles > 1 then "s " else " ") ^
diff --git a/src/soc2c.ml b/src/soc2c.ml
index db5fb2589349d5bb6f21e9c881b7e384e737baef..9b6abfd9a32a9dd2fc76ccce3162bc47838c432a 100644
--- a/src/soc2c.ml
+++ b/src/soc2c.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 22/03/2018 (at 08:43) by Erwan Jahier> *)
+(* Time-stamp: <modified the 28/03/2018 (at 10:55) by Erwan Jahier> *)
 
 
 (* let put (os: out_channel) (fmt:('a, unit, string, unit) format4) : 'a = *)
@@ -853,7 +853,7 @@ let (gen_loop_file4ogensim : Soc.t -> string -> out_channel -> Soc.tbl -> unit)
         "
 
 (****************************************************************************)
-(* The entry point for lus2lic --to-c *)
+(* The entry point for lv6 --to-c *)
 let (f : Lv6MainArgs.t -> Soc.key -> Soc.tbl -> LicPrg.t -> unit) =
   fun args msoc stbl licprg -> 
   let socs = Soc.SocMap.bindings stbl in
@@ -1011,7 +1011,7 @@ xpdf=\"true\"
 OGENSIM=${OGENSIM:-\"osim.arm\"}
 OTAWA=${OTAWA:-\"owcet.arm\"}
 ORANGE=${ORANGE:-\"orange\"}
-LUSTREV6=${LUSTREV6:-\"lus2lic\"}
+LUSTREV6=${LUSTREV6:-\"lv6\"}
 fixffx=${fixffx:-\"fixffx\"}
 mkff=${mkff:-\"mkff\"}
 lutin=${lutin:-\"lutin\"}
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index 75ed0e25b35df827618cd323ecd947701cee6d1b..1ee480a54293212f7fbb28082905a8b881824995 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
 ==> lus2lic0.sum <==
-Test Run By jahier on Sun Mar 25 23:05:19 
+Test Run By jahier on Wed Mar 28 10:57:48 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic0 tests ===
@@ -66,7 +66,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/lecte
 XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/s.lus
 
 ==> lus2lic1.sum <==
-Test Run By jahier on Sun Mar 25 23:05:19 
+Test Run By jahier on Wed Mar 28 10:57:48 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic1 tests ===
@@ -409,7 +409,7 @@ PASS: sh multipar.sh
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus  {}
 
 ==> lus2lic2.sum <==
-Test Run By jahier on Sun Mar 25 23:06:09 
+Test Run By jahier on Wed Mar 28 10:58:29 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic2 tests ===
@@ -749,7 +749,7 @@ PASS: sh zzz2.sh
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus  {}
 
 ==> lus2lic3.sum <==
-Test Run By jahier on Sun Mar 25 23:06:55 
+Test Run By jahier on Wed Mar 28 10:59:16 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic3 tests ===
@@ -977,7 +977,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node contractForElement
 PASS: ./lus2lic {} {-o convert.lic convert.lus}
 PASS: ./lus2lic {-ec -o convert.ec convert.lus}
 PASS: ./myec2c {-o convert.c convert.ec}
-PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node convert.lus {}
+FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node convert.lus {}
 PASS: ./lus2lic {} {-o count.lic count.lus}
 PASS: ./lus2lic {-ec -o count.ec count.lus}
 PASS: ./myec2c {-o count.c count.ec}
@@ -1258,7 +1258,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
 
 
 ==> lus2lic4.sum <==
-Test Run By jahier on Sun Mar 25 23:07:56 
+Test Run By jahier on Wed Mar 28 11:00:16 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic4 tests ===
@@ -1763,8 +1763,8 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
 ==> lus2lic3.sum <==
 		=== lus2lic3 Summary ===
 
-# of expected passes		490
-# of unexpected failures	5
+# of expected passes		489
+# of unexpected failures	6
 # of unresolved testcases	1
 
 ==> lus2lic4.sum <==
@@ -1774,15 +1774,15 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
 # of expected passes		464
 # of unexpected failures	7
 ===============================
-# Total number of failures: 15
+# Total number of failures: 16
 lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 50 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 46 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 61 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 33 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 41 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 47 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 60 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 34 seconds
 * Ref time: 
-125.16user 27.33system 3:09.85elapsed 80%CPU (0avgtext+0avgdata 283484maxresident)k
-0inputs+6068528outputs (0major+17946845minor)pagefaults 0swaps
+122.82user 27.77system 3:02.24elapsed 82%CPU (0avgtext+0avgdata 283576maxresident)k
+0inputs+6070144outputs (0major+17942737minor)pagefaults 0swaps
 * Quick time (-j 4):
-154.19user 30.98system 1:44.92elapsed 176%CPU (0avgtext+0avgdata 283500maxresident)k
-0inputs+5933600outputs (0major+17590195minor)pagefaults 0swaps
+157.04user 32.24system 1:45.81elapsed 178%CPU (0avgtext+0avgdata 283568maxresident)k
+0inputs+6025392outputs (0major+17845137minor)pagefaults 0swaps
diff --git a/utils/lus2lic b/utils/lus2lic
new file mode 100755
index 0000000000000000000000000000000000000000..d798a5a80f6046bba92e15a789d4d09680fc840d
--- /dev/null
+++ b/utils/lus2lic
@@ -0,0 +1 @@
+lv6 $@
diff --git a/utils/lv6 b/utils/lv6
deleted file mode 100755
index ee4bb58aa3ebd848af3ca78d2b1fd1c992c17985..0000000000000000000000000000000000000000
--- a/utils/lv6
+++ /dev/null
@@ -1 +0,0 @@
-lus2lic $@