diff --git a/jscomp/runtime/release.ninja b/jscomp/runtime/release.ninja
index b7b44625e40..181ca9fa814 100644
--- a/jscomp/runtime/release.ninja
+++ b/jscomp/runtime/release.ninja
@@ -21,7 +21,7 @@ o runtime/caml_bytes.cmj : cc_cmi runtime/caml_bytes.res | runtime/caml_bytes.cm
 o runtime/caml_bytes.cmi : cc runtime/caml_bytes.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_float.cmj : cc_cmi runtime/caml_float.res | runtime/caml_float.cmi runtime/caml_float_extern.cmj
 o runtime/caml_float.cmi : cc runtime/caml_float.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_format.cmj : cc_cmi runtime/caml_format.ml | runtime/caml.cmj runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_format.cmi runtime/caml_int64.cmj runtime/caml_int64_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
+o runtime/caml_format.cmj : cc_cmi runtime/caml_format.ml | runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_format.cmi runtime/caml_int64.cmj runtime/caml_int64_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
 o runtime/caml_format.cmi : cc runtime/caml_format.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_hash.cmj : cc_cmi runtime/caml_hash.res | runtime/caml_hash.cmi runtime/caml_hash_primitive.cmj runtime/caml_nativeint_extern.cmj runtime/js.cmj
 o runtime/caml_hash.cmi : cc runtime/caml_hash.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
@@ -37,7 +37,7 @@ o runtime/caml_md5.cmj : cc_cmi runtime/caml_md5.res | runtime/caml_array_extern
 o runtime/caml_md5.cmi : cc runtime/caml_md5.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_module.cmj : cc_cmi runtime/caml_module.res | runtime/caml_array_extern.cmj runtime/caml_module.cmi runtime/caml_obj.cmj
 o runtime/caml_module.cmi : cc runtime/caml_module.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.res | runtime/caml.cmj runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/caml_option.cmj runtime/js.cmj
+o runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.res | runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/caml_option.cmj runtime/js.cmj
 o runtime/caml_obj.cmi : cc runtime/caml_obj.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_option.cmj : cc_cmi runtime/caml_option.res | runtime/caml_option.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
 o runtime/caml_option.cmi : cc runtime/caml_option.resi | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
@@ -54,7 +54,7 @@ o runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj : cc runtime/caml_exce
 o runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj : cc runtime/caml_external_polyfill.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj : cc runtime/caml_float_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj : cc runtime/caml_int64_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj : cc runtime/caml_js_exceptions.res | runtime/bs_stdlib_mini.cmi runtime/caml_exceptions.cmj runtime/caml_option.cmj runtime/js.cmi runtime/js.cmj
+o runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj : cc runtime/caml_js_exceptions.res | runtime/bs_stdlib_mini.cmi runtime/caml_exceptions.cmj runtime/js.cmi runtime/js.cmj
 o runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj : cc runtime/caml_nativeint_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj : cc runtime/caml_string_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj : cc runtime/caml_undefined_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
diff --git a/jscomp/stdlib-406/release.ninja b/jscomp/stdlib-406/release.ninja
index 7356eb45bad..992f90f6528 100644
--- a/jscomp/stdlib-406/release.ninja
+++ b/jscomp/stdlib-406/release.ninja
@@ -81,9 +81,9 @@ o stdlib-406/stdLabels.cmj : cc_cmi stdlib-406/stdLabels.res | stdlib-406/arrayL
 o stdlib-406/stdLabels.cmi : cc stdlib-406/stdLabels.resi | stdlib-406/arrayLabels.cmi stdlib-406/bytesLabels.cmi stdlib-406/listLabels.cmi stdlib-406/pervasives.cmj stdlib-406/stringLabels.cmi $bsc others
 o stdlib-406/stream.cmj : cc_cmi stdlib-406/stream.res | stdlib-406/bytes.cmj stdlib-406/lazy.cmj stdlib-406/list.cmj stdlib-406/stream.cmi stdlib-406/string.cmj $bsc others
 o stdlib-406/stream.cmi : cc stdlib-406/stream.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/string.cmj : cc_cmi stdlib-406/string.res | stdlib-406/bytes.cmj stdlib-406/string.cmi $bsc others
+o stdlib-406/string.cmj : cc_cmi stdlib-406/string.res | stdlib-406/array.cmj stdlib-406/bytes.cmj stdlib-406/string.cmi $bsc others
 o stdlib-406/string.cmi : cc stdlib-406/string.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/stringLabels.cmj : cc_cmi stdlib-406/stringLabels.res | stdlib-406/bytes.cmj stdlib-406/stringLabels.cmi $bsc others
+o stdlib-406/stringLabels.cmj : cc_cmi stdlib-406/stringLabels.res | stdlib-406/array.cmj stdlib-406/bytes.cmj stdlib-406/stringLabels.cmi $bsc others
 o stdlib-406/stringLabels.cmi : cc stdlib-406/stringLabels.resi | stdlib-406/pervasives.cmj $bsc others
 o stdlib-406/sys.cmj : cc_cmi stdlib-406/sys.res | stdlib-406/sys.cmi $bsc others
 o stdlib-406/sys.cmi : cc stdlib-406/sys.resi | stdlib-406/pervasives.cmj $bsc others
diff --git a/jscomp/stdlib-406/string.res b/jscomp/stdlib-406/string.res
index 91ad85a2b3d..a038bfdaf8f 100644
--- a/jscomp/stdlib-406/string.res
+++ b/jscomp/stdlib-406/string.res
@@ -38,7 +38,7 @@ let blit = B.blit_string
 
 %%private(@send external join: (array<string>, string) => string = "join")
 
-let concat = (sep: string, xs: list<string>) => xs->Belt_List.toArray->join(sep)
+let concat = (sep: string, xs: list<string>) => xs->Array.of_list->join(sep)
 
 /* duplicated in bytes.ml */
 let iter = (f, s) =>
diff --git a/jscomp/stdlib-406/stringLabels.res b/jscomp/stdlib-406/stringLabels.res
index 869286af09d..a9ea486d14e 100644
--- a/jscomp/stdlib-406/stringLabels.res
+++ b/jscomp/stdlib-406/stringLabels.res
@@ -38,7 +38,7 @@ let blit = (~src, ~src_pos, ~dst, ~dst_pos, ~len) => B.blit_string(src, src_pos,
 
 %%private(@send external join: (array<string>, string) => string = "join")
 
-let concat = (~sep: string, xs: list<string>) => xs->Belt_List.toArray->join(sep)
+let concat = (~sep: string, xs: list<string>) => xs->Array.of_list->join(sep)
 
 /* duplicated in bytes.ml */
 let iter = (~f, s) =>
diff --git a/jscomp/test/ext_filename_test.js b/jscomp/test/ext_filename_test.js
index ac159c6afe7..65c301b8866 100644
--- a/jscomp/test/ext_filename_test.js
+++ b/jscomp/test/ext_filename_test.js
@@ -3,11 +3,11 @@
 
 var Sys = require("../../lib/js/sys.js");
 var List = require("../../lib/js/list.js");
+var $$Array = require("../../lib/js/array.js");
 var Bytes = require("../../lib/js/bytes.js");
 var Curry = require("../../lib/js/curry.js");
 var Caml_sys = require("../../lib/js/caml_sys.js");
 var Filename = require("../../lib/js/filename.js");
-var Belt_List = require("../../lib/js/belt_List.js");
 var Pervasives = require("../../lib/js/pervasives.js");
 var Test_literals = require("./test_literals.js");
 var Ext_string_test = require("./ext_string_test.js");
@@ -115,19 +115,19 @@ function relative_path(file_or_dir_1, file_or_dir_2) {
   var ys = go(dir1, dir2);
   if (ys) {
     if (ys.hd === node_parent) {
-      return Belt_List.toArray(ys).join(node_sep);
+      return $$Array.of_list(ys).join(node_sep);
     }
     var xs = {
       hd: node_current,
       tl: ys
     };
-    return Belt_List.toArray(xs).join(node_sep);
+    return $$Array.of_list(xs).join(node_sep);
   }
   var xs$1 = {
     hd: node_current,
     tl: ys
   };
-  return Belt_List.toArray(xs$1).join(node_sep);
+  return $$Array.of_list(xs$1).join(node_sep);
 }
 
 function node_relative_path(node_modules_shorten, file1, dep_file) {
diff --git a/jscomp/test/string_test.js b/jscomp/test/string_test.js
index a7596435072..2744674448f 100644
--- a/jscomp/test/string_test.js
+++ b/jscomp/test/string_test.js
@@ -3,9 +3,9 @@
 
 var Mt = require("./mt.js");
 var List = require("../../lib/js/list.js");
+var $$Array = require("../../lib/js/array.js");
 var Bytes = require("../../lib/js/bytes.js");
 var $$String = require("../../lib/js/string.js");
-var Belt_List = require("../../lib/js/belt_List.js");
 var Ext_string_test = require("./ext_string_test.js");
 var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
 
@@ -131,7 +131,7 @@ function string_of_chars(x) {
   var xs = List.map((function (prim) {
           return String.fromCharCode(prim);
         }), x);
-  return Belt_List.toArray(xs).join("");
+  return $$Array.of_list(xs).join("");
 }
 
 Mt.from_pair_suites("String_test", {
diff --git a/lib/es6/string.js b/lib/es6/string.js
index c9fc3629b31..def3e311954 100644
--- a/lib/es6/string.js
+++ b/lib/es6/string.js
@@ -1,9 +1,9 @@
 
 
 import * as Caml from "./caml.js";
+import * as $$Array from "./array.js";
 import * as Bytes from "./bytes.js";
 import * as Curry from "./curry.js";
-import * as Belt_List from "./belt_List.js";
 import * as Caml_string from "./caml_string.js";
 import * as Caml_js_exceptions from "./caml_js_exceptions.js";
 
@@ -16,7 +16,7 @@ function sub(s, ofs, len) {
 }
 
 function concat(sep, xs) {
-  return Belt_List.toArray(xs).join(sep);
+  return $$Array.of_list(xs).join(sep);
 }
 
 function iter(f, s) {
diff --git a/lib/es6/stringLabels.js b/lib/es6/stringLabels.js
index e1263d55822..4b568b4ebc9 100644
--- a/lib/es6/stringLabels.js
+++ b/lib/es6/stringLabels.js
@@ -1,9 +1,9 @@
 
 
 import * as Caml from "./caml.js";
+import * as $$Array from "./array.js";
 import * as Bytes from "./bytes.js";
 import * as Curry from "./curry.js";
-import * as Belt_List from "./belt_List.js";
 import * as Caml_string from "./caml_string.js";
 import * as Caml_js_exceptions from "./caml_js_exceptions.js";
 
@@ -18,7 +18,7 @@ function sub(s, ofs, len) {
 var blit = Bytes.blit_string;
 
 function concat(sep, xs) {
-  return Belt_List.toArray(xs).join(sep);
+  return $$Array.of_list(xs).join(sep);
 }
 
 function iter(f, s) {
diff --git a/lib/js/string.js b/lib/js/string.js
index abbb4077c3f..076b21a3177 100644
--- a/lib/js/string.js
+++ b/lib/js/string.js
@@ -1,9 +1,9 @@
 'use strict';
 
 var Caml = require("./caml.js");
+var $$Array = require("./array.js");
 var Bytes = require("./bytes.js");
 var Curry = require("./curry.js");
-var Belt_List = require("./belt_List.js");
 var Caml_string = require("./caml_string.js");
 var Caml_js_exceptions = require("./caml_js_exceptions.js");
 
@@ -16,7 +16,7 @@ function sub(s, ofs, len) {
 }
 
 function concat(sep, xs) {
-  return Belt_List.toArray(xs).join(sep);
+  return $$Array.of_list(xs).join(sep);
 }
 
 function iter(f, s) {
diff --git a/lib/js/stringLabels.js b/lib/js/stringLabels.js
index bcdea0561a6..22cd4df919f 100644
--- a/lib/js/stringLabels.js
+++ b/lib/js/stringLabels.js
@@ -1,9 +1,9 @@
 'use strict';
 
 var Caml = require("./caml.js");
+var $$Array = require("./array.js");
 var Bytes = require("./bytes.js");
 var Curry = require("./curry.js");
-var Belt_List = require("./belt_List.js");
 var Caml_string = require("./caml_string.js");
 var Caml_js_exceptions = require("./caml_js_exceptions.js");
 
@@ -18,7 +18,7 @@ function sub(s, ofs, len) {
 var blit = Bytes.blit_string;
 
 function concat(sep, xs) {
-  return Belt_List.toArray(xs).join(sep);
+  return $$Array.of_list(xs).join(sep);
 }
 
 function iter(f, s) {