diff --git a/jscomp/stdlib/filename.js b/jscomp/stdlib/filename.js
index 05582def95..9aa2445929 100644
--- a/jscomp/stdlib/filename.js
+++ b/jscomp/stdlib/filename.js
@@ -235,7 +235,7 @@ function chop_extension(name) {
 
 var prng = {
   0: function () {
-    return Caml_curry.app1(Random.State[1], /* () */0);
+    return Caml_curry.app1(Random.State[/* make_self_init */1], /* () */0);
   },
   length: 1,
   tag: 246
@@ -243,7 +243,7 @@ var prng = {
 
 function temp_file_name(temp_dir, prefix, suffix) {
   var tag = prng.tag | 0;
-  var rnd = Caml_curry.app1(Random.State[3], tag === 250 ? prng[0] : (
+  var rnd = Caml_curry.app1(Random.State[/* bits */3], tag === 250 ? prng[0] : (
           tag === 246 ? CamlinternalLazy.force_lazy_block(prng) : prng
         )) & 16777215;
   return concat(temp_dir, Caml_curry.app3(Printf.sprintf(/* Format */[
diff --git a/jscomp/stdlib/hashtbl.js b/jscomp/stdlib/hashtbl.js
index 64af90df24..2d7f662cab 100644
--- a/jscomp/stdlib/hashtbl.js
+++ b/jscomp/stdlib/hashtbl.js
@@ -53,7 +53,7 @@ function randomize() {
 
 var prng = {
   0: function () {
-    return Caml_curry.app1(Random.State[1], /* () */0);
+    return Caml_curry.app1(Random.State[/* make_self_init */1], /* () */0);
   },
   length: 1,
   tag: 246
@@ -82,7 +82,7 @@ function create($staropt$star, initial_size) {
   var seed;
   if (random) {
     var tag = prng.tag | 0;
-    seed = Caml_curry.app1(Random.State[3], tag === 250 ? prng[0] : (
+    seed = Caml_curry.app1(Random.State[/* bits */3], tag === 250 ? prng[0] : (
             tag === 246 ? CamlinternalLazy.force_lazy_block(prng) : prng
           ));
   }
@@ -450,7 +450,7 @@ function stats(h) {
 
 function MakeSeeded(H) {
   var key_index = function (h, key) {
-    return Caml_curry.app2(H[1], h[/* seed */2], key) & (h[/* data */1].length - 1 | 0);
+    return Caml_curry.app2(H[/* hash */1], h[/* seed */2], key) & (h[/* data */1].length - 1 | 0);
   };
   var add = function (h, key, info) {
     var i = key_index(h, key);
@@ -474,7 +474,7 @@ function MakeSeeded(H) {
       if (param) {
         var next = param[2];
         var k = param[0];
-        if (Caml_curry.app2(H[0], k, key)) {
+        if (Caml_curry.app2(H[/* equal */0], k, key)) {
           h[/* size */0] = h[/* size */0] - 1 | 0;
           return next;
         }
@@ -498,16 +498,16 @@ function MakeSeeded(H) {
     var match = h[/* data */1][key_index(h, key)];
     if (match) {
       var rest1 = match[2];
-      if (Caml_curry.app2(H[0], key, match[0])) {
+      if (Caml_curry.app2(H[/* equal */0], key, match[0])) {
         return match[1];
       }
       else if (rest1) {
         var rest2 = rest1[2];
-        if (Caml_curry.app2(H[0], key, rest1[0])) {
+        if (Caml_curry.app2(H[/* equal */0], key, rest1[0])) {
           return rest1[1];
         }
         else if (rest2) {
-          if (Caml_curry.app2(H[0], key, rest2[0])) {
+          if (Caml_curry.app2(H[/* equal */0], key, rest2[0])) {
             return rest2[1];
           }
           else {
@@ -516,7 +516,7 @@ function MakeSeeded(H) {
             while(true) {
               var param = _param;
               if (param) {
-                if (Caml_curry.app2(H[0], key$1, param[0])) {
+                if (Caml_curry.app2(H[/* equal */0], key$1, param[0])) {
                   return param[1];
                 }
                 else {
@@ -549,7 +549,7 @@ function MakeSeeded(H) {
         var param = _param;
         if (param) {
           var rest = param[2];
-          if (Caml_curry.app2(H[0], param[0], key)) {
+          if (Caml_curry.app2(H[/* equal */0], param[0], key)) {
             return /* :: */[
                     param[1],
                     find_in_bucket(rest)
@@ -573,7 +573,7 @@ function MakeSeeded(H) {
       if (param) {
         var next = param[2];
         var k = param[0];
-        if (Caml_curry.app2(H[0], k, key)) {
+        if (Caml_curry.app2(H[/* equal */0], k, key)) {
           return /* Cons */[
                   key,
                   info,
@@ -623,7 +623,7 @@ function MakeSeeded(H) {
     while(true) {
       var param = _param;
       if (param) {
-        if (Caml_curry.app2(H[0], param[0], key)) {
+        if (Caml_curry.app2(H[/* equal */0], param[0], key)) {
           return /* true */1;
         }
         else {
@@ -656,9 +656,9 @@ function MakeSeeded(H) {
 }
 
 function Make(H) {
-  var equal = H[0];
+  var equal = H[/* equal */0];
   var key_index = function (h, key) {
-    return Caml_curry.app1(H[1], key) & (h[/* data */1].length - 1 | 0);
+    return Caml_curry.app1(H[/* hash */1], key) & (h[/* data */1].length - 1 | 0);
   };
   var add = function (h, key, info) {
     var i = key_index(h, key);
diff --git a/jscomp/stdlib/map.js b/jscomp/stdlib/map.js
index bd3389e0cb..f7e432b6ae 100644
--- a/jscomp/stdlib/map.js
+++ b/jscomp/stdlib/map.js
@@ -112,7 +112,7 @@ function Make(funarg) {
       var d = param[2];
       var v = param[1];
       var l = param[0];
-      var c = Caml_curry.app2(funarg[0], x, v);
+      var c = Caml_curry.app2(funarg[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           return bal(add(x, data, l), v, d, r);
@@ -145,7 +145,7 @@ function Make(funarg) {
     while(true) {
       var param = _param;
       if (param) {
-        var c = Caml_curry.app2(funarg[0], x, param[1]);
+        var c = Caml_curry.app2(funarg[/* compare */0], x, param[1]);
         if (c) {
           _param = c < 0 ? param[0] : param[3];
           continue ;
@@ -164,7 +164,7 @@ function Make(funarg) {
     while(true) {
       var param = _param;
       if (param) {
-        var c = Caml_curry.app2(funarg[0], x, param[1]);
+        var c = Caml_curry.app2(funarg[/* compare */0], x, param[1]);
         if (c) {
           _param = c < 0 ? param[0] : param[3];
           continue ;
@@ -246,7 +246,7 @@ function Make(funarg) {
       var d = param[2];
       var v = param[1];
       var l = param[0];
-      var c = Caml_curry.app2(funarg[0], x, v);
+      var c = Caml_curry.app2(funarg[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           return bal(remove(x, l), v, d, r);
@@ -452,7 +452,7 @@ function Make(funarg) {
       var d = param[2];
       var v = param[1];
       var l = param[0];
-      var c = Caml_curry.app2(funarg[0], x, v);
+      var c = Caml_curry.app2(funarg[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           var match = split(x, l);
@@ -601,7 +601,7 @@ function Make(funarg) {
       var e1 = _e1;
       if (e1) {
         if (e2) {
-          var c = Caml_curry.app2(funarg[0], e1[0], e2[0]);
+          var c = Caml_curry.app2(funarg[/* compare */0], e1[0], e2[0]);
           if (c !== 0) {
             return c;
           }
@@ -638,7 +638,7 @@ function Make(funarg) {
       var e1 = _e1;
       if (e1) {
         if (e2) {
-          if (Caml_curry.app2(funarg[0], e1[0], e2[0])) {
+          if (Caml_curry.app2(funarg[/* compare */0], e1[0], e2[0])) {
             return /* false */0;
           }
           else if (Caml_curry.app2(cmp, e1[1], e2[1])) {
diff --git a/jscomp/stdlib/set.js b/jscomp/stdlib/set.js
index bd5f92cbfa..512a46ac73 100644
--- a/jscomp/stdlib/set.js
+++ b/jscomp/stdlib/set.js
@@ -91,7 +91,7 @@ function Make(funarg) {
       var r = t[2];
       var v = t[1];
       var l = t[0];
-      var c = Caml_curry.app2(funarg[0], x, v);
+      var c = Caml_curry.app2(funarg[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           return bal(add(x, l), v, r);
@@ -233,7 +233,7 @@ function Make(funarg) {
       var r = param[2];
       var v = param[1];
       var l = param[0];
-      var c = Caml_curry.app2(funarg[0], x, v);
+      var c = Caml_curry.app2(funarg[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           var match = split(x, l);
@@ -280,7 +280,7 @@ function Make(funarg) {
     while(true) {
       var param = _param;
       if (param) {
-        var c = Caml_curry.app2(funarg[0], x, param[1]);
+        var c = Caml_curry.app2(funarg[/* compare */0], x, param[1]);
         if (c) {
           _param = c < 0 ? param[0] : param[2];
           continue ;
@@ -300,7 +300,7 @@ function Make(funarg) {
       var r = param[2];
       var v = param[1];
       var l = param[0];
-      var c = Caml_curry.app2(funarg[0], x, v);
+      var c = Caml_curry.app2(funarg[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           return bal(remove(x, l), v, r);
@@ -434,7 +434,7 @@ function Make(funarg) {
       var e1 = _e1;
       if (e1) {
         if (e2) {
-          var c = Caml_curry.app2(funarg[0], e1[0], e2[0]);
+          var c = Caml_curry.app2(funarg[/* compare */0], e1[0], e2[0]);
           if (c !== 0) {
             return c;
           }
@@ -471,7 +471,7 @@ function Make(funarg) {
           var r1 = s1[2];
           var v1 = s1[1];
           var l1 = s1[0];
-          var c = Caml_curry.app2(funarg[0], v1, s2[1]);
+          var c = Caml_curry.app2(funarg[/* compare */0], v1, s2[1]);
           if (c) {
             if (c < 0) {
               if (subset(/* Node */[
@@ -676,7 +676,7 @@ function Make(funarg) {
       var param = _param;
       if (param) {
         var v = param[1];
-        var c = Caml_curry.app2(funarg[0], x, v);
+        var c = Caml_curry.app2(funarg[/* compare */0], x, v);
         if (c) {
           _param = c < 0 ? param[0] : param[2];
           continue ;
@@ -706,7 +706,7 @@ function Make(funarg) {
             var x3 = match$2[0];
             if (match$3) {
               if (match$3[1]) {
-                var l$1 = List.sort_uniq(funarg[0], l);
+                var l$1 = List.sort_uniq(funarg[/* compare */0], l);
                 var sub = function (n, l) {
                   var exit = 0;
                   if (n > 3 || n < 0) {
diff --git a/jscomp/stdlib/weak.js b/jscomp/stdlib/weak.js
index e5496d3862..28da097537 100644
--- a/jscomp/stdlib/weak.js
+++ b/jscomp/stdlib/weak.js
@@ -292,11 +292,11 @@ function Make(H) {
     };
   };
   var add = function (t, d) {
-    var h = Caml_curry.app1(H[1], d);
+    var h = Caml_curry.app1(H[/* hash */1], d);
     return add_aux(t, Caml_weak.caml_weak_set, /* Some */[d], h, get_index(t, h));
   };
   var find_or = function (t, d, ifnotfound) {
-    var h = Caml_curry.app1(H[1], d);
+    var h = Caml_curry.app1(H[/* hash */1], d);
     var index = get_index(t, h);
     var bucket = t[/* table */0][index];
     var hashes = t[/* hashes */1][index];
@@ -310,7 +310,7 @@ function Make(H) {
       else if (h === hashes[i]) {
         var match = Caml_weak.caml_weak_get_copy(bucket, i);
         if (match) {
-          if (Caml_curry.app2(H[0], match[0], d)) {
+          if (Caml_curry.app2(H[/* equal */0], match[0], d)) {
             var match$1 = Caml_weak.caml_weak_get(bucket, i);
             if (match$1) {
               return match$1[0];
@@ -352,7 +352,7 @@ function Make(H) {
               });
   };
   var find_shadow = function (t, d, iffound, ifnotfound) {
-    var h = Caml_curry.app1(H[1], d);
+    var h = Caml_curry.app1(H[/* hash */1], d);
     var index = get_index(t, h);
     var bucket = t[/* table */0][index];
     var hashes = t[/* hashes */1][index];
@@ -366,7 +366,7 @@ function Make(H) {
       else if (h === hashes[i]) {
         var match = Caml_weak.caml_weak_get_copy(bucket, i);
         if (match) {
-          if (Caml_curry.app2(H[0], match[0], d)) {
+          if (Caml_curry.app2(H[/* equal */0], match[0], d)) {
             return Caml_curry.app2(iffound, bucket, i);
           }
           else {
@@ -399,7 +399,7 @@ function Make(H) {
               }, /* false */0);
   };
   var find_all = function (t, d) {
-    var h = Caml_curry.app1(H[1], d);
+    var h = Caml_curry.app1(H[/* hash */1], d);
     var index = get_index(t, h);
     var bucket = t[/* table */0][index];
     var hashes = t[/* hashes */1][index];
@@ -415,7 +415,7 @@ function Make(H) {
       else if (h === hashes[i]) {
         var match = Caml_weak.caml_weak_get_copy(bucket, i);
         if (match) {
-          if (Caml_curry.app2(H[0], match[0], d)) {
+          if (Caml_curry.app2(H[/* equal */0], match[0], d)) {
             var match$1 = Caml_weak.caml_weak_get(bucket, i);
             if (match$1) {
               _accu = /* :: */[
diff --git a/jscomp/test/bigarray_test.js b/jscomp/test/bigarray_test.js
index b39b5c19e3..73d4d1de3c 100644
--- a/jscomp/test/bigarray_test.js
+++ b/jscomp/test/bigarray_test.js
@@ -6,7 +6,7 @@ var Bigarray       = require("../stdlib/bigarray");
 var Caml_primitive = require("../runtime/caml_primitive");
 var Caml_curry     = require("../runtime/caml_curry");
 
-var v = Caml_curry.app3(Bigarray.Array1[0], /* Int32 */6, /* C_layout */0, 20);
+var v = Caml_curry.app3(Bigarray.Array1[/* create */0], /* Int32 */6, /* C_layout */0, 20);
 
 function sum(v) {
   var result = 0;
@@ -16,7 +16,7 @@ function sum(v) {
   return /* () */0;
 }
 
-var vv = Caml_curry.app3(Bigarray.Array1[0], /* Int32 */6, /* Fortran_layout */1, 30);
+var vv = Caml_curry.app3(Bigarray.Array1[/* create */0], /* Int32 */6, /* Fortran_layout */1, 30);
 
 function init(v) {
   for(var i = 0 ,i_finish = Caml_bigarray.caml_ba_dim_1(v) - 1 | 0; i<= i_finish; ++i){
diff --git a/jscomp/test/inline_map2_test.js b/jscomp/test/inline_map2_test.js
index df7c13e3a1..bf614273e1 100644
--- a/jscomp/test/inline_map2_test.js
+++ b/jscomp/test/inline_map2_test.js
@@ -116,7 +116,7 @@ function Make(Ord) {
       var d = param[2];
       var v = param[1];
       var l = param[0];
-      var c = Caml_curry.app2(Ord[0], x, v);
+      var c = Caml_curry.app2(Ord[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           return bal(add(x, data, l), v, d, r);
@@ -149,7 +149,7 @@ function Make(Ord) {
     while(true) {
       var param = _param;
       if (param) {
-        var c = Caml_curry.app2(Ord[0], x, param[1]);
+        var c = Caml_curry.app2(Ord[/* compare */0], x, param[1]);
         if (c) {
           _param = c < 0 ? param[0] : param[3];
           continue ;
@@ -168,7 +168,7 @@ function Make(Ord) {
     while(true) {
       var param = _param;
       if (param) {
-        var c = Caml_curry.app2(Ord[0], x, param[1]);
+        var c = Caml_curry.app2(Ord[/* compare */0], x, param[1]);
         if (c) {
           _param = c < 0 ? param[0] : param[3];
           continue ;
@@ -250,7 +250,7 @@ function Make(Ord) {
       var d = param[2];
       var v = param[1];
       var l = param[0];
-      var c = Caml_curry.app2(Ord[0], x, v);
+      var c = Caml_curry.app2(Ord[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           return bal(remove(x, l), v, d, r);
@@ -456,7 +456,7 @@ function Make(Ord) {
       var d = param[2];
       var v = param[1];
       var l = param[0];
-      var c = Caml_curry.app2(Ord[0], x, v);
+      var c = Caml_curry.app2(Ord[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           var match = split(x, l);
@@ -605,7 +605,7 @@ function Make(Ord) {
       var e1 = _e1;
       if (e1) {
         if (e2) {
-          var c = Caml_curry.app2(Ord[0], e1[0], e2[0]);
+          var c = Caml_curry.app2(Ord[/* compare */0], e1[0], e2[0]);
           if (c !== 0) {
             return c;
           }
@@ -642,7 +642,7 @@ function Make(Ord) {
       var e1 = _e1;
       if (e1) {
         if (e2) {
-          if (Caml_curry.app2(Ord[0], e1[0], e2[0])) {
+          if (Caml_curry.app2(Ord[/* compare */0], e1[0], e2[0])) {
             return /* false */0;
           }
           else if (Caml_curry.app2(cmp, e1[1], e2[1])) {
diff --git a/jscomp/test/int_hashtbl_test.js b/jscomp/test/int_hashtbl_test.js
index 84f4c1f712..1013949a77 100644
--- a/jscomp/test/int_hashtbl_test.js
+++ b/jscomp/test/int_hashtbl_test.js
@@ -9,12 +9,12 @@ var Caml_curry = require("../runtime/caml_curry");
 var List       = require("../stdlib/list");
 
 function f(H) {
-  var tbl = Caml_curry.app1(H[0], 17);
-  Caml_curry.app3(H[4], tbl, 1, /* "1" */49);
-  Caml_curry.app3(H[4], tbl, 2, /* "2" */50);
+  var tbl = Caml_curry.app1(H[/* create */0], 17);
+  Caml_curry.app3(H[/* add */4], tbl, 1, /* "1" */49);
+  Caml_curry.app3(H[/* add */4], tbl, 2, /* "2" */50);
   return List.sort(function (param, param$1) {
               return Caml_obj.caml_int_compare(param[0], param$1[0]);
-            }, Caml_curry.app3(H[11], function (k, v, acc) {
+            }, Caml_curry.app3(H[/* fold */11], function (k, v, acc) {
                   return /* :: */[
                           /* tuple */[
                             k,
@@ -27,14 +27,14 @@ function f(H) {
 
 function g(H) {
   return function (count) {
-    var tbl = Caml_curry.app1(H[0], 17);
+    var tbl = Caml_curry.app1(H[/* create */0], 17);
     for(var i = 0; i<= count; ++i){
-      Caml_curry.app3(H[8], tbl, (i << 1), "" + i);
+      Caml_curry.app3(H[/* replace */8], tbl, (i << 1), "" + i);
     }
     for(var i$1 = 0; i$1<= count; ++i$1){
-      Caml_curry.app3(H[8], tbl, (i$1 << 1), "" + i$1);
+      Caml_curry.app3(H[/* replace */8], tbl, (i$1 << 1), "" + i$1);
     }
-    var v = Caml_curry.app3(H[11], function (k, v, acc) {
+    var v = Caml_curry.app3(H[/* fold */11], function (k, v, acc) {
           return /* :: */[
                   /* tuple */[
                     k,
diff --git a/jscomp/test/rec_module_test.js b/jscomp/test/rec_module_test.js
index 47e7a078e8..016c061939 100644
--- a/jscomp/test/rec_module_test.js
+++ b/jscomp/test/rec_module_test.js
@@ -26,7 +26,7 @@ function even(n) {
       return /* false */0;
     }
     else {
-      return Caml_curry.app1(B[0], n - 1 | 0);
+      return Caml_curry.app1(B[/* odd */0], n - 1 | 0);
     }
   }
   else {
@@ -41,7 +41,7 @@ function odd(n) {
     return /* true */1;
   }
   else if (n) {
-    return Caml_curry.app1(A[0], n - 1 | 0);
+    return Caml_curry.app1(A[/* even */0], n - 1 | 0);
   }
   else {
     return /* false */0;
@@ -74,7 +74,7 @@ function even$1(n) {
       return /* false */0;
     }
     else {
-      return Caml_curry.app1(BB[0], n - 1 | 0);
+      return Caml_curry.app1(BB[/* odd */0], n - 1 | 0);
     }
   }
   else {
@@ -83,7 +83,7 @@ function even$1(n) {
 }
 
 function x() {
-  return Caml_curry.app1(BB[1], /* () */0) + 3 | 0;
+  return Caml_curry.app1(BB[/* y */1], /* () */0) + 3 | 0;
 }
 
 CamlinternalMod.update_mod([[
@@ -99,7 +99,7 @@ function odd$1(n) {
     return /* true */1;
   }
   else if (n) {
-    return Caml_curry.app1(AA[0], n - 1 | 0);
+    return Caml_curry.app1(AA[/* even */0], n - 1 | 0);
   }
   else {
     return /* false */0;
@@ -220,7 +220,7 @@ function add(x, t) {
     var r = t[2];
     var v = t[1];
     var l = t[0];
-    var c = Caml_curry.app2(AAA[0], x, v);
+    var c = Caml_curry.app2(AAA[/* compare */0], x, v);
     if (c) {
       if (c < 0) {
         return bal(add(x, l), v, r);
@@ -371,7 +371,7 @@ function split(x, param) {
     var r = param[2];
     var v = param[1];
     var l = param[0];
-    var c = Caml_curry.app2(AAA[0], x, v);
+    var c = Caml_curry.app2(AAA[/* compare */0], x, v);
     if (c) {
       if (c < 0) {
         var match = split(x, l);
@@ -420,7 +420,7 @@ function mem(x, _param) {
   while(true) {
     var param = _param;
     if (param) {
-      var c = Caml_curry.app2(AAA[0], x, param[1]);
+      var c = Caml_curry.app2(AAA[/* compare */0], x, param[1]);
       if (c) {
         _param = c < 0 ? param[0] : param[2];
         continue ;
@@ -441,7 +441,7 @@ function remove(x, param) {
     var r = param[2];
     var v = param[1];
     var l = param[0];
-    var c = Caml_curry.app2(AAA[0], x, v);
+    var c = Caml_curry.app2(AAA[/* compare */0], x, v);
     if (c) {
       if (c < 0) {
         return bal(remove(x, l), v, r);
@@ -580,7 +580,7 @@ function compare(s1, s2) {
     var e1 = _e1;
     if (e1) {
       if (e2) {
-        var c = Caml_curry.app2(AAA[0], e1[0], e2[0]);
+        var c = Caml_curry.app2(AAA[/* compare */0], e1[0], e2[0]);
         if (c !== 0) {
           return c;
         }
@@ -619,7 +619,7 @@ function subset(_s1, _s2) {
         var r1 = s1[2];
         var v1 = s1[1];
         var l1 = s1[0];
-        var c = Caml_curry.app2(AAA[0], v1, s2[1]);
+        var c = Caml_curry.app2(AAA[/* compare */0], v1, s2[1]);
         if (c) {
           if (c < 0) {
             if (subset(/* Node */[
@@ -834,7 +834,7 @@ function find(x, _param) {
     var param = _param;
     if (param) {
       var v = param[1];
-      var c = Caml_curry.app2(AAA[0], x, v);
+      var c = Caml_curry.app2(AAA[/* compare */0], x, v);
       if (c) {
         _param = c < 0 ? param[0] : param[2];
         continue ;
@@ -865,7 +865,7 @@ function of_list(l) {
           var x3 = match$2[0];
           if (match$3) {
             if (match$3[1]) {
-              var l$1 = List.sort_uniq(AAA[0], l);
+              var l$1 = List.sort_uniq(AAA[/* compare */0], l);
               var sub = function (n, l) {
                 var exit = 0;
                 if (n > 3 || n < 0) {
@@ -1072,10 +1072,10 @@ var suites_000 = /* tuple */[
               /* false */0
             ],
             1: /* tuple */[
-              Caml_curry.app1(A[0], 2),
-              Caml_curry.app1(AA[0], 4),
-              Caml_curry.app1(B[0], 2),
-              Caml_curry.app1(BB[0], 4)
+              Caml_curry.app1(A[/* even */0], 2),
+              Caml_curry.app1(AA[/* even */0], 4),
+              Caml_curry.app1(B[/* odd */0], 2),
+              Caml_curry.app1(BB[/* odd */0], 4)
             ],
             length: 2,
             tag: 0
@@ -1088,7 +1088,7 @@ var suites_001 = /* :: */[
     "test2",
     function () {
       return /* Eq */{
-              0: Caml_curry.app1(BB[1], /* () */0),
+              0: Caml_curry.app1(BB[/* y */1], /* () */0),
               1: 32,
               length: 2,
               tag: 0
@@ -1100,7 +1100,7 @@ var suites_001 = /* :: */[
       "test3",
       function () {
         return /* Eq */{
-                0: Caml_curry.app1(AA[1], /* () */0),
+                0: Caml_curry.app1(AA[/* x */1], /* () */0),
                 1: 35,
                 length: 2,
                 tag: 0
@@ -1113,7 +1113,7 @@ var suites_001 = /* :: */[
         function () {
           return /* Eq */{
                   0: /* true */1,
-                  1: Caml_curry.app1(A[0], 2),
+                  1: Caml_curry.app1(A[/* even */0], 2),
                   length: 2,
                   tag: 0
                 };
@@ -1125,7 +1125,7 @@ var suites_001 = /* :: */[
           function () {
             return /* Eq */{
                     0: /* true */1,
-                    1: Caml_curry.app1(AA[0], 4),
+                    1: Caml_curry.app1(AA[/* even */0], 4),
                     length: 2,
                     tag: 0
                   };
@@ -1137,7 +1137,7 @@ var suites_001 = /* :: */[
             function () {
               return /* Eq */{
                       0: /* false */0,
-                      1: Caml_curry.app1(B[0], 2),
+                      1: Caml_curry.app1(B[/* odd */0], 2),
                       length: 2,
                       tag: 0
                     };
diff --git a/jscomp/test/test_set.js b/jscomp/test/test_set.js
index 90bd79db7d..dc2b451fee 100644
--- a/jscomp/test/test_set.js
+++ b/jscomp/test/test_set.js
@@ -91,7 +91,7 @@ function Make(Ord) {
       var r = t[2];
       var v = t[1];
       var l = t[0];
-      var c = Caml_curry.app2(Ord[0], x, v);
+      var c = Caml_curry.app2(Ord[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           return bal(add(x, l), v, r);
@@ -246,7 +246,7 @@ function Make(Ord) {
       var r = param[2];
       var v = param[1];
       var l = param[0];
-      var c = Caml_curry.app2(Ord[0], x, v);
+      var c = Caml_curry.app2(Ord[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           var match = split(x, l);
@@ -293,7 +293,7 @@ function Make(Ord) {
     while(true) {
       var param = _param;
       if (param) {
-        var c = Caml_curry.app2(Ord[0], x, param[1]);
+        var c = Caml_curry.app2(Ord[/* compare */0], x, param[1]);
         if (c) {
           _param = c < 0 ? param[0] : param[2];
           continue ;
@@ -313,7 +313,7 @@ function Make(Ord) {
       var r = param[2];
       var v = param[1];
       var l = param[0];
-      var c = Caml_curry.app2(Ord[0], x, v);
+      var c = Caml_curry.app2(Ord[/* compare */0], x, v);
       if (c) {
         if (c < 0) {
           return bal(remove(x, l), v, r);
@@ -433,7 +433,7 @@ function Make(Ord) {
       var e1 = _e1;
       if (e1) {
         if (e2) {
-          var c = Caml_curry.app2(Ord[0], e1[0], e2[0]);
+          var c = Caml_curry.app2(Ord[/* compare */0], e1[0], e2[0]);
           if (c !== 0) {
             return c;
           }
@@ -473,7 +473,7 @@ function Make(Ord) {
           var r1 = s1[2];
           var v1 = s1[1];
           var l1 = s1[0];
-          var c = Caml_curry.app2(Ord[0], v1, s2[1]);
+          var c = Caml_curry.app2(Ord[/* compare */0], v1, s2[1]);
           if (c) {
             if (c < 0) {
               if (subset(/* Node */[
@@ -678,7 +678,7 @@ function Make(Ord) {
       var param = _param;
       if (param) {
         var v = param[1];
-        var c = Caml_curry.app2(Ord[0], x, v);
+        var c = Caml_curry.app2(Ord[/* compare */0], x, v);
         if (c) {
           _param = c < 0 ? param[0] : param[2];
           continue ;
@@ -831,7 +831,7 @@ function Make(Ord) {
             var x3 = match$2[0];
             if (match$3) {
               if (match$3[1]) {
-                return of_sorted_list(List.sort_uniq(Ord[0], l));
+                return of_sorted_list(List.sort_uniq(Ord[/* compare */0], l));
               }
               else {
                 return add(match$3[0], add(x3, add(x2, add(x1, singleton(x0)))));
diff --git a/ocaml b/ocaml
index 82576d3975..362352098f 160000
--- a/ocaml
+++ b/ocaml
@@ -1 +1 @@
-Subproject commit 82576d397538005c46728a0dc8ebf1b3979449b5
+Subproject commit 362352098ff9299a052d0fb4632751fd53ab45b6