diff --git a/dune-project b/dune-project
index 4a93b67..f7f6943 100644
--- a/dune-project
+++ b/dune-project
@@ -45,7 +45,7 @@
    (>= 0.16.2))))
 
 (package
- (name mehari.mirage)
+ (name mehari-mirage)
  (synopsis "Mehari IO implementation for MirageOS")
  (depends
   mehari
@@ -67,11 +67,11 @@
    (>= 0.15.4))))
 
 (package
- (name mehari.lwt_unix)
+ (name mehari-lwt-unix)
  (synopsis "Mehari IO implementation using Lwt and Unix bindings")
  (depends
   mehari
-  mehari.mirage
+  mehari-mirage
   (lwt
    (>= 5.6.1))
   (lwt_ppx
@@ -86,7 +86,7 @@
    (>= 7.1.2))))
 
 (package
- (name mehari.eio)
+ (name mehari-eio)
  (synopsis "Mehari IO implementation using Eio")
  (depends
   (ocaml
@@ -106,12 +106,12 @@
    (>= 4.2.0))))
 
 (package
- (name mehari.eio_unix)
+ (name mehari-eio-unix)
  (synopsis "Mehari IO implementation using Eio and Unix bindings")
  (depends
   (ocaml
    (>= 5.0.0))
   mehari
-  mehari.eio
+  mehari-eio
   (eio
    (>= 0.7))))
diff --git a/examples/dune b/examples/dune
index 87a743d..93cd39b 100644
--- a/examples/dune
+++ b/examples/dune
@@ -16,9 +16,9 @@
   ipaddr
   eio_main
   mehari
-  mehari.eio
-  mehari.eio_unix
-  mehari.lwt_unix
+  mehari-eio
+  mehari-eio-unix
+  mehari-lwt-unix
   mirage-crypto-rng-eio
   logs
   logs.fmt
diff --git a/mehari-eio-unix.opam b/mehari-eio-unix.opam
new file mode 100644
index 0000000..8185bc1
--- /dev/null
+++ b/mehari-eio-unix.opam
@@ -0,0 +1,34 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+version: "0.1"
+synopsis: "Mehari IO implementation using Eio and Unix bindings"
+maintainer: ["tim.arnouts@protonmail.com" "lelolartichaut@laposte.net"]
+authors: ["The mehari programmers"]
+license: "LGPL-3.0-or-later"
+homepage: "https://github.com/Psi-Prod/Mehari"
+bug-reports: "https://github.com/Psi-Prod/Mehari/issues"
+depends: [
+  "dune" {>= "2.9"}
+  "ocaml" {>= "5.0.0"}
+  "mehari"
+  "mehari-eio"
+  "eio" {>= "0.7"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
+]
+dev-repo: "git+https://github.com/Psi-Prod/Mehari.git"
diff --git a/mehari-eio-unix/dune b/mehari-eio-unix/dune
index a4278ec..738805e 100644
--- a/mehari-eio-unix/dune
+++ b/mehari-eio-unix/dune
@@ -1,4 +1,4 @@
 (library
  (name mehari_eio_unix)
- (public_name mehari.eio_unix)
- (libraries eio mehari mehari.eio))
+ (public_name mehari-eio-unix)
+ (libraries eio mehari mehari-eio))
diff --git a/mehari-eio.opam b/mehari-eio.opam
new file mode 100644
index 0000000..da4a590
--- /dev/null
+++ b/mehari-eio.opam
@@ -0,0 +1,38 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+version: "0.1"
+synopsis: "Mehari IO implementation using Eio"
+maintainer: ["tim.arnouts@protonmail.com" "lelolartichaut@laposte.net"]
+authors: ["The mehari programmers"]
+license: "LGPL-3.0-or-later"
+homepage: "https://github.com/Psi-Prod/Mehari"
+bug-reports: "https://github.com/Psi-Prod/Mehari/issues"
+depends: [
+  "dune" {>= "2.9"}
+  "ocaml" {>= "5.0.0"}
+  "mehari"
+  "eio" {>= "0.7"}
+  "mirage-clock-unix" {>= "4.2.0"}
+  "logs" {>= "0.7.0"}
+  "tls" {>= "0.15.4"}
+  "tls-eio" {>= "0.15.5"}
+  "uri" {>= "4.2.0"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
+]
+dev-repo: "git+https://github.com/Psi-Prod/Mehari.git"
diff --git a/mehari-eio/dune b/mehari-eio/dune
index 4a0e563..22f57f0 100644
--- a/mehari-eio/dune
+++ b/mehari-eio/dune
@@ -1,4 +1,4 @@
 (library
  (name mehari_eio)
- (public_name mehari.eio)
+ (public_name mehari-eio)
  (libraries eio mehari mirage-clock-unix logs tls tls-eio uri))
diff --git a/mehari-lwt-unix.opam b/mehari-lwt-unix.opam
new file mode 100644
index 0000000..b004a05
--- /dev/null
+++ b/mehari-lwt-unix.opam
@@ -0,0 +1,38 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+version: "0.1"
+synopsis: "Mehari IO implementation using Lwt and Unix bindings"
+maintainer: ["tim.arnouts@protonmail.com" "lelolartichaut@laposte.net"]
+authors: ["The mehari programmers"]
+license: "LGPL-3.0-or-later"
+homepage: "https://github.com/Psi-Prod/Mehari"
+bug-reports: "https://github.com/Psi-Prod/Mehari/issues"
+depends: [
+  "dune" {>= "2.9"}
+  "mehari"
+  "mehari-mirage"
+  "lwt" {>= "5.6.1"}
+  "lwt_ppx" {>= "2.1.0"}
+  "mirage-clock-unix" {>= "4.2.0"}
+  "mirage-flow-unix" {>= "3.0.0"}
+  "mirage-time-unix" {>= "3.0.0"}
+  "tcpip" {>= "7.1.2"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
+]
+dev-repo: "git+https://github.com/Psi-Prod/Mehari.git"
diff --git a/mehari-lwt-unix/dune b/mehari-lwt-unix/dune
index 30c0e59..57085bf 100644
--- a/mehari-lwt-unix/dune
+++ b/mehari-lwt-unix/dune
@@ -1,10 +1,10 @@
 (library
  (name mehari_lwt_unix)
- (public_name mehari.lwt_unix)
+ (public_name mehari-lwt-unix)
  (libraries
   lwt
   lwt.unix
-  mehari.mirage
+  mehari-mirage
   mirage-clock-unix
   mirage-flow-unix
   mirage-time-unix
diff --git a/mehari-mirage.opam b/mehari-mirage.opam
new file mode 100644
index 0000000..dd8134e
--- /dev/null
+++ b/mehari-mirage.opam
@@ -0,0 +1,39 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+version: "0.1"
+synopsis: "Mehari IO implementation for MirageOS"
+maintainer: ["tim.arnouts@protonmail.com" "lelolartichaut@laposte.net"]
+authors: ["The mehari programmers"]
+license: "LGPL-3.0-or-later"
+homepage: "https://github.com/Psi-Prod/Mehari"
+bug-reports: "https://github.com/Psi-Prod/Mehari/issues"
+depends: [
+  "dune" {>= "2.9"}
+  "mehari"
+  "ipaddr" {>= "5.3.1"}
+  "lwt" {>= "5.6.1"}
+  "lwt_ppx" {>= "2.1.0"}
+  "mirage-channel" {>= "4.1.0"}
+  "mirage-time" {>= "3.0.0"}
+  "re" {>= "1.10.4"}
+  "tcpip" {>= "7.1.2"}
+  "tls-mirage" {>= "0.15.4"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
+]
+dev-repo: "git+https://github.com/Psi-Prod/Mehari.git"
diff --git a/mehari-mirage/dune b/mehari-mirage/dune
index 57553f8..40f84da 100644
--- a/mehari-mirage/dune
+++ b/mehari-mirage/dune
@@ -1,6 +1,6 @@
 (library
  (name mehari_mirage)
- (public_name mehari.mirage)
+ (public_name mehari-mirage)
  (libraries
   ipaddr
   lwt