diff --git a/manifest/main.ml b/manifest/main.ml
index 387295bb80717ad7d8ac79f00f61f57447412832..8966dc596dd4a3778a810bb9fe84ccc7e0d0b2da 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -3298,14 +3298,14 @@ end = struct
           ~internal_name:(sf "tezos_protocol_environment_%s" name_underscore)
           ~path:(path // "lib_protocol")
           ~opam:(sf "tezos-protocol-%s" name_dash)
-          ~modules:["Environment"]
+          ~modules:[sf "Tezos_protocol_environment_%s" name_underscore]
           ~linkall:true
           ~deps:[octez_protocol_environment]
           ~dune:
             Dune.
               [
                 targets_rule
-                  ["environment.ml"]
+                  [sf "tezos_protocol_environment_%s.ml" name_underscore]
                   ~action:
                     [
                       S "write-file";
@@ -3337,9 +3337,8 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
                ())
           ~deps:
             [
-              environment |> open_ ~m:"Environment"
-              |> open_ ~m:"Environment.Pervasives"
-              |> open_ ~m:"Environment.Error_monad";
+              environment |> open_ |> open_ ~m:"Pervasives"
+              |> open_ ~m:"Error_monad";
             ]
       in
       let main =
@@ -3383,7 +3382,7 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
                         (sf
                            {|
 let hash = Tezos_crypto.Protocol_hash.of_b58check_exn "%s"
-let name = Tezos_protocol_environment_%s.Environment.Name.name
+let name = Tezos_protocol_environment_%s.Name.name
 include Tezos_raw_protocol_%s
 include Tezos_raw_protocol_%s.Main
 |}
@@ -3401,7 +3400,7 @@ include Tezos_raw_protocol_%s.Main
                       S
                         (sf
                            {|
-module Environment = Tezos_protocol_environment_%s.Environment
+module Environment = Tezos_protocol_environment_%s
 module Protocol = Protocol
 |}
                            name_underscore);
diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune
index ff2beba78c391e5cb5a6068096b21fb2c9b0d2f8..9f5d4b77a2bab25056d4236942ea907fa4d08c11 100644
--- a/src/proto_000_Ps9mPmXa/lib_protocol/dune
+++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_000_Ps9mPmXa))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_000_Ps9mPmXa.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_000_Ps9mPmXa.Environment
-  -open Tezos_protocol_environment_000_Ps9mPmXa.Environment.Pervasives
-  -open Tezos_protocol_environment_000_Ps9mPmXa.Environment.Error_monad)
+  -open Tezos_protocol_environment_000_Ps9mPmXa
+  -open Tezos_protocol_environment_000_Ps9mPmXa.Pervasives
+  -open Tezos_protocol_environment_000_Ps9mPmXa.Error_monad)
  (modules Data Services Main))
 
 (library
@@ -58,14 +58,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P\"\nlet name = Tezos_protocol_environment_000_Ps9mPmXa.Environment.Name.name\ninclude Tezos_raw_protocol_000_Ps9mPmXa\ninclude Tezos_raw_protocol_000_Ps9mPmXa.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P\"\nlet name = Tezos_protocol_environment_000_Ps9mPmXa.Name.name\ninclude Tezos_raw_protocol_000_Ps9mPmXa\ninclude Tezos_raw_protocol_000_Ps9mPmXa.Main\n")))
 
 (rule
  (targets tezos_protocol_000_Ps9mPmXa.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_000_Ps9mPmXa.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_000_Ps9mPmXa\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune
index 2bfc0d185f49687edda729dea002877c40923713..72a091e73309865e5d93436629d6e7c72bd9025e 100644
--- a/src/proto_001_PtCJ7pwo/lib_protocol/dune
+++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_001_PtCJ7pwo))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_001_PtCJ7pwo.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_001_PtCJ7pwo.Environment
-  -open Tezos_protocol_environment_001_PtCJ7pwo.Environment.Pervasives
-  -open Tezos_protocol_environment_001_PtCJ7pwo.Environment.Error_monad)
+  -open Tezos_protocol_environment_001_PtCJ7pwo
+  -open Tezos_protocol_environment_001_PtCJ7pwo.Pervasives
+  -open Tezos_protocol_environment_001_PtCJ7pwo.Error_monad)
  (modules
   Misc
   Storage_description
@@ -125,14 +125,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY\"\nlet name = Tezos_protocol_environment_001_PtCJ7pwo.Environment.Name.name\ninclude Tezos_raw_protocol_001_PtCJ7pwo\ninclude Tezos_raw_protocol_001_PtCJ7pwo.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY\"\nlet name = Tezos_protocol_environment_001_PtCJ7pwo.Name.name\ninclude Tezos_raw_protocol_001_PtCJ7pwo\ninclude Tezos_raw_protocol_001_PtCJ7pwo.Main\n")))
 
 (rule
  (targets tezos_protocol_001_PtCJ7pwo.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_001_PtCJ7pwo.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_001_PtCJ7pwo\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune
index 2cff4225a11414160f63ead878d7fcf3dea80f77..151a758e3d8b4b3049f9e3a0907de7e95742a432 100644
--- a/src/proto_002_PsYLVpVv/lib_protocol/dune
+++ b/src/proto_002_PsYLVpVv/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_002_PsYLVpVv))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_002_PsYLVpVv.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_002_PsYLVpVv.Environment
-  -open Tezos_protocol_environment_002_PsYLVpVv.Environment.Pervasives
-  -open Tezos_protocol_environment_002_PsYLVpVv.Environment.Error_monad)
+  -open Tezos_protocol_environment_002_PsYLVpVv
+  -open Tezos_protocol_environment_002_PsYLVpVv.Pervasives
+  -open Tezos_protocol_environment_002_PsYLVpVv.Error_monad)
  (modules
   Misc
   Storage_description
@@ -125,14 +125,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsYLVpVvgbLhAhoqAkMFUo6gudkJ9weNXhUYCiLDzcUpFpkk8Wt\"\nlet name = Tezos_protocol_environment_002_PsYLVpVv.Environment.Name.name\ninclude Tezos_raw_protocol_002_PsYLVpVv\ninclude Tezos_raw_protocol_002_PsYLVpVv.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsYLVpVvgbLhAhoqAkMFUo6gudkJ9weNXhUYCiLDzcUpFpkk8Wt\"\nlet name = Tezos_protocol_environment_002_PsYLVpVv.Name.name\ninclude Tezos_raw_protocol_002_PsYLVpVv\ninclude Tezos_raw_protocol_002_PsYLVpVv.Main\n")))
 
 (rule
  (targets tezos_protocol_002_PsYLVpVv.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_002_PsYLVpVv.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_002_PsYLVpVv\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune
index 0b5ca183f1bedbd0b87827c5fcb1044f63af5ab3..c830a6fd739402d1b6b9192b26b5ddb461820021 100644
--- a/src/proto_003_PsddFKi3/lib_protocol/dune
+++ b/src/proto_003_PsddFKi3/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_003_PsddFKi3))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_003_PsddFKi3.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_003_PsddFKi3.Environment
-  -open Tezos_protocol_environment_003_PsddFKi3.Environment.Pervasives
-  -open Tezos_protocol_environment_003_PsddFKi3.Environment.Error_monad)
+  -open Tezos_protocol_environment_003_PsddFKi3
+  -open Tezos_protocol_environment_003_PsddFKi3.Pervasives
+  -open Tezos_protocol_environment_003_PsddFKi3.Error_monad)
  (modules
   Misc
   Storage_description
@@ -126,14 +126,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsddFKi32cMJ2qPjf43Qv5GDWLDPZb3T3bF6fLKiF5HtvHNU7aP\"\nlet name = Tezos_protocol_environment_003_PsddFKi3.Environment.Name.name\ninclude Tezos_raw_protocol_003_PsddFKi3\ninclude Tezos_raw_protocol_003_PsddFKi3.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsddFKi32cMJ2qPjf43Qv5GDWLDPZb3T3bF6fLKiF5HtvHNU7aP\"\nlet name = Tezos_protocol_environment_003_PsddFKi3.Name.name\ninclude Tezos_raw_protocol_003_PsddFKi3\ninclude Tezos_raw_protocol_003_PsddFKi3.Main\n")))
 
 (rule
  (targets tezos_protocol_003_PsddFKi3.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_003_PsddFKi3.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_003_PsddFKi3\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune
index a6b3d86c3578930bd0b78a78bfef49f33be5b7cb..2dc6fe74f14b79d61a5abbb7b9b6029004d63290 100644
--- a/src/proto_004_Pt24m4xi/lib_protocol/dune
+++ b/src/proto_004_Pt24m4xi/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_004_Pt24m4xi))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_004_Pt24m4xi.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_004_Pt24m4xi.Environment
-  -open Tezos_protocol_environment_004_Pt24m4xi.Environment.Pervasives
-  -open Tezos_protocol_environment_004_Pt24m4xi.Environment.Error_monad)
+  -open Tezos_protocol_environment_004_Pt24m4xi
+  -open Tezos_protocol_environment_004_Pt24m4xi.Pervasives
+  -open Tezos_protocol_environment_004_Pt24m4xi.Error_monad)
  (modules
   Misc
   Storage_description
@@ -126,14 +126,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Pt24m4xiPbLDhVgVfABUjirbmda3yohdN82Sp9FeuAXJ4eV9otd\"\nlet name = Tezos_protocol_environment_004_Pt24m4xi.Environment.Name.name\ninclude Tezos_raw_protocol_004_Pt24m4xi\ninclude Tezos_raw_protocol_004_Pt24m4xi.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Pt24m4xiPbLDhVgVfABUjirbmda3yohdN82Sp9FeuAXJ4eV9otd\"\nlet name = Tezos_protocol_environment_004_Pt24m4xi.Name.name\ninclude Tezos_raw_protocol_004_Pt24m4xi\ninclude Tezos_raw_protocol_004_Pt24m4xi.Main\n")))
 
 (rule
  (targets tezos_protocol_004_Pt24m4xi.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_004_Pt24m4xi.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_004_Pt24m4xi\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune
index 04e6b67f5caab6da13a6e7a027a193f4b43a66b6..0486a45956238b81763c618fd042baefc93fa226 100644
--- a/src/proto_005_PsBABY5H/lib_protocol/dune
+++ b/src/proto_005_PsBABY5H/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_005_PsBABY5H))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_005_PsBABY5H.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_005_PsBABY5H.Environment
-  -open Tezos_protocol_environment_005_PsBABY5H.Environment.Pervasives
-  -open Tezos_protocol_environment_005_PsBABY5H.Environment.Error_monad)
+  -open Tezos_protocol_environment_005_PsBABY5H
+  -open Tezos_protocol_environment_005_PsBABY5H.Pervasives
+  -open Tezos_protocol_environment_005_PsBABY5H.Error_monad)
  (modules
   Misc
   Storage_description
@@ -127,14 +127,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBABY5HQTSkA4297zNHfsZNKtxULfL18y95qb3m53QJiXGmrbU\"\nlet name = Tezos_protocol_environment_005_PsBABY5H.Environment.Name.name\ninclude Tezos_raw_protocol_005_PsBABY5H\ninclude Tezos_raw_protocol_005_PsBABY5H.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBABY5HQTSkA4297zNHfsZNKtxULfL18y95qb3m53QJiXGmrbU\"\nlet name = Tezos_protocol_environment_005_PsBABY5H.Name.name\ninclude Tezos_raw_protocol_005_PsBABY5H\ninclude Tezos_raw_protocol_005_PsBABY5H.Main\n")))
 
 (rule
  (targets tezos_protocol_005_PsBABY5H.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_005_PsBABY5H.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_005_PsBABY5H\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune
index 1f13de7179797a350eaa210eacb1c9735ac8dfee..26703f1ad47d27a3c0f303d67a165f8bd86862c4 100644
--- a/src/proto_005_PsBabyM1/lib_protocol/dune
+++ b/src/proto_005_PsBabyM1/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_005_PsBabyM1))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_005_PsBabyM1.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_005_PsBabyM1.Environment
-  -open Tezos_protocol_environment_005_PsBabyM1.Environment.Pervasives
-  -open Tezos_protocol_environment_005_PsBabyM1.Environment.Error_monad)
+  -open Tezos_protocol_environment_005_PsBabyM1
+  -open Tezos_protocol_environment_005_PsBabyM1.Pervasives
+  -open Tezos_protocol_environment_005_PsBabyM1.Error_monad)
  (modules
   Misc
   Storage_description
@@ -127,14 +127,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBabyM1eUXZseaJdmXFApDSBqj8YBfwELoxZHHW77EMcAbbwAS\"\nlet name = Tezos_protocol_environment_005_PsBabyM1.Environment.Name.name\ninclude Tezos_raw_protocol_005_PsBabyM1\ninclude Tezos_raw_protocol_005_PsBabyM1.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBabyM1eUXZseaJdmXFApDSBqj8YBfwELoxZHHW77EMcAbbwAS\"\nlet name = Tezos_protocol_environment_005_PsBabyM1.Name.name\ninclude Tezos_raw_protocol_005_PsBabyM1\ninclude Tezos_raw_protocol_005_PsBabyM1.Main\n")))
 
 (rule
  (targets tezos_protocol_005_PsBabyM1.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_005_PsBabyM1.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_005_PsBabyM1\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune
index fae51b09976b5d287c1c23f9e1b3eb4f9d62b43a..2380a2a8f14cbc6250846144d3ed73df672102bc 100644
--- a/src/proto_006_PsCARTHA/lib_protocol/dune
+++ b/src/proto_006_PsCARTHA/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_006_PsCARTHA))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_006_PsCARTHA.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_006_PsCARTHA.Environment
-  -open Tezos_protocol_environment_006_PsCARTHA.Environment.Pervasives
-  -open Tezos_protocol_environment_006_PsCARTHA.Environment.Error_monad)
+  -open Tezos_protocol_environment_006_PsCARTHA
+  -open Tezos_protocol_environment_006_PsCARTHA.Pervasives
+  -open Tezos_protocol_environment_006_PsCARTHA.Error_monad)
  (modules
   Misc
   Storage_description
@@ -127,14 +127,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsCARTHAGazKbHtnKfLzQg3kms52kSRpgnDY982a9oYsSXRLQEb\"\nlet name = Tezos_protocol_environment_006_PsCARTHA.Environment.Name.name\ninclude Tezos_raw_protocol_006_PsCARTHA\ninclude Tezos_raw_protocol_006_PsCARTHA.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsCARTHAGazKbHtnKfLzQg3kms52kSRpgnDY982a9oYsSXRLQEb\"\nlet name = Tezos_protocol_environment_006_PsCARTHA.Name.name\ninclude Tezos_raw_protocol_006_PsCARTHA\ninclude Tezos_raw_protocol_006_PsCARTHA.Main\n")))
 
 (rule
  (targets tezos_protocol_006_PsCARTHA.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_006_PsCARTHA.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_006_PsCARTHA\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune
index 13a2da1675d0d31fede803ff3b29afc3ed780e32..953b85877f215482a8c68f643461f8e0688b02b2 100644
--- a/src/proto_007_PsDELPH1/lib_protocol/dune
+++ b/src/proto_007_PsDELPH1/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_007_PsDELPH1))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_007_PsDELPH1.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_007_PsDELPH1.Environment
-  -open Tezos_protocol_environment_007_PsDELPH1.Environment.Pervasives
-  -open Tezos_protocol_environment_007_PsDELPH1.Environment.Error_monad)
+  -open Tezos_protocol_environment_007_PsDELPH1
+  -open Tezos_protocol_environment_007_PsDELPH1.Pervasives
+  -open Tezos_protocol_environment_007_PsDELPH1.Error_monad)
  (modules
   Misc
   Storage_description
@@ -129,14 +129,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsDELPH1Kxsxt8f9eWbxQeRxkjfbxoqM52jvs5Y5fBxWWh4ifpo\"\nlet name = Tezos_protocol_environment_007_PsDELPH1.Environment.Name.name\ninclude Tezos_raw_protocol_007_PsDELPH1\ninclude Tezos_raw_protocol_007_PsDELPH1.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsDELPH1Kxsxt8f9eWbxQeRxkjfbxoqM52jvs5Y5fBxWWh4ifpo\"\nlet name = Tezos_protocol_environment_007_PsDELPH1.Name.name\ninclude Tezos_raw_protocol_007_PsDELPH1\ninclude Tezos_raw_protocol_007_PsDELPH1.Main\n")))
 
 (rule
  (targets tezos_protocol_007_PsDELPH1.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_007_PsDELPH1.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_007_PsDELPH1\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune
index c88a1d01883185f2866aa7d86e47274696eec113..59e97a4bec2af5a66833afc4e9385c8a00748e94 100644
--- a/src/proto_008_PtEdo2Zk/lib_protocol/dune
+++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_008_PtEdo2Zk))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_008_PtEdo2Zk.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_008_PtEdo2Zk.Environment
-  -open Tezos_protocol_environment_008_PtEdo2Zk.Environment.Pervasives
-  -open Tezos_protocol_environment_008_PtEdo2Zk.Environment.Error_monad)
+  -open Tezos_protocol_environment_008_PtEdo2Zk
+  -open Tezos_protocol_environment_008_PtEdo2Zk.Pervasives
+  -open Tezos_protocol_environment_008_PtEdo2Zk.Error_monad)
  (modules
   Misc
   Storage_description
@@ -134,14 +134,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtEdo2ZkT9oKpimTah6x2embF25oss54njMuPzkJTEi5RqfdZFA\"\nlet name = Tezos_protocol_environment_008_PtEdo2Zk.Environment.Name.name\ninclude Tezos_raw_protocol_008_PtEdo2Zk\ninclude Tezos_raw_protocol_008_PtEdo2Zk.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtEdo2ZkT9oKpimTah6x2embF25oss54njMuPzkJTEi5RqfdZFA\"\nlet name = Tezos_protocol_environment_008_PtEdo2Zk.Name.name\ninclude Tezos_raw_protocol_008_PtEdo2Zk\ninclude Tezos_raw_protocol_008_PtEdo2Zk.Main\n")))
 
 (rule
  (targets tezos_protocol_008_PtEdo2Zk.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_008_PtEdo2Zk.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_008_PtEdo2Zk\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune
index 8220a26dc2b41102127b5d43869d2a29b00ff224..74861bf0201aa7049d65d9a786681c63fddfae15 100644
--- a/src/proto_008_PtEdoTez/lib_protocol/dune
+++ b/src/proto_008_PtEdoTez/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_008_PtEdoTez))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_008_PtEdoTez.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_008_PtEdoTez.Environment
-  -open Tezos_protocol_environment_008_PtEdoTez.Environment.Pervasives
-  -open Tezos_protocol_environment_008_PtEdoTez.Environment.Error_monad)
+  -open Tezos_protocol_environment_008_PtEdoTez
+  -open Tezos_protocol_environment_008_PtEdoTez.Pervasives
+  -open Tezos_protocol_environment_008_PtEdoTez.Error_monad)
  (modules
   Misc
   Storage_description
@@ -134,14 +134,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtEdoTezd3RHSC31mpxxo1npxFjoWWcFgQtxapi51Z8TLu6v6Uq\"\nlet name = Tezos_protocol_environment_008_PtEdoTez.Environment.Name.name\ninclude Tezos_raw_protocol_008_PtEdoTez\ninclude Tezos_raw_protocol_008_PtEdoTez.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtEdoTezd3RHSC31mpxxo1npxFjoWWcFgQtxapi51Z8TLu6v6Uq\"\nlet name = Tezos_protocol_environment_008_PtEdoTez.Name.name\ninclude Tezos_raw_protocol_008_PtEdoTez\ninclude Tezos_raw_protocol_008_PtEdoTez.Main\n")))
 
 (rule
  (targets tezos_protocol_008_PtEdoTez.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_008_PtEdoTez.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_008_PtEdoTez\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune
index ba13bb6347fd0997f88d4ccda5f05efed5c66026..58f91b9a5cbe8caf6d7ca5f6d0f82b98f017f45d 100644
--- a/src/proto_009_PsFLoren/lib_protocol/dune
+++ b/src/proto_009_PsFLoren/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_009_PsFLoren))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_009_PsFLoren.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_009_PsFLoren.Environment
-  -open Tezos_protocol_environment_009_PsFLoren.Environment.Pervasives
-  -open Tezos_protocol_environment_009_PsFLoren.Environment.Error_monad)
+  -open Tezos_protocol_environment_009_PsFLoren
+  -open Tezos_protocol_environment_009_PsFLoren.Pervasives
+  -open Tezos_protocol_environment_009_PsFLoren.Error_monad)
  (modules
   Misc
   Storage_description
@@ -137,14 +137,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsFLorenaUUuikDWvMDr6fGBRG8kt3e3D3fHoXK1j1BFRxeSH4i\"\nlet name = Tezos_protocol_environment_009_PsFLoren.Environment.Name.name\ninclude Tezos_raw_protocol_009_PsFLoren\ninclude Tezos_raw_protocol_009_PsFLoren.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsFLorenaUUuikDWvMDr6fGBRG8kt3e3D3fHoXK1j1BFRxeSH4i\"\nlet name = Tezos_protocol_environment_009_PsFLoren.Name.name\ninclude Tezos_raw_protocol_009_PsFLoren\ninclude Tezos_raw_protocol_009_PsFLoren.Main\n")))
 
 (rule
  (targets tezos_protocol_009_PsFLoren.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_009_PsFLoren.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_009_PsFLoren\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune
index 56e9727a1ff5d4fc3dc51dd62681eca8db5c483f..f3f1b4278d014199dda1f16820752c47922685f4 100644
--- a/src/proto_010_PtGRANAD/lib_protocol/dune
+++ b/src/proto_010_PtGRANAD/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_010_PtGRANAD))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_010_PtGRANAD.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -6-7-9-16-29-32-51-68
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_010_PtGRANAD.Environment
-  -open Tezos_protocol_environment_010_PtGRANAD.Environment.Pervasives
-  -open Tezos_protocol_environment_010_PtGRANAD.Environment.Error_monad)
+  -open Tezos_protocol_environment_010_PtGRANAD
+  -open Tezos_protocol_environment_010_PtGRANAD.Pervasives
+  -open Tezos_protocol_environment_010_PtGRANAD.Error_monad)
  (modules
   Misc
   Storage_description
@@ -142,14 +142,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV\"\nlet name = Tezos_protocol_environment_010_PtGRANAD.Environment.Name.name\ninclude Tezos_raw_protocol_010_PtGRANAD\ninclude Tezos_raw_protocol_010_PtGRANAD.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV\"\nlet name = Tezos_protocol_environment_010_PtGRANAD.Name.name\ninclude Tezos_raw_protocol_010_PtGRANAD\ninclude Tezos_raw_protocol_010_PtGRANAD.Main\n")))
 
 (rule
  (targets tezos_protocol_010_PtGRANAD.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_010_PtGRANAD.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_010_PtGRANAD\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune
index 5e2d9e879ff83ccb09735b84dc2a341e0294de71..ec0bdd2f15f8b28a36a9b7056e031e7ff8388cc0 100644
--- a/src/proto_011_PtHangz2/lib_protocol/dune
+++ b/src/proto_011_PtHangz2/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_011_PtHangz2))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_011_PtHangz2.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -51
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_011_PtHangz2.Environment
-  -open Tezos_protocol_environment_011_PtHangz2.Environment.Pervasives
-  -open Tezos_protocol_environment_011_PtHangz2.Environment.Error_monad)
+  -open Tezos_protocol_environment_011_PtHangz2
+  -open Tezos_protocol_environment_011_PtHangz2.Pervasives
+  -open Tezos_protocol_environment_011_PtHangz2.Error_monad)
  (modules
   Misc
   Path_encoding
@@ -155,14 +155,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx\"\nlet name = Tezos_protocol_environment_011_PtHangz2.Environment.Name.name\ninclude Tezos_raw_protocol_011_PtHangz2\ninclude Tezos_raw_protocol_011_PtHangz2.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx\"\nlet name = Tezos_protocol_environment_011_PtHangz2.Name.name\ninclude Tezos_raw_protocol_011_PtHangz2\ninclude Tezos_raw_protocol_011_PtHangz2.Main\n")))
 
 (rule
  (targets tezos_protocol_011_PtHangz2.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_011_PtHangz2.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_011_PtHangz2\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune
index cf7aa6e7aa5495388d6a742658055afa3ed9fa7b..165dea554aa16720479f4334612228ca8674c080 100644
--- a/src/proto_012_Psithaca/lib_protocol/dune
+++ b/src/proto_012_Psithaca/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_012_Psithaca))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_012_Psithaca.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -51
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_012_Psithaca.Environment
-  -open Tezos_protocol_environment_012_Psithaca.Environment.Pervasives
-  -open Tezos_protocol_environment_012_Psithaca.Environment.Error_monad)
+  -open Tezos_protocol_environment_012_Psithaca
+  -open Tezos_protocol_environment_012_Psithaca.Pervasives
+  -open Tezos_protocol_environment_012_Psithaca.Error_monad)
  (modules
   Misc
   Non_empty_string
@@ -172,14 +172,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A\"\nlet name = Tezos_protocol_environment_012_Psithaca.Environment.Name.name\ninclude Tezos_raw_protocol_012_Psithaca\ninclude Tezos_raw_protocol_012_Psithaca.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A\"\nlet name = Tezos_protocol_environment_012_Psithaca.Name.name\ninclude Tezos_raw_protocol_012_Psithaca\ninclude Tezos_raw_protocol_012_Psithaca.Main\n")))
 
 (rule
  (targets tezos_protocol_012_Psithaca.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_012_Psithaca.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_012_Psithaca\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune
index 4687308c88be4a49b3743627ad1cba4249932b65..fac88f2f7167224063fa8feb4f47e69c4e76101f 100644
--- a/src/proto_013_PtJakart/lib_protocol/dune
+++ b/src/proto_013_PtJakart/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_013_PtJakart))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_013_PtJakart.ml)
  (action
   (write-file
    %{targets}
@@ -29,9 +29,9 @@
   -w -51
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_013_PtJakart.Environment
-  -open Tezos_protocol_environment_013_PtJakart.Environment.Pervasives
-  -open Tezos_protocol_environment_013_PtJakart.Environment.Error_monad)
+  -open Tezos_protocol_environment_013_PtJakart
+  -open Tezos_protocol_environment_013_PtJakart.Pervasives
+  -open Tezos_protocol_environment_013_PtJakart.Error_monad)
  (modules
   Misc
   Non_empty_string
@@ -237,14 +237,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtJakart2xVj7pYXJBXrqHgd82rdkLey5ZeeGwDgPp9rhQUbSqY\"\nlet name = Tezos_protocol_environment_013_PtJakart.Environment.Name.name\ninclude Tezos_raw_protocol_013_PtJakart\ninclude Tezos_raw_protocol_013_PtJakart.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtJakart2xVj7pYXJBXrqHgd82rdkLey5ZeeGwDgPp9rhQUbSqY\"\nlet name = Tezos_protocol_environment_013_PtJakart.Name.name\ninclude Tezos_raw_protocol_013_PtJakart\ninclude Tezos_raw_protocol_013_PtJakart.Main\n")))
 
 (rule
  (targets tezos_protocol_013_PtJakart.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_013_PtJakart.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_013_PtJakart\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_014_PtKathma/lib_protocol/dune b/src/proto_014_PtKathma/lib_protocol/dune
index 62cb39803c38a945542b4d413a4074dce67d47c1..4604fbbcc977b14928311c8e83916b5e87641387 100644
--- a/src/proto_014_PtKathma/lib_protocol/dune
+++ b/src/proto_014_PtKathma/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_014_PtKathma))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_014_PtKathma.ml)
  (action
   (write-file
    %{targets}
@@ -28,9 +28,9 @@
   (:standard)
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_014_PtKathma.Environment
-  -open Tezos_protocol_environment_014_PtKathma.Environment.Pervasives
-  -open Tezos_protocol_environment_014_PtKathma.Environment.Error_monad)
+  -open Tezos_protocol_environment_014_PtKathma
+  -open Tezos_protocol_environment_014_PtKathma.Pervasives
+  -open Tezos_protocol_environment_014_PtKathma.Error_monad)
  (modules
   Misc
   Non_empty_string
@@ -260,14 +260,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtKathmaHPSjL3WDmUCJP7iHBsUix65HdAgSeVacukogRK6hum6\"\nlet name = Tezos_protocol_environment_014_PtKathma.Environment.Name.name\ninclude Tezos_raw_protocol_014_PtKathma\ninclude Tezos_raw_protocol_014_PtKathma.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PtKathmaHPSjL3WDmUCJP7iHBsUix65HdAgSeVacukogRK6hum6\"\nlet name = Tezos_protocol_environment_014_PtKathma.Name.name\ninclude Tezos_raw_protocol_014_PtKathma\ninclude Tezos_raw_protocol_014_PtKathma.Main\n")))
 
 (rule
  (targets tezos_protocol_014_PtKathma.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_014_PtKathma.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_014_PtKathma\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune
index 3cdca5d6ad10f91b37aa7b9569cdf1c0ff0b8248..004ca6a33cf908eeedb0fc8592bf7090af2f7265 100644
--- a/src/proto_alpha/lib_protocol/dune
+++ b/src/proto_alpha/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_alpha))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_alpha.ml)
  (action
   (write-file
    %{targets}
@@ -28,9 +28,9 @@
   (:standard)
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_alpha.Environment
-  -open Tezos_protocol_environment_alpha.Environment.Pervasives
-  -open Tezos_protocol_environment_alpha.Environment.Error_monad)
+  -open Tezos_protocol_environment_alpha
+  -open Tezos_protocol_environment_alpha.Pervasives
+  -open Tezos_protocol_environment_alpha.Error_monad)
  (modules
   Misc
   Non_empty_string
@@ -260,14 +260,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK\"\nlet name = Tezos_protocol_environment_alpha.Environment.Name.name\ninclude Tezos_raw_protocol_alpha\ninclude Tezos_raw_protocol_alpha.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK\"\nlet name = Tezos_protocol_environment_alpha.Name.name\ninclude Tezos_raw_protocol_alpha\ninclude Tezos_raw_protocol_alpha.Main\n")))
 
 (rule
  (targets tezos_protocol_alpha.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_alpha.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_alpha\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune
index 91d6016d576bf809b90caf9ccea145788af6a960..8525221f713eee0211e604a0fb8296709aa06196 100644
--- a/src/proto_demo_counter/lib_protocol/dune
+++ b/src/proto_demo_counter/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_demo_counter))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_demo_counter.ml)
  (action
   (write-file
    %{targets}
@@ -28,9 +28,9 @@
   (:standard)
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_demo_counter.Environment
-  -open Tezos_protocol_environment_demo_counter.Environment.Pervasives
-  -open Tezos_protocol_environment_demo_counter.Environment.Error_monad)
+  -open Tezos_protocol_environment_demo_counter
+  -open Tezos_protocol_environment_demo_counter.Pervasives
+  -open Tezos_protocol_environment_demo_counter.Error_monad)
  (modules
   Error
   Proto_params
@@ -65,14 +65,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoDemoCounterDemoCounterDemoCounterDemoCou4LSpdT\"\nlet name = Tezos_protocol_environment_demo_counter.Environment.Name.name\ninclude Tezos_raw_protocol_demo_counter\ninclude Tezos_raw_protocol_demo_counter.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoDemoCounterDemoCounterDemoCounterDemoCou4LSpdT\"\nlet name = Tezos_protocol_environment_demo_counter.Name.name\ninclude Tezos_raw_protocol_demo_counter\ninclude Tezos_raw_protocol_demo_counter.Main\n")))
 
 (rule
  (targets tezos_protocol_demo_counter.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_demo_counter.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_demo_counter\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune
index 6bec906bc2602e99f07159f050393c0b668db9e9..6556e50e31d9991f6fe91e47951d49547d5dad52 100644
--- a/src/proto_demo_noops/lib_protocol/dune
+++ b/src/proto_demo_noops/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_demo_noops))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_demo_noops.ml)
  (action
   (write-file
    %{targets}
@@ -28,9 +28,9 @@
   (:standard)
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_demo_noops.Environment
-  -open Tezos_protocol_environment_demo_noops.Environment.Pervasives
-  -open Tezos_protocol_environment_demo_noops.Environment.Error_monad)
+  -open Tezos_protocol_environment_demo_noops
+  -open Tezos_protocol_environment_demo_noops.Pervasives
+  -open Tezos_protocol_environment_demo_noops.Error_monad)
  (modules Main))
 
 (library
@@ -56,14 +56,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoDemoNoopsDemoNoopsDemoNoopsDemoNoopsDemo6XBoYp\"\nlet name = Tezos_protocol_environment_demo_noops.Environment.Name.name\ninclude Tezos_raw_protocol_demo_noops\ninclude Tezos_raw_protocol_demo_noops.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoDemoNoopsDemoNoopsDemoNoopsDemoNoopsDemo6XBoYp\"\nlet name = Tezos_protocol_environment_demo_noops.Name.name\ninclude Tezos_raw_protocol_demo_noops\ninclude Tezos_raw_protocol_demo_noops.Main\n")))
 
 (rule
  (targets tezos_protocol_demo_noops.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_demo_noops.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_demo_noops\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)
diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune
index 76cd7eb694ed9670290de9b0805630dde8a32f14..6aca3d03a9566b1a9a5dd7fd341da04a17c3e9ef 100644
--- a/src/proto_genesis/lib_protocol/dune
+++ b/src/proto_genesis/lib_protocol/dune
@@ -8,10 +8,10 @@
  (libraries
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (modules Environment))
+ (modules Tezos_protocol_environment_genesis))
 
 (rule
- (targets environment.ml)
+ (targets tezos_protocol_environment_genesis.ml)
  (action
   (write-file
    %{targets}
@@ -28,9 +28,9 @@
   (:standard)
   -nostdlib
   -nopervasives
-  -open Tezos_protocol_environment_genesis.Environment
-  -open Tezos_protocol_environment_genesis.Environment.Pervasives
-  -open Tezos_protocol_environment_genesis.Environment.Error_monad)
+  -open Tezos_protocol_environment_genesis
+  -open Tezos_protocol_environment_genesis.Pervasives
+  -open Tezos_protocol_environment_genesis.Error_monad)
  (modules Data Services Main))
 
 (library
@@ -56,14 +56,14 @@
  (action
   (write-file
    %{targets}
-   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im\"\nlet name = Tezos_protocol_environment_genesis.Environment.Name.name\ninclude Tezos_raw_protocol_genesis\ninclude Tezos_raw_protocol_genesis.Main\n")))
+   "\nlet hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im\"\nlet name = Tezos_protocol_environment_genesis.Name.name\ninclude Tezos_raw_protocol_genesis\ninclude Tezos_raw_protocol_genesis.Main\n")))
 
 (rule
  (targets tezos_protocol_genesis.ml)
  (action
   (write-file
    %{targets}
-   "\nmodule Environment = Tezos_protocol_environment_genesis.Environment\nmodule Protocol = Protocol\n")))
+   "\nmodule Environment = Tezos_protocol_environment_genesis\nmodule Protocol = Protocol\n")))
 
 (rule
  (alias runtest_compile_protocol)