diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune
index 9a1d6fc8682e3a355381b5dcc9a9d1b9ae32c37f..67c2304355b8195b0b0502f288233a26a9e7e18c 100644
--- a/devtools/get_contracts/dune
+++ b/devtools/get_contracts/dune
@@ -4,53 +4,56 @@
 (library
  (name get_contracts)
  (libraries
+  tezos-micheline
+  tezos-base
+  tezos-stdlib-unix
   tezos-client-base-unix
   tezos-store)
  (flags
   (:standard)
   -open Tezos_micheline
-  -open Tezos_base__TzPervasives
+  -open Tezos_base.TzPervasives
   -open Tezos_stdlib_unix)
  (modules get_contracts sigs storage_helpers))
 
 (executable
  (name get_contracts_012_Psithaca)
  (libraries
+  tezos-base
   tezos-protocol-012-Psithaca
   tezos-client-012-Psithaca
   get_contracts)
  (flags
   (:standard)
-  -open Tezos_base__TzPervasives
-  -open Tezos_raw_protocol_012_Psithaca
-  -open Tezos_protocol_environment_012_Psithaca
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_012_Psithaca.Protocol
   -open Tezos_client_012_Psithaca)
  (modules get_contracts_012_Psithaca))
 
 (executable
  (name get_contracts_013_PtJakart)
  (libraries
+  tezos-base
   tezos-protocol-013-PtJakart
   tezos-client-013-PtJakart
   get_contracts)
  (flags
   (:standard)
-  -open Tezos_base__TzPervasives
-  -open Tezos_raw_protocol_013_PtJakart
-  -open Tezos_protocol_environment_013_PtJakart
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_013_PtJakart.Protocol
   -open Tezos_client_013_PtJakart)
  (modules get_contracts_013_PtJakart))
 
 (executable
  (name get_contracts_alpha)
  (libraries
+  tezos-base
   tezos-protocol-alpha
   tezos-client-alpha
   get_contracts)
  (flags
   (:standard)
-  -open Tezos_base__TzPervasives
-  -open Tezos_raw_protocol_alpha
-  -open Tezos_protocol_environment_alpha
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_alpha.Protocol
   -open Tezos_client_alpha)
  (modules get_contracts_alpha))
diff --git a/manifest/main.ml b/manifest/main.ml
index 36a6189813bf5e948d4111c605151a979113cffc..55a004ede15cdb52457d5f2ebefbf07ec83f2c23 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -2232,16 +2232,14 @@ let _tezos_context_merkle_proof_tests =
     ~opam:"tezos-context"
     ~deps:
       [
-        tezos_base;
+        tezos_base |> open_ ~m:"TzPervasives";
         tezos_base_unix;
-        tezos_context_disk;
+        tezos_context_disk |> open_;
         tezos_context_encoding;
-        tezos_stdlib_unix;
+        tezos_stdlib_unix |> open_;
         qcheck_alcotest;
         tezos_test_helpers;
       ]
-    ~opens:
-      ["Tezos_base__TzPervasives"; "Tezos_context_disk"; "Tezos_stdlib_unix"]
     ~modules:["test_merkle_proof"]
 
 let tezos_validator_lib =
@@ -3420,8 +3418,12 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
                ~nostdlib:true
                ~disable_warnings
                ())
-          ~deps:[environment |> open_ ~m:"Environment"]
-          ~opens:["Pervasives"; "Error_monad"]
+          ~deps:
+            [
+              environment |> open_ ~m:"Environment"
+              |> open_ ~m:"Environment.Pervasives"
+              |> open_ ~m:"Environment.Error_monad";
+            ]
       in
       let main =
         public_lib
@@ -4045,7 +4047,7 @@ include Tezos_raw_protocol_%s.Main
             [
               tezos_base |> open_ ~m:"TzPervasives"
               |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals";
-              main |> open_;
+              main |> open_ |> open_ ~m:"Protocol";
               client |> if_some |> open_;
               tezos_client_commands |> open_;
               baking |> open_;
@@ -4057,7 +4059,6 @@ include Tezos_raw_protocol_%s.Main
               tezos_mockup_commands;
               tenderbrute |> if_some |> if_ N.(number >= 013) |> open_;
             ]
-          ~opens:[sf "Tezos_protocol_%s.Protocol" name_underscore]
           ~bisect_ppx:false
       in
       test
@@ -4693,9 +4694,15 @@ let get_contracts_lib =
     ~path:"devtools/get_contracts"
     ~synopsis:"Generic tool to extract smart contracts from node's context."
     ~opam:""
-    ~deps:[tezos_client_base_unix; tezos_store]
+    ~deps:
+      [
+        tezos_micheline |> open_;
+        tezos_base |> open_ ~m:"TzPervasives";
+        tezos_stdlib_unix |> open_;
+        tezos_client_base_unix;
+        tezos_store;
+      ]
     ~modules:["get_contracts"; "sigs"; "storage_helpers"]
-    ~opens:["Tezos_micheline"; "Tezos_base__TzPervasives"; "Tezos_stdlib_unix"]
     ~static:false
     ~release:false
     ~bisect_ppx:false
@@ -4727,15 +4734,14 @@ let _get_contracts =
                  ~path
                  ~synopsis:"A script to extract smart contracts from a node."
                  ~opam:""
-                 ~deps:[main; client; get_contracts_lib]
-                 ~modules:[name]
-                 ~opens:
+                 ~deps:
                    [
-                     "Tezos_base__TzPervasives";
-                     "Tezos_raw_protocol_" ^ proto_version;
-                     "Tezos_protocol_environment_" ^ proto_version;
-                     "Tezos_client_" ^ proto_version;
+                     tezos_base |> open_ ~m:"TzPervasives";
+                     main |> open_ ~m:"Protocol";
+                     client |> open_;
+                     get_contracts_lib;
                    ]
+                 ~modules:[name]
                  ~static:false
                  ~release:false
                  ~bisect_ppx:false)
diff --git a/manifest/manifest.ml b/manifest/manifest.ml
index eff5320ba98fc0b6fa9e02a4b6d2855dd283b965..f67e3da2cf7e4f947a1a16680e81d10757c5b0a4 100644
--- a/manifest/manifest.ml
+++ b/manifest/manifest.ml
@@ -1070,7 +1070,6 @@ module Target = struct
     ?ocaml:Version.constraints ->
     ?opam:string ->
     ?opam_with_test:with_test ->
-    ?opens:string list ->
     ?preprocess:preprocessor list ->
     ?preprocessor_deps:preprocessor_dep list ->
     ?private_modules:string list ->
@@ -1144,7 +1143,7 @@ module Target = struct
       ?(dune = Dune.[]) ?flags ?foreign_stubs ?implements ?inline_tests
       ?js_compatible ?js_of_ocaml ?documentation ?(linkall = false) ?modes
       ?modules ?(modules_without_implementation = []) ?(npm_deps = []) ?ocaml
-      ?opam ?(opam_with_test = Always) ?(opens = []) ?(preprocess = [])
+      ?opam ?(opam_with_test = Always) ?(preprocess = [])
       ?(preprocessor_deps = []) ?(private_modules = []) ?(opam_only_deps = [])
       ?release ?static ?synopsis ?description ?(time_measurement_ppx = false)
       ?(virtual_modules = []) ?default_implementation ?(wrapped = true)
@@ -1165,7 +1164,7 @@ module Target = struct
         | Optional target | Select {package = target; _} -> get_opens acc target
         | Open (target, module_name) -> get_opens (module_name :: acc) target
       in
-      List.flatten (List.map (get_opens []) deps) @ opens
+      List.flatten (List.map (get_opens []) deps)
     in
     let js_compatible, js_of_ocaml =
       match (js_compatible, js_of_ocaml) with
diff --git a/manifest/manifest.mli b/manifest/manifest.mli
index 56f18508bd2cbc77b36747c82b9e553356d58866..7ff57d03c14b408bb552396cedf18e218f626215 100644
--- a/manifest/manifest.mli
+++ b/manifest/manifest.mli
@@ -595,9 +595,6 @@ type with_test = Always | Never | Only_on_64_arch
     - [opam_with_test]: whether to add the [dune runtest] command.
       Note that for a given package all targets must have the same value of [opam_with_test].
 
-    - [opens]: list of module names to open when compiling.
-      They are passed as [-open] flags to the OCaml compiler (in the [(flags ...)] stanza).
-
     - [path]: path of the directory in which to generate the [dune] file for this target.
 
     - [preprocess]: preprocessor directives to add using the [(preprocess ...)] stanza.
@@ -665,7 +662,6 @@ type 'a maker =
   ?ocaml:Version.constraints ->
   ?opam:string ->
   ?opam_with_test:with_test ->
-  ?opens:string list ->
   ?preprocess:preprocessor list ->
   ?preprocessor_deps:preprocessor_dep list ->
   ?private_modules:string list ->
@@ -958,11 +954,11 @@ val optional : target -> target
     If [m] is specified, open this submodule instead of the main module.
 
     When such targets appear in [?deps] of a target [maker], they are
-    automatically prepended to [?opens] in the order of declaration in [?deps].
+    converted into [-open] in the order of declaration in [?deps].
     If you use [open_] on an [open_], the innermost [open_]s is opened first;
     For instance, [tezos_base |> open_ |> open_ ~m: "TzPervasives"]
-    is target [tezos_base], but when used in [?deps], this automatically prepend
-    ["Tezos_base"], followed by ["Tezos_base__TzPervasives"], to [?opens].
+    is target [tezos_base], but when used in [?deps], this automatically opens
+    ["Tezos_base"], followed by ["Tezos_base.TzPervasives"].
 
     Can only be used on internal libraries and on external or vendored
     libraries for which a [main_module] was specified. *)
diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune
index 886bc63004826a73c647450fab63d1388baff1e0..3cd00dc3259449740a3cf0568145b337389c590f 100644
--- a/src/lib_context/test/dune
+++ b/src/lib_context/test/dune
@@ -36,7 +36,7 @@
   tezos-test-helpers)
  (flags
   (:standard)
-  -open Tezos_base__TzPervasives
+  -open Tezos_base.TzPervasives
   -open Tezos_context_disk
   -open Tezos_stdlib_unix)
  (modules test_merkle_proof))
diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune
index 32ac6bee9b9f7d71771e0b58b65ec4b44f723e29..58ce0bf12ebedc4fe5a39e1704c3214e19bf4623 100644
--- a/src/proto_000_Ps9mPmXa/lib_protocol/dune
+++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_000_Ps9mPmXa.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_000_Ps9mPmXa.Environment.Pervasives
+  -open Tezos_protocol_environment_000_Ps9mPmXa.Environment.Error_monad)
  (modules Data Services Main))
 
 (library
diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune
index cf4058affb71cdd7e07e03c73bf61819dae6c364..8c60cee2b464aeb1aed39310fc9651d12bf0769b 100644
--- a/src/proto_001_PtCJ7pwo/lib_protocol/dune
+++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_001_PtCJ7pwo.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_001_PtCJ7pwo.Environment.Pervasives
+  -open Tezos_protocol_environment_001_PtCJ7pwo.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune
index 5b785dd95868b69078eb03cfe2a17c91e03b16f4..d3f2396002e343cc18933069a1a0b4b662b4efbd 100644
--- a/src/proto_002_PsYLVpVv/lib_protocol/dune
+++ b/src/proto_002_PsYLVpVv/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_002_PsYLVpVv.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_002_PsYLVpVv.Environment.Pervasives
+  -open Tezos_protocol_environment_002_PsYLVpVv.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune
index 978f72ec5019307248ca3245b5990dd24f5d5f5b..8667695ff876c65c9301f80c8b07a62e70e67dcc 100644
--- a/src/proto_003_PsddFKi3/lib_protocol/dune
+++ b/src/proto_003_PsddFKi3/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_003_PsddFKi3.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_003_PsddFKi3.Environment.Pervasives
+  -open Tezos_protocol_environment_003_PsddFKi3.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune
index 2936be4bb22e89fa82cbc380402f001a6372bb1b..dc66d652e643f8206be3c3635884e0a09602de47 100644
--- a/src/proto_004_Pt24m4xi/lib_protocol/dune
+++ b/src/proto_004_Pt24m4xi/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_004_Pt24m4xi.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_004_Pt24m4xi.Environment.Pervasives
+  -open Tezos_protocol_environment_004_Pt24m4xi.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune
index c6d8917528ff527a7f453ef727fd3271f6ca5020..c4e6e51224bea1c2170fca6580708d275cbe960e 100644
--- a/src/proto_005_PsBABY5H/lib_protocol/dune
+++ b/src/proto_005_PsBABY5H/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_005_PsBABY5H.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_005_PsBABY5H.Environment.Pervasives
+  -open Tezos_protocol_environment_005_PsBABY5H.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune
index 8b6969e9c5f8e5983d7e49efe24d6e8ee31f90e8..c3bfebcfcad177129f211a519dee45e019634b9e 100644
--- a/src/proto_005_PsBabyM1/lib_protocol/dune
+++ b/src/proto_005_PsBabyM1/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_005_PsBabyM1.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_005_PsBabyM1.Environment.Pervasives
+  -open Tezos_protocol_environment_005_PsBabyM1.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune
index 8770d0b3374d50962fff5795dcd437cbc13ea9b0..027c920287e230d23776465358c5f60bfdcaa503 100644
--- a/src/proto_006_PsCARTHA/lib_protocol/dune
+++ b/src/proto_006_PsCARTHA/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_006_PsCARTHA.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_006_PsCARTHA.Environment.Pervasives
+  -open Tezos_protocol_environment_006_PsCARTHA.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune
index d0279cc6df2bfb8ec0a39420a42cdf6201ce7528..c9f1c061a20d249a44df49972b3dcb2e98633e49 100644
--- a/src/proto_007_PsDELPH1/lib_protocol/dune
+++ b/src/proto_007_PsDELPH1/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_007_PsDELPH1.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_007_PsDELPH1.Environment.Pervasives
+  -open Tezos_protocol_environment_007_PsDELPH1.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune
index e4592dccc26c8b406b4198954bda46cfa9102e8b..4ae52ab0c9244f9ee827888c2fd9c570ee505a35 100644
--- a/src/proto_008_PtEdo2Zk/lib_protocol/dune
+++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_008_PtEdo2Zk.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_008_PtEdo2Zk.Environment.Pervasives
+  -open Tezos_protocol_environment_008_PtEdo2Zk.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune
index e2cfe23826d0eab2807086f863c3238cfbc07e93..3bb5e7df9773a1454e29fd44b128510f743540d6 100644
--- a/src/proto_008_PtEdoTez/lib_protocol/dune
+++ b/src/proto_008_PtEdoTez/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_008_PtEdoTez.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_008_PtEdoTez.Environment.Pervasives
+  -open Tezos_protocol_environment_008_PtEdoTez.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune
index c2cb0a47d479a8ce2c1cb261359e072e958412ed..1298297d0676c678b9f62c5728cd27de163aa2fb 100644
--- a/src/proto_009_PsFLoren/lib_protocol/dune
+++ b/src/proto_009_PsFLoren/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_009_PsFLoren.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_009_PsFLoren.Environment.Pervasives
+  -open Tezos_protocol_environment_009_PsFLoren.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune
index d13d8ab156a235695dcc51ee0a7e0dca3ec4d17a..dc19fba9979209a0cdc661d54a9ae76483572e62 100644
--- a/src/proto_010_PtGRANAD/lib_protocol/dune
+++ b/src/proto_010_PtGRANAD/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_010_PtGRANAD.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_010_PtGRANAD.Environment.Pervasives
+  -open Tezos_protocol_environment_010_PtGRANAD.Environment.Error_monad)
  (modules
   Misc
   Storage_description
diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune
index 515237f9fad35d2777e5977d9b4edee8c29231bf..fc72160e4e7e0ac218c228141357f6096d2dc73e 100644
--- a/src/proto_011_PtHangz2/lib_protocol/dune
+++ b/src/proto_011_PtHangz2/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_011_PtHangz2.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_011_PtHangz2.Environment.Pervasives
+  -open Tezos_protocol_environment_011_PtHangz2.Environment.Error_monad)
  (modules
   Misc
   Path_encoding
diff --git a/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune
index 7e4cb5663959a8f9a09cded84c2f856de3eb8924..4f7cc505e3bd5501668db0b2614db00f58f7d5f5 100644
--- a/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune
@@ -21,10 +21,10 @@
   -open Tezos_base.TzPervasives
   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
   -open Tezos_protocol_012_Psithaca
+  -open Tezos_protocol_012_Psithaca.Protocol
   -open Tezos_client_012_Psithaca
   -open Tezos_client_commands
   -open Tezos_baking_012_Psithaca
   -open Tezos_stdlib_unix
   -open Tezos_client_base_unix
-  -open Tezos_protocol_012_Psithaca_parameters
-  -open Tezos_protocol_012_Psithaca.Protocol))
+  -open Tezos_protocol_012_Psithaca_parameters))
diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune
index d154bf99c2b40be33bef974807e471c7f31ad4e4..f2fec7d70ddddc02cde2263cce6be14356bb9721 100644
--- a/src/proto_012_Psithaca/lib_protocol/dune
+++ b/src/proto_012_Psithaca/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_012_Psithaca.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_012_Psithaca.Environment.Pervasives
+  -open Tezos_protocol_environment_012_Psithaca.Environment.Error_monad)
  (modules
   Misc
   Non_empty_string
diff --git a/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune b/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune
index a93b72e35f7f3c17bf757c59289e5ef08deef765..fd92734efec6e1fdb55017ef5c4f0a564461c043 100644
--- a/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune
@@ -22,11 +22,11 @@
   -open Tezos_base.TzPervasives
   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
   -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_013_PtJakart.Protocol
   -open Tezos_client_013_PtJakart
   -open Tezos_client_commands
   -open Tezos_baking_013_PtJakart
   -open Tezos_stdlib_unix
   -open Tezos_client_base_unix
   -open Tezos_protocol_013_PtJakart_parameters
-  -open Tenderbrute_013_PtJakart
-  -open Tezos_protocol_013_PtJakart.Protocol))
+  -open Tenderbrute_013_PtJakart))
diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune
index d57e7c984d5dab6bef810d51cd33e1efa5bd103b..afc184e158048125004bd938a77d6f0ffd55bd01 100644
--- a/src/proto_013_PtJakart/lib_protocol/dune
+++ b/src/proto_013_PtJakart/lib_protocol/dune
@@ -30,8 +30,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_013_PtJakart.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_013_PtJakart.Environment.Pervasives
+  -open Tezos_protocol_environment_013_PtJakart.Environment.Error_monad)
  (modules
   Misc
   Non_empty_string
diff --git a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
index ce67573ed371499a06be1681ad7f6abb8c02a62e..c459c163af1fe1088f8a6c55ced61d07efcc3c4a 100644
--- a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
@@ -22,11 +22,11 @@
   -open Tezos_base.TzPervasives
   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
   -open Tezos_protocol_alpha
+  -open Tezos_protocol_alpha.Protocol
   -open Tezos_client_alpha
   -open Tezos_client_commands
   -open Tezos_baking_alpha
   -open Tezos_stdlib_unix
   -open Tezos_client_base_unix
   -open Tezos_protocol_alpha_parameters
-  -open Tenderbrute_alpha
-  -open Tezos_protocol_alpha.Protocol))
+  -open Tenderbrute_alpha))
diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune
index 9b95561eac90187fd1737a9798288a4405b5a3ca..9a8adc5e1fc9c284cda1121012d956ffc16fcb92 100644
--- a/src/proto_alpha/lib_protocol/dune
+++ b/src/proto_alpha/lib_protocol/dune
@@ -29,8 +29,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_alpha.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_alpha.Environment.Pervasives
+  -open Tezos_protocol_environment_alpha.Environment.Error_monad)
  (modules
   Misc
   Non_empty_string
diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune
index b28cef118083db3b35c3fed3047ee7ca5dc632ab..9a7b2f639f968d4fdf1b5461f09d19c259da54cf 100644
--- a/src/proto_demo_counter/lib_protocol/dune
+++ b/src/proto_demo_counter/lib_protocol/dune
@@ -29,8 +29,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_demo_counter.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_demo_counter.Environment.Pervasives
+  -open Tezos_protocol_environment_demo_counter.Environment.Error_monad)
  (modules
   Error
   Proto_params
diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune
index 0a8d9d0b42c2ee2331b7ea3de0baf005c4471918..3b1156ef45db1aaab8a0461d23e523184b4e2257 100644
--- a/src/proto_demo_noops/lib_protocol/dune
+++ b/src/proto_demo_noops/lib_protocol/dune
@@ -29,8 +29,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_demo_noops.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_demo_noops.Environment.Pervasives
+  -open Tezos_protocol_environment_demo_noops.Environment.Error_monad)
  (modules Main))
 
 (library
diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune
index 254b24e9ddf45ea98779d10bf50a5dd59747c169..eadde9cfba2534c6684054cf93bed28bcaee8152 100644
--- a/src/proto_genesis/lib_protocol/dune
+++ b/src/proto_genesis/lib_protocol/dune
@@ -29,8 +29,8 @@
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_genesis.Environment
-  -open Pervasives
-  -open Error_monad)
+  -open Tezos_protocol_environment_genesis.Environment.Pervasives
+  -open Tezos_protocol_environment_genesis.Environment.Error_monad)
  (modules Data Services Main))
 
 (library