diff --git a/Makefile b/Makefile
index 51c8f2089..6ec771893 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@ all:
 	@cp _build/default/src/client_main.exe tezos-client
 	@cp _build/default/src/compiler_main.exe tezos-protocol-compiler
 
+doc-html:
+	@jbuilder build @doc
+
 build-test:
 	@jbuilder build @buildtest
 
diff --git a/src/client/jbuild b/src/client/jbuild
index d2a69ed9e..4fbfe30ac 100644
--- a/src/client/jbuild
+++ b/src/client/jbuild
@@ -2,6 +2,7 @@
 
 (library
  ((name client_lib)
+  (public_name tezos.client)
   (libraries (minutils
               utils
               cohttp
diff --git a/src/compiler/jbuild b/src/compiler/jbuild
index 4a2718edc..d93fcb45a 100644
--- a/src/compiler/jbuild
+++ b/src/compiler/jbuild
@@ -11,6 +11,7 @@
 
 (library
  ((name tezos_protocol_compiler)
+  (public_name tezos.protocol_compiler)
   (libraries (utils
               minutils
               tezos_protocol_environment_sigs
diff --git a/src/environment/jbuild b/src/environment/jbuild
index 6a1db5a65..65c8b7501 100644
--- a/src/environment/jbuild
+++ b/src/environment/jbuild
@@ -51,5 +51,6 @@
 
 (library
  ((name tezos_protocol_environment_sigs)
+  (public_name tezos.protocol_environment.sigs)
   (flags (:standard -nopervasives))
   (modules ("V1"))))
diff --git a/src/micheline/jbuild b/src/micheline/jbuild
index 53478a4fa..bdc7f848f 100644
--- a/src/micheline/jbuild
+++ b/src/micheline/jbuild
@@ -2,6 +2,7 @@
 
 (library
  ((name micheline)
+  (public_name tezos.micheline)
   (libraries
    (
     ;; External
diff --git a/src/minutils/jbuild b/src/minutils/jbuild
index e4730ea26..d54c5b4b7 100644
--- a/src/minutils/jbuild
+++ b/src/minutils/jbuild
@@ -2,6 +2,7 @@
 
 (library
     ((name minutils)
+     (public_name tezos.minutils)
      (libraries (cstruct
                  lwt
                  ocplib-json-typed.bson
diff --git a/src/node/db/jbuild b/src/node/db/jbuild
index d149dc06c..53039437e 100644
--- a/src/node/db/jbuild
+++ b/src/node/db/jbuild
@@ -2,6 +2,7 @@
 
 (library
  ((name node_db)
+  (public_name tezos.node.db)
   (libraries (utils minutils leveldb irmin irmin-unix))
   (flags (:standard -w +27-30-40@8
                     -open Error_monad
diff --git a/src/node/net/jbuild b/src/node/net/jbuild
index 884d10e28..3b101dc89 100644
--- a/src/node/net/jbuild
+++ b/src/node/net/jbuild
@@ -2,6 +2,7 @@
 
 (library
  ((name node_net)
+  (public_name tezos.node.net)
   (libraries (utils minutils conduit-lwt-unix cohttp cohttp-lwt-unix))
   (flags (:standard -w +27-30-40@8
                     -open Error_monad
diff --git a/src/node/shell/jbuild b/src/node/shell/jbuild
index 7b73320a4..4adc3b71b 100644
--- a/src/node/shell/jbuild
+++ b/src/node/shell/jbuild
@@ -2,6 +2,7 @@
 
 (library
  ((name node_shell)
+  (public_name tezos.node.shell)
   (libraries (utils minutils node_net node_db node_updater ezjsonm ocplib-json-typed.bson))
   (flags (:standard -w +27-30-40@8
                     -open Error_monad
diff --git a/src/node/updater/jbuild b/src/node/updater/jbuild
index ba2909fbb..2b43c7c27 100644
--- a/src/node/updater/jbuild
+++ b/src/node/updater/jbuild
@@ -2,6 +2,7 @@
 
 (library
  ((name node_updater)
+  (public_name tezos.node.updater)
   (libraries (utils minutils micheline tezos_protocol_compiler node_db dynlink))
   (flags (:standard -w +27-30-40@8
                     -open Error_monad
diff --git a/src/proto/alpha/jbuild b/src/proto/alpha/jbuild
index cf9d86b23..7280c038b 100644
--- a/src/proto/alpha/jbuild
+++ b/src/proto/alpha/jbuild
@@ -26,12 +26,14 @@ let () =
 
 (library
   ((name tezos_protocol_environment_alpha)
+   (public_name tezos.protocol_environment.alpha)
    (library_flags (:standard -linkall))
    (libraries (node_updater))
    (modules (Environment))))
 
 (library
   ((name tezos_embedded_raw_protocol_alpha)
+   (public_name tezos.embedded_raw_protocol.alpha)
    (libraries (tezos_protocol_environment_alpha))
    (library_flags (:standard -linkall))
    (flags (:standard -nopervasives -nostdlib
@@ -45,6 +47,7 @@ let () =
 
 (library
   ((name tezos_embedded_protocol_alpha)
+   (public_name tezos.embedded_protocol.alpha)
    (library_flags (:standard -linkall))
    (libraries (tezos_embedded_raw_protocol_alpha node_shell))
    (modules (Registerer))))
diff --git a/src/utils/jbuild b/src/utils/jbuild
index e42f5f8a9..eaa202d38 100644
--- a/src/utils/jbuild
+++ b/src/utils/jbuild
@@ -2,6 +2,7 @@
 
 (library
  ((name utils)
+  (public_name tezos.utils)
   (libraries
    (
     ;; External