diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d68a2509d..c8abc2b82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -249,230 +249,231 @@ opam:02:ocplib-resto:
   variables:
     package: ocplib-resto
 
-opam:03:blake2:
-  <<: *opam_definition
-  variables:
-    package: blake2
-
-opam:04:tweetnacl:
-  <<: *opam_definition
-  variables:
-    package: tweetnacl
-
-opam:05:tezos-error-monad:
+opam:03:tezos-error-monad:
   <<: *opam_definition
   variables:
     package: tezos-error-monad
 
-opam:06:ocplib-resto-directory:
+opam:04:ocplib-resto-directory:
   <<: *opam_definition
   variables:
     package: ocplib-resto-directory
 
-opam:07:tezos-crypto:
+opam:05:blake2:
   <<: *opam_definition
   variables:
-    package: tezos-crypto
+    package: blake2
 
-opam:08:tezos-micheline:
+opam:06:secp256k1:
   <<: *opam_definition
   variables:
-    package: tezos-micheline
+    package: secp256k1
 
-opam:09:tezos-rpc:
-  <<: *opam_definition
-  variables:
-    package: tezos-rpc
-
-opam:10:tezos-base:
-  <<: *opam_definition
-  variables:
-    package: tezos-base
-
-opam:11:pbkdf:
-  <<: *opam_definition
-  variables:
-    package: pbkdf
-
-opam:12:ocplib-resto-cohttp:
-  <<: *opam_definition
-  variables:
-    package: ocplib-resto-cohttp
-
-opam:13:irmin-leveldb:
-  <<: *opam_definition
-  variables:
-    package: irmin-leveldb
-
-opam:14:tezos-protocol-environment-sigs:
-  <<: *opam_definition
-  variables:
-    package: tezos-protocol-environment-sigs
-
-opam:15:tezos-stdlib-unix:
-  <<: *opam_definition
-  variables:
-    package: tezos-stdlib-unix
-
-opam:16:bip39:
-  <<: *opam_definition
-  variables:
-    package: bip39
-
-opam:17:tezos-rpc-http:
-  <<: *opam_definition
-  variables:
-    package: tezos-rpc-http
-
-opam:18:tezos-shell-services:
-  <<: *opam_definition
-  variables:
-    package: tezos-shell-services
-
-opam:19:tezos-storage:
-  <<: *opam_definition
-  variables:
-    package: tezos-storage
-
-opam:20:tezos-protocol-compiler:
-  <<: *opam_definition
-  variables:
-    package: tezos-protocol-compiler
-
-opam:21:tezos-client-base:
-  <<: *opam_definition
-  variables:
-    package: tezos-client-base
-
-opam:22:tezos-protocol-alpha:
-  <<: *opam_definition
-  variables:
-    package: tezos-protocol-alpha
-
-opam:23:tezos-protocol-environment:
-  <<: *opam_definition
-  variables:
-    package: tezos-protocol-environment
-
-opam:24:tezos-client-alpha:
-  <<: *opam_definition
-  variables:
-    package: tezos-client-alpha
-
-opam:25:tezos-client-commands:
-  <<: *opam_definition
-  variables:
-    package: tezos-client-commands
-
-opam:26:tezos-protocol-environment-shell:
-  <<: *opam_definition
-  variables:
-    package: tezos-protocol-environment-shell
-
-opam:27:tezos-baking-alpha:
-  <<: *opam_definition
-  variables:
-    package: tezos-baking-alpha
-
-opam:28:tezos-protocol-genesis:
-  <<: *opam_definition
-  variables:
-    package: tezos-protocol-genesis
-
-opam:29:ocplib-resto-json:
-  <<: *opam_definition
-  variables:
-    package: ocplib-resto-json
-
-opam:30:tezos-protocol-updater:
-  <<: *opam_definition
-  variables:
-    package: tezos-protocol-updater
-
-opam:31:tezos-p2p:
-  <<: *opam_definition
-  variables:
-    package: tezos-p2p
-
-opam:32:tezos-baking-alpha-commands:
-  <<: *opam_definition
-  variables:
-    package: tezos-baking-alpha-commands
-
-opam:33:tezos-client-alpha-commands:
-  <<: *opam_definition
-  variables:
-    package: tezos-client-alpha-commands
-
-opam:34:tezos-client-base-unix:
-  <<: *opam_definition
-  variables:
-    package: tezos-client-base-unix
-
-opam:35:tezos-client-genesis:
-  <<: *opam_definition
-  variables:
-    package: tezos-client-genesis
-
-opam:36:ocplib-ezresto:
-  <<: *opam_definition
-  variables:
-    package: ocplib-ezresto
-
-opam:37:tezos-embedded-protocol-alpha:
-  <<: *opam_definition
-  variables:
-    package: tezos-embedded-protocol-alpha
-
-opam:38:tezos-embedded-protocol-demo:
-  <<: *opam_definition
-  variables:
-    package: tezos-embedded-protocol-demo
-
-opam:39:tezos-embedded-protocol-genesis:
-  <<: *opam_definition
-  variables:
-    package: tezos-embedded-protocol-genesis
-
-opam:40:tezos-shell:
-  <<: *opam_definition
-  variables:
-    package: tezos-shell
-
-opam:41:tezos-client:
-  <<: *opam_definition
-  variables:
-    package: tezos-client
-
-opam:42:ocplib-ezresto-directory:
-  <<: *opam_definition
-  variables:
-    package: ocplib-ezresto-directory
-
-opam:43:tezos-clic:
+opam:07:tezos-clic:
   <<: *opam_definition
   variables:
     package: tezos-clic
 
-opam:44:tezos-baker-alpha:
+opam:08:tezos-rpc:
+  <<: *opam_definition
+  variables:
+    package: tezos-rpc
+
+opam:09:tweetnacl:
+  <<: *opam_definition
+  variables:
+    package: tweetnacl
+
+opam:10:tezos-crypto:
+  <<: *opam_definition
+  variables:
+    package: tezos-crypto
+
+opam:11:tezos-micheline:
+  <<: *opam_definition
+  variables:
+    package: tezos-micheline
+
+opam:12:tezos-base:
+  <<: *opam_definition
+  variables:
+    package: tezos-base
+
+opam:13:pbkdf:
+  <<: *opam_definition
+  variables:
+    package: pbkdf
+
+opam:14:ocplib-resto-cohttp:
+  <<: *opam_definition
+  variables:
+    package: ocplib-resto-cohttp
+
+opam:15:irmin-leveldb:
+  <<: *opam_definition
+  variables:
+    package: irmin-leveldb
+
+opam:16:tezos-protocol-environment-sigs:
+  <<: *opam_definition
+  variables:
+    package: tezos-protocol-environment-sigs
+
+opam:17:tezos-stdlib-unix:
+  <<: *opam_definition
+  variables:
+    package: tezos-stdlib-unix
+
+opam:18:bip39:
+  <<: *opam_definition
+  variables:
+    package: bip39
+
+opam:19:tezos-rpc-http:
+  <<: *opam_definition
+  variables:
+    package: tezos-rpc-http
+
+opam:20:tezos-shell-services:
+  <<: *opam_definition
+  variables:
+    package: tezos-shell-services
+
+opam:21:tezos-storage:
+  <<: *opam_definition
+  variables:
+    package: tezos-storage
+
+opam:22:tezos-protocol-compiler:
+  <<: *opam_definition
+  variables:
+    package: tezos-protocol-compiler
+
+opam:23:tezos-client-base:
+  <<: *opam_definition
+  variables:
+    package: tezos-client-base
+
+opam:24:tezos-protocol-alpha:
+  <<: *opam_definition
+  variables:
+    package: tezos-protocol-alpha
+
+opam:25:tezos-protocol-environment:
+  <<: *opam_definition
+  variables:
+    package: tezos-protocol-environment
+
+opam:26:tezos-client-alpha:
+  <<: *opam_definition
+  variables:
+    package: tezos-client-alpha
+
+opam:27:tezos-client-commands:
+  <<: *opam_definition
+  variables:
+    package: tezos-client-commands
+
+opam:28:tezos-protocol-environment-shell:
+  <<: *opam_definition
+  variables:
+    package: tezos-protocol-environment-shell
+
+opam:29:tezos-baking-alpha:
+  <<: *opam_definition
+  variables:
+    package: tezos-baking-alpha
+
+opam:30:tezos-protocol-genesis:
+  <<: *opam_definition
+  variables:
+    package: tezos-protocol-genesis
+
+opam:31:ocplib-resto-json:
+  <<: *opam_definition
+  variables:
+    package: ocplib-resto-json
+
+opam:32:tezos-protocol-updater:
+  <<: *opam_definition
+  variables:
+    package: tezos-protocol-updater
+
+opam:33:tezos-p2p:
+  <<: *opam_definition
+  variables:
+    package: tezos-p2p
+
+opam:34:tezos-baking-alpha-commands:
+  <<: *opam_definition
+  variables:
+    package: tezos-baking-alpha-commands
+
+opam:35:tezos-client-alpha-commands:
+  <<: *opam_definition
+  variables:
+    package: tezos-client-alpha-commands
+
+opam:36:tezos-client-base-unix:
+  <<: *opam_definition
+  variables:
+    package: tezos-client-base-unix
+
+opam:37:tezos-client-genesis:
+  <<: *opam_definition
+  variables:
+    package: tezos-client-genesis
+
+opam:38:ocplib-ezresto:
+  <<: *opam_definition
+  variables:
+    package: ocplib-ezresto
+
+opam:39:tezos-embedded-protocol-alpha:
+  <<: *opam_definition
+  variables:
+    package: tezos-embedded-protocol-alpha
+
+opam:40:tezos-embedded-protocol-demo:
+  <<: *opam_definition
+  variables:
+    package: tezos-embedded-protocol-demo
+
+opam:41:tezos-embedded-protocol-genesis:
+  <<: *opam_definition
+  variables:
+    package: tezos-embedded-protocol-genesis
+
+opam:42:tezos-shell:
+  <<: *opam_definition
+  variables:
+    package: tezos-shell
+
+opam:43:tezos-client:
+  <<: *opam_definition
+  variables:
+    package: tezos-client
+
+opam:44:ocplib-ezresto-directory:
+  <<: *opam_definition
+  variables:
+    package: ocplib-ezresto-directory
+
+opam:45:tezos-baker-alpha:
   <<: *opam_definition
   variables:
     package: tezos-baker-alpha
 
-opam:45:tezos-protocol-demo:
+opam:46:tezos-protocol-demo:
   <<: *opam_definition
   variables:
     package: tezos-protocol-demo
 
-opam:46:tezos-node:
+opam:47:tezos-node:
   <<: *opam_definition
   variables:
     package: tezos-node
 
-opam:46:secp256k1-internal:
-  <<: *opam_definition
-  variables:
-    package: secp256k1-internal
 
 ##END_OPAM##
 
diff --git a/src/lib_crypto/jbuild b/src/lib_crypto/jbuild
index f1556f977..4061898fc 100644
--- a/src/lib_crypto/jbuild
+++ b/src/lib_crypto/jbuild
@@ -18,7 +18,7 @@
               nocrypto
               blake2
               tweetnacl
-              secp256k1-internal
+              secp256k1
               zarith))))
 
 (alias
diff --git a/src/lib_crypto/secp256k1.ml b/src/lib_crypto/secp256k1.ml
index 118b2441b..1bbf05422 100644
--- a/src/lib_crypto/secp256k1.ml
+++ b/src/lib_crypto/secp256k1.ml
@@ -17,7 +17,7 @@ module Public_key_hash = Blake2B.Make(Base58)(struct
 let () =
   Base58.check_encoded_prefix Public_key_hash.b58check_encoding "tz2" 36
 
-open Secp256k1_ml.External
+open Libsecp256k1.External
 
 let context = Context.(create [Verify; Sign])
 
diff --git a/src/lib_crypto/tezos-crypto.opam b/src/lib_crypto/tezos-crypto.opam
index 0652f40bc..09c6ffc51 100644
--- a/src/lib_crypto/tezos-crypto.opam
+++ b/src/lib_crypto/tezos-crypto.opam
@@ -19,7 +19,7 @@ depends: [
   "blake2"
   "tweetnacl"
   "zarith"
-  "secp256k1-internal"
+  "secp256k1"
   "alcotest" { test & >= "0.8.3" }
 ]
 build: [
diff --git a/vendors/ocaml-secp256k1-internal/.gitignore b/vendors/ocaml-secp256k1/.gitignore
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/.gitignore
rename to vendors/ocaml-secp256k1/.gitignore
diff --git a/vendors/ocaml-secp256k1-internal/Makefile b/vendors/ocaml-secp256k1/Makefile
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/Makefile
rename to vendors/ocaml-secp256k1/Makefile
diff --git a/vendors/ocaml-secp256k1-internal/config/config.ml b/vendors/ocaml-secp256k1/config/config.ml
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/config/config.ml
rename to vendors/ocaml-secp256k1/config/config.ml
diff --git a/vendors/ocaml-secp256k1-internal/config/config.mli b/vendors/ocaml-secp256k1/config/config.mli
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/config/config.mli
rename to vendors/ocaml-secp256k1/config/config.mli
diff --git a/vendors/ocaml-secp256k1-internal/config/config_stubs.c b/vendors/ocaml-secp256k1/config/config_stubs.c
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/config/config_stubs.c
rename to vendors/ocaml-secp256k1/config/config_stubs.c
diff --git a/vendors/ocaml-secp256k1-internal/config/discover.ml b/vendors/ocaml-secp256k1/config/discover.ml
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/config/discover.ml
rename to vendors/ocaml-secp256k1/config/discover.ml
diff --git a/vendors/ocaml-secp256k1-internal/config/jbuild b/vendors/ocaml-secp256k1/config/jbuild
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/config/jbuild
rename to vendors/ocaml-secp256k1/config/jbuild
diff --git a/vendors/ocaml-secp256k1-internal/secp256k1-internal.opam b/vendors/ocaml-secp256k1/secp256k1.opam
similarity index 95%
rename from vendors/ocaml-secp256k1-internal/secp256k1-internal.opam
rename to vendors/ocaml-secp256k1/secp256k1.opam
index 420b31d4f..52e4f4d85 100644
--- a/vendors/ocaml-secp256k1-internal/secp256k1-internal.opam
+++ b/vendors/ocaml-secp256k1/secp256k1.opam
@@ -1,5 +1,5 @@
 opam-version: "1.2"
-name: "secp256k1-internal"
+name: "secp256k1"
 version: "0.1"
 authors: "Vincent Bernardoff <vb@luminar.eu.org>"
 maintainer: "Vincent Bernardoff <vb@luminar.eu.org>"
diff --git a/vendors/ocaml-secp256k1-internal/src/basic-config.h b/vendors/ocaml-secp256k1/src/basic-config.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/basic-config.h
rename to vendors/ocaml-secp256k1/src/basic-config.h
diff --git a/vendors/ocaml-secp256k1-internal/src/bench.h b/vendors/ocaml-secp256k1/src/bench.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/bench.h
rename to vendors/ocaml-secp256k1/src/bench.h
diff --git a/vendors/ocaml-secp256k1-internal/src/ecdh.h b/vendors/ocaml-secp256k1/src/ecdh.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/ecdh.h
rename to vendors/ocaml-secp256k1/src/ecdh.h
diff --git a/vendors/ocaml-secp256k1-internal/src/ecdsa.h b/vendors/ocaml-secp256k1/src/ecdsa.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/ecdsa.h
rename to vendors/ocaml-secp256k1/src/ecdsa.h
diff --git a/vendors/ocaml-secp256k1-internal/src/ecdsa_impl.h b/vendors/ocaml-secp256k1/src/ecdsa_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/ecdsa_impl.h
rename to vendors/ocaml-secp256k1/src/ecdsa_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/eckey.h b/vendors/ocaml-secp256k1/src/eckey.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/eckey.h
rename to vendors/ocaml-secp256k1/src/eckey.h
diff --git a/vendors/ocaml-secp256k1-internal/src/eckey_impl.h b/vendors/ocaml-secp256k1/src/eckey_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/eckey_impl.h
rename to vendors/ocaml-secp256k1/src/eckey_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/ecmult.h b/vendors/ocaml-secp256k1/src/ecmult.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/ecmult.h
rename to vendors/ocaml-secp256k1/src/ecmult.h
diff --git a/vendors/ocaml-secp256k1-internal/src/ecmult_const.h b/vendors/ocaml-secp256k1/src/ecmult_const.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/ecmult_const.h
rename to vendors/ocaml-secp256k1/src/ecmult_const.h
diff --git a/vendors/ocaml-secp256k1-internal/src/ecmult_const_impl.h b/vendors/ocaml-secp256k1/src/ecmult_const_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/ecmult_const_impl.h
rename to vendors/ocaml-secp256k1/src/ecmult_const_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/ecmult_gen.h b/vendors/ocaml-secp256k1/src/ecmult_gen.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/ecmult_gen.h
rename to vendors/ocaml-secp256k1/src/ecmult_gen.h
diff --git a/vendors/ocaml-secp256k1-internal/src/ecmult_gen_impl.h b/vendors/ocaml-secp256k1/src/ecmult_gen_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/ecmult_gen_impl.h
rename to vendors/ocaml-secp256k1/src/ecmult_gen_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/ecmult_impl.h b/vendors/ocaml-secp256k1/src/ecmult_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/ecmult_impl.h
rename to vendors/ocaml-secp256k1/src/ecmult_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/ecmult_static_context.h b/vendors/ocaml-secp256k1/src/ecmult_static_context.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/ecmult_static_context.h
rename to vendors/ocaml-secp256k1/src/ecmult_static_context.h
diff --git a/vendors/ocaml-secp256k1-internal/src/external.ml b/vendors/ocaml-secp256k1/src/external.ml
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/external.ml
rename to vendors/ocaml-secp256k1/src/external.ml
diff --git a/vendors/ocaml-secp256k1-internal/src/external.mli b/vendors/ocaml-secp256k1/src/external.mli
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/external.mli
rename to vendors/ocaml-secp256k1/src/external.mli
diff --git a/vendors/ocaml-secp256k1-internal/src/field.h b/vendors/ocaml-secp256k1/src/field.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/field.h
rename to vendors/ocaml-secp256k1/src/field.h
diff --git a/vendors/ocaml-secp256k1-internal/src/field_10x26.h b/vendors/ocaml-secp256k1/src/field_10x26.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/field_10x26.h
rename to vendors/ocaml-secp256k1/src/field_10x26.h
diff --git a/vendors/ocaml-secp256k1-internal/src/field_10x26_impl.h b/vendors/ocaml-secp256k1/src/field_10x26_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/field_10x26_impl.h
rename to vendors/ocaml-secp256k1/src/field_10x26_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/field_5x52.h b/vendors/ocaml-secp256k1/src/field_5x52.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/field_5x52.h
rename to vendors/ocaml-secp256k1/src/field_5x52.h
diff --git a/vendors/ocaml-secp256k1-internal/src/field_5x52_asm_impl.h b/vendors/ocaml-secp256k1/src/field_5x52_asm_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/field_5x52_asm_impl.h
rename to vendors/ocaml-secp256k1/src/field_5x52_asm_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/field_5x52_impl.h b/vendors/ocaml-secp256k1/src/field_5x52_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/field_5x52_impl.h
rename to vendors/ocaml-secp256k1/src/field_5x52_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/field_5x52_int128_impl.h b/vendors/ocaml-secp256k1/src/field_5x52_int128_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/field_5x52_int128_impl.h
rename to vendors/ocaml-secp256k1/src/field_5x52_int128_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/field_impl.h b/vendors/ocaml-secp256k1/src/field_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/field_impl.h
rename to vendors/ocaml-secp256k1/src/field_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/group.h b/vendors/ocaml-secp256k1/src/group.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/group.h
rename to vendors/ocaml-secp256k1/src/group.h
diff --git a/vendors/ocaml-secp256k1-internal/src/group_impl.h b/vendors/ocaml-secp256k1/src/group_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/group_impl.h
rename to vendors/ocaml-secp256k1/src/group_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/hash.h b/vendors/ocaml-secp256k1/src/hash.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/hash.h
rename to vendors/ocaml-secp256k1/src/hash.h
diff --git a/vendors/ocaml-secp256k1-internal/src/hash_impl.h b/vendors/ocaml-secp256k1/src/hash_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/hash_impl.h
rename to vendors/ocaml-secp256k1/src/hash_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/internal.ml b/vendors/ocaml-secp256k1/src/internal.ml
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/internal.ml
rename to vendors/ocaml-secp256k1/src/internal.ml
diff --git a/vendors/ocaml-secp256k1-internal/src/internal.mli b/vendors/ocaml-secp256k1/src/internal.mli
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/internal.mli
rename to vendors/ocaml-secp256k1/src/internal.mli
diff --git a/vendors/ocaml-secp256k1-internal/src/jbuild b/vendors/ocaml-secp256k1/src/jbuild
similarity index 74%
rename from vendors/ocaml-secp256k1-internal/src/jbuild
rename to vendors/ocaml-secp256k1/src/jbuild
index 2c52b3fb2..ef1ade958 100644
--- a/vendors/ocaml-secp256k1-internal/src/jbuild
+++ b/vendors/ocaml-secp256k1/src/jbuild
@@ -1,10 +1,10 @@
 (jbuild_version 1)
 
 (library
- ((name            secp256k1_ml)
-  (public_name     secp256k1-internal)
+ ((name            libsecp256k1)
+  (public_name     secp256k1)
   (modules         (internal external))
-  (libraries       (bigarray cstruct))
+  (libraries       (cstruct))
   (c_names         (secp256k1
                     secp256k1_wrap))
   (c_flags         (:include c_flags.sexp))
diff --git a/vendors/ocaml-secp256k1-internal/src/num.h b/vendors/ocaml-secp256k1/src/num.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/num.h
rename to vendors/ocaml-secp256k1/src/num.h
diff --git a/vendors/ocaml-secp256k1-internal/src/num_gmp.h b/vendors/ocaml-secp256k1/src/num_gmp.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/num_gmp.h
rename to vendors/ocaml-secp256k1/src/num_gmp.h
diff --git a/vendors/ocaml-secp256k1-internal/src/num_gmp_impl.h b/vendors/ocaml-secp256k1/src/num_gmp_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/num_gmp_impl.h
rename to vendors/ocaml-secp256k1/src/num_gmp_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/num_impl.h b/vendors/ocaml-secp256k1/src/num_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/num_impl.h
rename to vendors/ocaml-secp256k1/src/num_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/recovery.h b/vendors/ocaml-secp256k1/src/recovery.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/recovery.h
rename to vendors/ocaml-secp256k1/src/recovery.h
diff --git a/vendors/ocaml-secp256k1-internal/src/scalar.h b/vendors/ocaml-secp256k1/src/scalar.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/scalar.h
rename to vendors/ocaml-secp256k1/src/scalar.h
diff --git a/vendors/ocaml-secp256k1-internal/src/scalar_4x64.h b/vendors/ocaml-secp256k1/src/scalar_4x64.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/scalar_4x64.h
rename to vendors/ocaml-secp256k1/src/scalar_4x64.h
diff --git a/vendors/ocaml-secp256k1-internal/src/scalar_4x64_impl.h b/vendors/ocaml-secp256k1/src/scalar_4x64_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/scalar_4x64_impl.h
rename to vendors/ocaml-secp256k1/src/scalar_4x64_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/scalar_8x32.h b/vendors/ocaml-secp256k1/src/scalar_8x32.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/scalar_8x32.h
rename to vendors/ocaml-secp256k1/src/scalar_8x32.h
diff --git a/vendors/ocaml-secp256k1-internal/src/scalar_8x32_impl.h b/vendors/ocaml-secp256k1/src/scalar_8x32_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/scalar_8x32_impl.h
rename to vendors/ocaml-secp256k1/src/scalar_8x32_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/scalar_impl.h b/vendors/ocaml-secp256k1/src/scalar_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/scalar_impl.h
rename to vendors/ocaml-secp256k1/src/scalar_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/scalar_low.h b/vendors/ocaml-secp256k1/src/scalar_low.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/scalar_low.h
rename to vendors/ocaml-secp256k1/src/scalar_low.h
diff --git a/vendors/ocaml-secp256k1-internal/src/scalar_low_impl.h b/vendors/ocaml-secp256k1/src/scalar_low_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/scalar_low_impl.h
rename to vendors/ocaml-secp256k1/src/scalar_low_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/scratch.h b/vendors/ocaml-secp256k1/src/scratch.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/scratch.h
rename to vendors/ocaml-secp256k1/src/scratch.h
diff --git a/vendors/ocaml-secp256k1-internal/src/scratch_impl.h b/vendors/ocaml-secp256k1/src/scratch_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/scratch_impl.h
rename to vendors/ocaml-secp256k1/src/scratch_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/secp256k1.c b/vendors/ocaml-secp256k1/src/secp256k1.c
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/secp256k1.c
rename to vendors/ocaml-secp256k1/src/secp256k1.c
diff --git a/vendors/ocaml-secp256k1-internal/src/secp256k1.h b/vendors/ocaml-secp256k1/src/secp256k1.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/secp256k1.h
rename to vendors/ocaml-secp256k1/src/secp256k1.h
diff --git a/vendors/ocaml-secp256k1-internal/src/secp256k1_ecdh.h b/vendors/ocaml-secp256k1/src/secp256k1_ecdh.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/secp256k1_ecdh.h
rename to vendors/ocaml-secp256k1/src/secp256k1_ecdh.h
diff --git a/vendors/ocaml-secp256k1-internal/src/secp256k1_recovery.h b/vendors/ocaml-secp256k1/src/secp256k1_recovery.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/secp256k1_recovery.h
rename to vendors/ocaml-secp256k1/src/secp256k1_recovery.h
diff --git a/vendors/ocaml-secp256k1-internal/src/secp256k1_wrap.c b/vendors/ocaml-secp256k1/src/secp256k1_wrap.c
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/secp256k1_wrap.c
rename to vendors/ocaml-secp256k1/src/secp256k1_wrap.c
diff --git a/vendors/ocaml-secp256k1-internal/src/testrand.h b/vendors/ocaml-secp256k1/src/testrand.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/testrand.h
rename to vendors/ocaml-secp256k1/src/testrand.h
diff --git a/vendors/ocaml-secp256k1-internal/src/testrand_impl.h b/vendors/ocaml-secp256k1/src/testrand_impl.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/testrand_impl.h
rename to vendors/ocaml-secp256k1/src/testrand_impl.h
diff --git a/vendors/ocaml-secp256k1-internal/src/util.h b/vendors/ocaml-secp256k1/src/util.h
similarity index 100%
rename from vendors/ocaml-secp256k1-internal/src/util.h
rename to vendors/ocaml-secp256k1/src/util.h
diff --git a/vendors/ocaml-secp256k1-internal/test/jbuild b/vendors/ocaml-secp256k1/test/jbuild
similarity index 70%
rename from vendors/ocaml-secp256k1-internal/test/jbuild
rename to vendors/ocaml-secp256k1/test/jbuild
index 75d6dede2..36e0f7647 100644
--- a/vendors/ocaml-secp256k1-internal/test/jbuild
+++ b/vendors/ocaml-secp256k1/test/jbuild
@@ -2,7 +2,7 @@
 
 (executable
  ((name test)
-  (libraries (hex secp256k1-internal alcotest))))
+  (libraries (hex libsecp256k1 alcotest))))
 
 (alias
  ((name    runtest)
diff --git a/vendors/ocaml-secp256k1-internal/test/test.ml b/vendors/ocaml-secp256k1/test/test.ml
similarity index 99%
rename from vendors/ocaml-secp256k1-internal/test/test.ml
rename to vendors/ocaml-secp256k1/test/test.ml
index 88a00d933..a8f60c58c 100644
--- a/vendors/ocaml-secp256k1-internal/test/test.ml
+++ b/vendors/ocaml-secp256k1/test/test.ml
@@ -1,4 +1,4 @@
-open Secp256k1_ml
+open Libsecp256k1
 
 let assert_equal a b = assert (a = b)