diff --git a/lib_node_http/RPC_server.ml b/lib_node_http/RPC_server.ml
index 5e0669b76..181d6aca8 100644
--- a/lib_node_http/RPC_server.ml
+++ b/lib_node_http/RPC_server.ml
@@ -7,15 +7,15 @@
 (*                                                                        *)
 (**************************************************************************)
 
-type cors = RestoCohttp.cors = {
+type cors = Resto_cohttp.Server.cors = {
   allowed_headers : string list ;
   allowed_origins : string list ;
 }
 
-include RestoDirectory
-module Directory = RestoDirectory.MakeDirectory(RPC.Data)
+include Resto_directory
+module Directory = Resto_directory.Make(RPC.Data)
 
-include RestoCohttp.Make(RPC.Data)(Logging.RPC)
+include Resto_cohttp.Server.Make(RPC.Data)(Logging.RPC)
 
 let json  = {
   name = "application/json" ;
diff --git a/lib_node_http/RPC_server.mli b/lib_node_http/RPC_server.mli
index 538c3c14e..1fe8337e6 100644
--- a/lib_node_http/RPC_server.mli
+++ b/lib_node_http/RPC_server.mli
@@ -9,8 +9,8 @@
 
 
 module Directory :
-  (module type of struct include RestoDirectory.MakeDirectory(RPC.Data) end)
-include (module type of struct include RestoDirectory end)
+  (module type of struct include Resto_directory.Make(RPC.Data) end)
+include (module type of struct include Resto_directory end)
 
 (** Typed RPC services: server implementation. *)
 
diff --git a/vendors/ocplib-resto/lib_ezresto-directory/ezRestoDirectory.ml b/vendors/ocplib-resto/lib_ezresto-directory/ezResto_directory.ml
similarity index 97%
rename from vendors/ocplib-resto/lib_ezresto-directory/ezRestoDirectory.ml
rename to vendors/ocplib-resto/lib_ezresto-directory/ezResto_directory.ml
index c85382a65..c80e341bf 100644
--- a/vendors/ocplib-resto/lib_ezresto-directory/ezRestoDirectory.ml
+++ b/vendors/ocplib-resto/lib_ezresto-directory/ezResto_directory.ml
@@ -11,8 +11,8 @@
 open Resto
 open Lwt.Infix
 
-open RestoDirectory
-module Directory = RestoDirectory.MakeDirectory(RestoJson.Encoding)
+open Resto_directory
+module Directory = Resto_directory.Make(Resto_json.Encoding)
 open Directory
 
 module Answer = Answer
diff --git a/vendors/ocplib-resto/lib_ezresto-directory/ezRestoDirectory.mli b/vendors/ocplib-resto/lib_ezresto-directory/ezResto_directory.mli
similarity index 100%
rename from vendors/ocplib-resto/lib_ezresto-directory/ezRestoDirectory.mli
rename to vendors/ocplib-resto/lib_ezresto-directory/ezResto_directory.mli
diff --git a/vendors/ocplib-resto/lib_ezresto-directory/jbuild b/vendors/ocplib-resto/lib_ezresto-directory/jbuild
index 476b49c4e..0fc92a141 100644
--- a/vendors/ocplib-resto/lib_ezresto-directory/jbuild
+++ b/vendors/ocplib-resto/lib_ezresto-directory/jbuild
@@ -4,5 +4,4 @@
  ((name ezresto_directory)
   (public_name ocplib-ezresto-directory)
   (libraries (ocplib-ezresto ocplib-resto-directory))
-  (modules (EzRestoDirectory))
   (wrapped false)))
diff --git a/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam b/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam
index ef8abfe46..debb44a4b 100644
--- a/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam
+++ b/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam
@@ -1,6 +1,5 @@
 version: "dev"
 opam-version: "1.2"
-name: "ocplib-resto-directory"
 maintainer: "Grégoire Henry <gregoire.henry@tezos.com>"
 authors: "Grégoire Henry <gregoire.henry@tezos.com>"
 license: "LGPL-2.1-with-OCaml-exception"
@@ -9,7 +8,6 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
 dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
 
 build: [
-  [ "jbuilder" "subst" "-n" "ocplib-resto" ] {pinned}
   [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 build-test: [
diff --git a/vendors/ocplib-resto/lib_ezresto-directory/test/ezDirectory.ml b/vendors/ocplib-resto/lib_ezresto-directory/test/ezDirectory.ml
index 0bf8b7c2d..f909c77b8 100644
--- a/vendors/ocplib-resto/lib_ezresto-directory/test/ezDirectory.ml
+++ b/vendors/ocplib-resto/lib_ezresto-directory/test/ezDirectory.ml
@@ -9,7 +9,7 @@
 (**************************************************************************)
 
 open EzServices
-include EzRestoDirectory
+include EzResto_directory
 
 let rec repeat i json =
   if i <= 0 then []
diff --git a/vendors/ocplib-resto/lib_ezresto-directory/test/jbuild b/vendors/ocplib-resto/lib_ezresto-directory/test/jbuild
index d400977f1..c1bbbb1b8 100644
--- a/vendors/ocplib-resto/lib_ezresto-directory/test/jbuild
+++ b/vendors/ocplib-resto/lib_ezresto-directory/test/jbuild
@@ -2,7 +2,6 @@
 
 (executable
  ((name ezResto_test)
-  (modules (EzServices EzDirectory EzResto_test))
   (libraries (ocplib-ezresto-directory lwt.unix))))
 
 (alias
diff --git a/vendors/ocplib-resto/lib_ezresto/ezResto.ml b/vendors/ocplib-resto/lib_ezresto/ezResto.ml
index 8b38e785e..41e335664 100644
--- a/vendors/ocplib-resto/lib_ezresto/ezResto.ml
+++ b/vendors/ocplib-resto/lib_ezresto/ezResto.ml
@@ -10,7 +10,7 @@
 
 
 open Resto
-module Service = Resto.MakeService(RestoJson.Encoding)
+module Service = Resto.MakeService(Resto_json.Encoding)
 open Service
 
 type meth = [ `GET | `POST | `DELETE | `PUT | `PATCH ]
diff --git a/vendors/ocplib-resto/lib_ezresto/ezResto.mli b/vendors/ocplib-resto/lib_ezresto/ezResto.mli
index 266aa6be7..dd3bb32b3 100644
--- a/vendors/ocplib-resto/lib_ezresto/ezResto.mli
+++ b/vendors/ocplib-resto/lib_ezresto/ezResto.mli
@@ -80,7 +80,7 @@ end
 
 (** Services. *)
 type ('meth, 'params, 'query, 'input, 'output, 'error) service =
-  ('meth, unit, 'params, 'query, 'input, 'output, 'error) Resto.MakeService(RestoJson.Encoding).service
+  ('meth, unit, 'params, 'query, 'input, 'output, 'error) Resto.MakeService(Resto_json.Encoding).service
 
 val get_service:
   ?description: string ->
diff --git a/vendors/ocplib-resto/lib_ezresto/jbuild b/vendors/ocplib-resto/lib_ezresto/jbuild
index 2b6345bc3..e0acf5ab9 100644
--- a/vendors/ocplib-resto/lib_ezresto/jbuild
+++ b/vendors/ocplib-resto/lib_ezresto/jbuild
@@ -4,5 +4,4 @@
  ((name ezresto)
   (public_name ocplib-ezresto)
   (libraries (ocplib-resto-json))
-  (modules (EzResto))
   (wrapped false)))
diff --git a/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam b/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam
index 9d562bbfb..e53a25595 100644
--- a/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam
+++ b/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam
@@ -1,6 +1,5 @@
 version: "dev"
 opam-version: "1.2"
-name: "ocplib-ezresto"
 maintainer: "Grégoire Henry <gregoire.henry@tezos.com>"
 authors: "Grégoire Henry <gregoire.henry@tezos.com>"
 license: "LGPL-2.1-with-OCaml-exception"
@@ -9,7 +8,6 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
 dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
 
 build: [
-  [ "jbuilder" "subst" "-n" "ocplib-resto" ] {pinned}
   [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 build-test: [
diff --git a/vendors/ocplib-resto/lib_resto-cohttp/jbuild b/vendors/ocplib-resto/lib_resto-cohttp/jbuild
index 88c6759e7..84d90eb7a 100644
--- a/vendors/ocplib-resto/lib_resto-cohttp/jbuild
+++ b/vendors/ocplib-resto/lib_resto-cohttp/jbuild
@@ -3,7 +3,5 @@
 (library
  ((name resto_cohttp)
   (public_name ocplib-resto-cohttp)
-  (libraries (ocplib-resto-directory cohttp-lwt-unix))
-  (modules (RestoCohttp))
-  (wrapped false)))
+  (libraries (ocplib-resto-directory cohttp-lwt-unix))))
 
diff --git a/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam b/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam
index ccf0976bf..4eceed421 100644
--- a/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam
+++ b/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam
@@ -1,6 +1,5 @@
 version: "dev"
 opam-version: "1.2"
-name: "ocplib-resto-cohttp"
 maintainer: "Grégoire Henry <gregoire.henry@tezos.com>"
 authors: "Grégoire Henry <gregoire.henry@tezos.com>"
 license: "LGPL-2.1-with-OCaml-exception"
@@ -9,7 +8,6 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
 dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
 
 build: [
-  [ "jbuilder" "subst" "-n" "ocplib-resto" ] {pinned}
   [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 build-test: [
diff --git a/vendors/ocplib-resto/lib_resto-cohttp/restoCohttp.ml b/vendors/ocplib-resto/lib_resto-cohttp/server.ml
similarity index 99%
rename from vendors/ocplib-resto/lib_resto-cohttp/restoCohttp.ml
rename to vendors/ocplib-resto/lib_resto-cohttp/server.ml
index 401cef493..6374aabb9 100644
--- a/vendors/ocplib-resto/lib_resto-cohttp/restoCohttp.ml
+++ b/vendors/ocplib-resto/lib_resto-cohttp/server.ml
@@ -104,7 +104,7 @@ module Make (Encoding : Resto.ENCODING)(Log : LOGGING) = struct
   open Cohttp
 
   module Service = Resto.MakeService(Encoding)
-  module Directory = RestoDirectory.MakeDirectory(Encoding)
+  module Directory = Resto_directory.Make(Encoding)
 
   type media_type = {
     name: string ;
@@ -158,7 +158,7 @@ module Make (Encoding : Resto.ENCODING)(Log : LOGGING) = struct
            if not !running then
              Lwt.return None
            else
-             s.RestoDirectory.Answer.next () >|= function
+             s.Resto_directory.Answer.next () >|= function
              | None -> None
              | Some x -> Some (to_string x)) in
     let shutdown () =
diff --git a/vendors/ocplib-resto/lib_resto-cohttp/restoCohttp.mli b/vendors/ocplib-resto/lib_resto-cohttp/server.mli
similarity index 97%
rename from vendors/ocplib-resto/lib_resto-cohttp/restoCohttp.mli
rename to vendors/ocplib-resto/lib_resto-cohttp/server.mli
index f2e0aeb4f..04c73ee44 100644
--- a/vendors/ocplib-resto/lib_resto-cohttp/restoCohttp.mli
+++ b/vendors/ocplib-resto/lib_resto-cohttp/server.mli
@@ -48,7 +48,7 @@ module Make (Encoding : Resto.ENCODING) (Log : LOGGING) : sig
     ?cors:cors ->
     media_types:media_type list ->
     Conduit_lwt_unix.server ->
-    unit RestoDirectory.MakeDirectory(Encoding).t ->
+    unit Resto_directory.Make(Encoding).t ->
     server Lwt.t
 
   (** Kill an RPC server. *)
diff --git a/vendors/ocplib-resto/lib_resto-directory/jbuild b/vendors/ocplib-resto/lib_resto-directory/jbuild
index bcb343e76..ac7a56874 100644
--- a/vendors/ocplib-resto/lib_resto-directory/jbuild
+++ b/vendors/ocplib-resto/lib_resto-directory/jbuild
@@ -4,6 +4,5 @@
  ((name resto_directory)
   (public_name ocplib-resto-directory)
   (libraries (lwt ocplib-resto))
-  (modules (RestoDirectory))
   (wrapped false)))
 
diff --git a/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam b/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam
index 51da62a65..60ebdf99f 100644
--- a/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam
+++ b/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam
@@ -1,6 +1,5 @@
 version: "dev"
 opam-version: "1.2"
-name: "ocplib-resto-directory"
 maintainer: "Grégoire Henry <gregoire.henry@tezos.com>"
 authors: "Grégoire Henry <gregoire.henry@tezos.com>"
 license: "LGPL-2.1-with-OCaml-exception"
@@ -9,7 +8,6 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
 dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
 
 build: [
-  [ "jbuilder" "subst" "-n" "ocplib-resto" ] {pinned}
   [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 build-test: [
diff --git a/vendors/ocplib-resto/lib_resto-directory/restoDirectory.ml b/vendors/ocplib-resto/lib_resto-directory/resto_directory.ml
similarity index 99%
rename from vendors/ocplib-resto/lib_resto-directory/restoDirectory.ml
rename to vendors/ocplib-resto/lib_resto-directory/resto_directory.ml
index a6828115d..a3c78e573 100644
--- a/vendors/ocplib-resto/lib_resto-directory/restoDirectory.ml
+++ b/vendors/ocplib-resto/lib_resto-directory/resto_directory.ml
@@ -42,7 +42,7 @@ module Answer = struct
 
 end
 
-module MakeDirectory (Encoding : ENCODING) = struct
+module Make (Encoding : ENCODING) = struct
 
   module Service = Resto.MakeService(Encoding)
 
diff --git a/vendors/ocplib-resto/lib_resto-directory/restoDirectory.mli b/vendors/ocplib-resto/lib_resto-directory/resto_directory.mli
similarity index 99%
rename from vendors/ocplib-resto/lib_resto-directory/restoDirectory.mli
rename to vendors/ocplib-resto/lib_resto-directory/resto_directory.mli
index f756a1263..d31f3d64c 100644
--- a/vendors/ocplib-resto/lib_resto-directory/restoDirectory.mli
+++ b/vendors/ocplib-resto/lib_resto-directory/resto_directory.mli
@@ -35,7 +35,7 @@ module Answer : sig
 
 end
 
-module MakeDirectory (Encoding : ENCODING) : sig
+module Make (Encoding : ENCODING) : sig
 
   module Service : (module type of (struct include Resto.MakeService(Encoding) end))
 
diff --git a/vendors/ocplib-resto/lib_resto-directory/test/directory.ml b/vendors/ocplib-resto/lib_resto-directory/test/directory.ml
index 8598ecb79..675a5b2bb 100644
--- a/vendors/ocplib-resto/lib_resto-directory/test/directory.ml
+++ b/vendors/ocplib-resto/lib_resto-directory/test/directory.ml
@@ -10,7 +10,7 @@
 
 open Services
 
-include RestoDirectory.MakeDirectory(RestoJson.Encoding)
+include Resto_directory.Make(Resto_json.Encoding)
 
 let rec repeat i json =
   if i <= 0 then []
diff --git a/vendors/ocplib-resto/lib_resto-directory/test/jbuild b/vendors/ocplib-resto/lib_resto-directory/test/jbuild
index dd4c3daba..fc410cb49 100644
--- a/vendors/ocplib-resto/lib_resto-directory/test/jbuild
+++ b/vendors/ocplib-resto/lib_resto-directory/test/jbuild
@@ -2,7 +2,6 @@
 
 (executable
  ((name resto_test)
-  (modules (Services Directory Resto_test))
   (libraries (ocplib-resto-directory ocplib-resto-json lwt.unix))))
 
 (alias
diff --git a/vendors/ocplib-resto/lib_resto-directory/test/resto_test.ml b/vendors/ocplib-resto/lib_resto-directory/test/resto_test.ml
index e28c6f815..f042f4476 100644
--- a/vendors/ocplib-resto/lib_resto-directory/test/resto_test.ml
+++ b/vendors/ocplib-resto/lib_resto-directory/test/resto_test.ml
@@ -10,7 +10,7 @@
 
 open Services
 open Directory
-open RestoDirectory
+open Resto_directory
 open Lwt.Infix
 
 let () =
diff --git a/vendors/ocplib-resto/lib_resto-directory/test/services.ml b/vendors/ocplib-resto/lib_resto-directory/test/services.ml
index 63d30f999..51a48b7b9 100644
--- a/vendors/ocplib-resto/lib_resto-directory/test/services.ml
+++ b/vendors/ocplib-resto/lib_resto-directory/test/services.ml
@@ -9,7 +9,7 @@
 (**************************************************************************)
 
 open Resto
-module Service = MakeService(RestoJson.Encoding)
+module Service = MakeService(Resto_json.Encoding)
 open Service
 
 (** Shared part *)
diff --git a/vendors/ocplib-resto/lib_resto-json/jbuild b/vendors/ocplib-resto/lib_resto-json/jbuild
index 2bba91404..adb725d35 100644
--- a/vendors/ocplib-resto/lib_resto-json/jbuild
+++ b/vendors/ocplib-resto/lib_resto-json/jbuild
@@ -4,5 +4,4 @@
  ((name resto_json)
   (public_name ocplib-resto-json)
   (libraries (ocplib-json-typed ocplib-json-typed.bson ocplib-resto))
-  (modules (RestoJson))
   (wrapped false)))
diff --git a/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam b/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam
index 0caea88d3..98237d24b 100644
--- a/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam
+++ b/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam
@@ -1,6 +1,5 @@
 version: "dev"
 opam-version: "1.2"
-name: "ocplib-resto-json"
 maintainer: "Grégoire Henry <gregoire.henry@tezos.com>"
 authors: "Grégoire Henry <gregoire.henry@tezos.com>"
 license: "LGPL-2.1-with-OCaml-exception"
@@ -9,7 +8,6 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
 dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
 
 build: [
-  [ "jbuilder" "subst" "-n" "ocplib-resto" ] {pinned}
   [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 build-test: [
diff --git a/vendors/ocplib-resto/lib_resto-json/restoJson.ml b/vendors/ocplib-resto/lib_resto-json/resto_json.ml
similarity index 100%
rename from vendors/ocplib-resto/lib_resto-json/restoJson.ml
rename to vendors/ocplib-resto/lib_resto-json/resto_json.ml
diff --git a/vendors/ocplib-resto/lib_resto-json/restoJson.mli b/vendors/ocplib-resto/lib_resto-json/resto_json.mli
similarity index 100%
rename from vendors/ocplib-resto/lib_resto-json/restoJson.mli
rename to vendors/ocplib-resto/lib_resto-json/resto_json.mli
diff --git a/vendors/ocplib-resto/lib_resto/jbuild b/vendors/ocplib-resto/lib_resto/jbuild
index aeabd3bf7..c9adb387d 100644
--- a/vendors/ocplib-resto/lib_resto/jbuild
+++ b/vendors/ocplib-resto/lib_resto/jbuild
@@ -3,6 +3,5 @@
 (library
  ((name resto)
   (public_name ocplib-resto)
-  (modules (Resto))
   (flags (-w -30))
   (wrapped false)))
diff --git a/vendors/ocplib-resto/lib_resto/ocplib-resto.opam b/vendors/ocplib-resto/lib_resto/ocplib-resto.opam
index 19604bd5e..01ab243d9 100644
--- a/vendors/ocplib-resto/lib_resto/ocplib-resto.opam
+++ b/vendors/ocplib-resto/lib_resto/ocplib-resto.opam
@@ -1,6 +1,5 @@
 version: "dev"
 opam-version: "1.2"
-name: "ocplib-resto"
 maintainer: "Grégoire Henry <gregoire.henry@tezos.com>"
 authors: "Grégoire Henry <gregoire.henry@tezos.com>"
 license: "LGPL-2.1-with-OCaml-exception"
@@ -9,7 +8,6 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
 dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
 
 build: [
-  [ "jbuilder" "subst" "-n" "ocplib-resto" ] {pinned}
   [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 build-test: [