diff --git a/manifest/main.ml b/manifest/main.ml
index a76913efbe321ad2b795fd032a9d3e15fb4e07d0..bfe1a4f83f41998ae57cd7a447f271514977090e 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -3105,12 +3105,7 @@ end = struct
     List.filter_map (fun (x, b) -> if b then Some x else None)
 
   module Lib_protocol = struct
-    type t = {
-      main : target;
-      embedded : target;
-      environment : target;
-      raw_protocol : target;
-    }
+    type t = {main : target; embedded : target; environment : target}
 
     let make_tests ?test_helpers ?parameters ?plugin ?client ?benchmark
         ?benchmark_type_inference ~main ~environment ~name () =
@@ -3528,12 +3523,7 @@ include Tezos_raw_protocol_%s.Main
           ~bisect_ppx:false
           ~flags:(Flags.standard ~nopervasives:true ~disable_warnings ())
           ~opam_only_deps:[octez_protocol_compiler_tezos_protocol_packer]
-          ~deps:
-            [
-              octez_protocol_environment;
-              tezos_protocol_environment_sigs;
-              raw_protocol;
-            ]
+          ~deps:[octez_protocol_environment; tezos_protocol_environment_sigs]
           ~dune:
             Dune.
               [
@@ -3604,12 +3594,12 @@ include Tezos_raw_protocol_%s.Main
                     ];
               ]
       in
-      {main; embedded; environment; raw_protocol}
+      {main; embedded; environment}
   end
 
   let genesis =
     let name = Name.other "genesis" in
-    let {Lib_protocol.main; embedded; environment = _; raw_protocol = _} =
+    let {Lib_protocol.main; embedded; environment = _} =
       Lib_protocol.make ~name
     in
     let client =
@@ -3635,14 +3625,14 @@ include Tezos_raw_protocol_%s.Main
 
   let demo_noops =
     let name = Name.other "demo-noops" in
-    let {Lib_protocol.main; embedded; environment = _; raw_protocol = _} =
+    let {Lib_protocol.main; embedded; environment = _} =
       Lib_protocol.make ~name
     in
     register @@ make ~name ~status:Not_mainnet ~main ~embedded ()
 
   let _demo_counter =
     let name = Name.other "demo-counter" in
-    let {Lib_protocol.main; embedded; environment = _; raw_protocol = _} =
+    let {Lib_protocol.main; embedded; environment = _} =
       Lib_protocol.make ~name
     in
     let client =
@@ -3682,9 +3672,7 @@ include Tezos_raw_protocol_%s.Main
     let both o1 o2 =
       match (o1, o2) with Some x, Some y -> Some (x, y) | _, _ -> None
     in
-    let {Lib_protocol.main; embedded; environment; raw_protocol} =
-      Lib_protocol.make ~name
-    in
+    let {Lib_protocol.main; embedded; environment} = Lib_protocol.make ~name in
     let parameters =
       only_if (N.(number >= 011) && not_overridden) @@ fun () ->
       public_lib
@@ -4306,13 +4294,12 @@ include Tezos_raw_protocol_%s.Main
           [
             octez_base |> open_ ~m:"TzPervasives"
             |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals";
-            main |> open_;
+            main |> open_ |> open_ ~m:"Protocol";
             client |> if_some |> open_;
             client_commands |> if_some |> open_;
             octez_client_base_unix |> open_;
             octez_stdlib_unix |> open_;
             tx_rollup |> if_some |> open_;
-            raw_protocol |> open_;
             uri;
           ]
     in
@@ -4467,8 +4454,7 @@ include Tezos_raw_protocol_%s.Main
             octez_benchmark |> open_;
             benchmark |> if_some |> open_;
             benchmark_type_inference |> if_some |> open_;
-            main |> open_;
-            raw_protocol |> open_;
+            main |> open_ |> open_ ~m:"Protocol";
             octez_crypto |> open_;
             octez_shell_benchmarks;
             octez_micheline |> open_;
diff --git a/src/lib_protocol_compiler/bin/main_embedded_packer.ml b/src/lib_protocol_compiler/bin/main_embedded_packer.ml
index 07fc19c44a1bedd848e1cbee14d26086dc91c75d..17203ec2c2ef625310ea782c3b433dc87f9529ad 100644
--- a/src/lib_protocol_compiler/bin/main_embedded_packer.ml
+++ b/src/lib_protocol_compiler/bin/main_embedded_packer.ml
@@ -60,8 +60,8 @@ let () =
     {|
 module Registered =
   Tezos_protocol_updater.Registered_protocol.Register_embedded_%s
-    (Tezos_protocol_environment_%s.Environment)
-    (Tezos_raw_protocol_%s.Main)
+    (Tezos_protocol_%s.Protocol.Environment)
+    (Tezos_protocol_%s.Protocol.Main)
     (Source)
 @.|}
     (Protocol.module_name_of_env_version sources.expected_env)
diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune
index 787a0c104e3f7decb96502b85531d52ce55850e6..c1338d7d8ebbfa073835672d7720f42ca3808e06 100644
--- a/src/proto_000_Ps9mPmXa/lib_protocol/dune
+++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune
@@ -76,8 +76,7 @@
  (name tezos_protocol_000_Ps9mPmXa_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-000-Ps9mPmXa.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune
index 5ee564582ef2c463e7021f2662716d50d520742e..a7bf35c09b3d1a56b82f3c646b4b06e7e7edfd42 100644
--- a/src/proto_001_PtCJ7pwo/lib_protocol/dune
+++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune
@@ -209,8 +209,7 @@
  (name tezos_protocol_001_PtCJ7pwo_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-001-PtCJ7pwo.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune
index 4b8f316f106dd35bee0c6fc305152b43e0741d48..589857e27c80d6fe8097cd1d9015635cd621eeae 100644
--- a/src/proto_002_PsYLVpVv/lib_protocol/dune
+++ b/src/proto_002_PsYLVpVv/lib_protocol/dune
@@ -209,8 +209,7 @@
  (name tezos_protocol_002_PsYLVpVv_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-002-PsYLVpVv.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune
index 51218ea300c7545f82ececab314de0cc2f94bc70..bf9381eefae05cfe1de307f6e7ab8db68cf42383 100644
--- a/src/proto_003_PsddFKi3/lib_protocol/dune
+++ b/src/proto_003_PsddFKi3/lib_protocol/dune
@@ -211,8 +211,7 @@
  (name tezos_protocol_003_PsddFKi3_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-003-PsddFKi3.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune
index 0f525fcea3228c1ab655b9158e88dd1825b7e165..126d93c741b8644e2658c4009ce4427a029bccd9 100644
--- a/src/proto_004_Pt24m4xi/lib_protocol/dune
+++ b/src/proto_004_Pt24m4xi/lib_protocol/dune
@@ -211,8 +211,7 @@
  (name tezos_protocol_004_Pt24m4xi_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-004-Pt24m4xi.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune
index 1f234b11a7cd4c64a8caa85528f3d5052359a266..53de7dff548b22724ca2e4cbe3bcce526a672289 100644
--- a/src/proto_005_PsBABY5H/lib_protocol/dune
+++ b/src/proto_005_PsBABY5H/lib_protocol/dune
@@ -213,8 +213,7 @@
  (name tezos_protocol_005_PsBABY5H_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-005-PsBABY5H.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune
index 01eaf41aee51363a674e835ca6cdefb41c5313e9..51521e781c5f369fe485fda6f4de1613ae8a1170 100644
--- a/src/proto_005_PsBabyM1/lib_protocol/dune
+++ b/src/proto_005_PsBabyM1/lib_protocol/dune
@@ -213,8 +213,7 @@
  (name tezos_protocol_005_PsBabyM1_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-005-PsBabyM1.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune
index 4afd2869b36be08eab2fe40d528f9915c40074ea..30bd6ec9285aff5cf705fb3a9088f0dc7f02479c 100644
--- a/src/proto_006_PsCARTHA/lib_protocol/dune
+++ b/src/proto_006_PsCARTHA/lib_protocol/dune
@@ -213,8 +213,7 @@
  (name tezos_protocol_006_PsCARTHA_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-006-PsCARTHA.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune
index c5674ebb79a48129d87a1d8c502924443d117e46..4ba0ca7dcd66a8a8bd1242ed4ddb093a900be290 100644
--- a/src/proto_007_PsDELPH1/lib_protocol/dune
+++ b/src/proto_007_PsDELPH1/lib_protocol/dune
@@ -217,8 +217,7 @@
  (name tezos_protocol_007_PsDELPH1_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-007-PsDELPH1.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune
index 0861d0b09df6ef0139ec12f5864567e43c6960b7..3c11d0686c80fe7bbc0aeb932211bcfbe86df96e 100644
--- a/src/proto_008_PtEdo2Zk/lib_protocol/dune
+++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune
@@ -227,8 +227,7 @@
  (name tezos_protocol_008_PtEdo2Zk_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-008-PtEdo2Zk.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune
index 8b1969bf86f49d07d28cf949db0195be6d240d8d..98f46720094738ea905bcd1fc42a67eeffe915d0 100644
--- a/src/proto_008_PtEdoTez/lib_protocol/dune
+++ b/src/proto_008_PtEdoTez/lib_protocol/dune
@@ -227,8 +227,7 @@
  (name tezos_protocol_008_PtEdoTez_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-008-PtEdoTez.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune
index 4ae25e8fec6f3f9c2b29fe5ed948f4ac55788b4c..d9edfa72da29be4b8bed91592f33b5b4ebf22dfa 100644
--- a/src/proto_009_PsFLoren/lib_protocol/dune
+++ b/src/proto_009_PsFLoren/lib_protocol/dune
@@ -233,8 +233,7 @@
  (name tezos_protocol_009_PsFLoren_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-009-PsFLoren.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune
index e069200650eaeb283a825a7e0a336e6a5ca52916..05ace6ff0f3c264f66842981aea3809ec529581b 100644
--- a/src/proto_010_PtGRANAD/lib_protocol/dune
+++ b/src/proto_010_PtGRANAD/lib_protocol/dune
@@ -243,8 +243,7 @@
  (name tezos_protocol_010_PtGRANAD_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-010-PtGRANAD.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -6-7-9-16-29-32-51-68
diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune
index 215979b1906e88dfbb5229c675ca1d28abea7982..3fc4de66942cca5c1333f601695b31ed6ed90346 100644
--- a/src/proto_011_PtHangz2/lib_protocol/dune
+++ b/src/proto_011_PtHangz2/lib_protocol/dune
@@ -264,8 +264,7 @@
  (name tezos_protocol_011_PtHangz2_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-011-PtHangz2.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -51
diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/dune b/src/proto_012_Psithaca/lib_benchmarks_proto/dune
index cab7ecc383ca130d7e8f2d54f09da0a72b98582d..08b76ef44d76c498239d543b79d97846024e6944 100644
--- a/src/proto_012_Psithaca/lib_benchmarks_proto/dune
+++ b/src/proto_012_Psithaca/lib_benchmarks_proto/dune
@@ -15,7 +15,6 @@
   tezos-benchmark-012-Psithaca
   tezos-benchmark-type-inference-012-Psithaca
   tezos-protocol-012-Psithaca
-  tezos-protocol-012-Psithaca.raw
   tezos-crypto
   tezos-shell-benchmarks
   tezos-micheline
@@ -35,7 +34,7 @@
   -open Tezos_benchmark_012_Psithaca
   -open Tezos_benchmark_type_inference_012_Psithaca
   -open Tezos_protocol_012_Psithaca
-  -open Tezos_raw_protocol_012_Psithaca
+  -open Tezos_protocol_012_Psithaca.Protocol
   -open Tezos_crypto
   -open Tezos_micheline
   -open Tezos_012_Psithaca_test_helpers
diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune
index 18e3ab22a4bdb8a6b5d2cc7a71aefb3b8bbc690c..4822a75c863560f944d6a05cb2ebcf6d238eeefa 100644
--- a/src/proto_012_Psithaca/lib_protocol/dune
+++ b/src/proto_012_Psithaca/lib_protocol/dune
@@ -298,8 +298,7 @@
  (name tezos_protocol_012_Psithaca_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-012-Psithaca.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -51
diff --git a/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/test_sapling.ml b/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/test_sapling.ml
index 132ee9de62342ad7af3c118c1e4389520b42f67a..0e4bbc8a52fd4af2d7d46b6748a46f147fa7101e 100644
--- a/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/test_sapling.ml
+++ b/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/test_sapling.ml
@@ -760,7 +760,7 @@ module Interpreter_tests = struct
           List.exists
             (function
               | Environment.Ecoproto_error
-                  (Tezos_raw_protocol_012_Psithaca.Script_tc_errors
+                  (Tezos_protocol_012_Psithaca.Protocol.Script_tc_errors
                    .Unexpected_forged_value _) ->
                   true
               | _ -> false)
diff --git a/src/proto_013_PtJakart/bin_tx_rollup_client/dune b/src/proto_013_PtJakart/bin_tx_rollup_client/dune
index cf9430bf95d9888d5a50e3e6ea8c3a56eb0ba696..2040f0219fc25b3a616661336972e4780b75c5df 100644
--- a/src/proto_013_PtJakart/bin_tx_rollup_client/dune
+++ b/src/proto_013_PtJakart/bin_tx_rollup_client/dune
@@ -14,7 +14,6 @@
   tezos-client-base-unix
   tezos-stdlib-unix
   tezos-tx-rollup-013-PtJakart
-  tezos-protocol-013-PtJakart.raw
   uri)
  (link_flags
   (:standard)
@@ -24,9 +23,9 @@
   -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_013_PtJakart_commands
   -open Tezos_client_base_unix
   -open Tezos_stdlib_unix
-  -open Tezos_tx_rollup_013_PtJakart
-  -open Tezos_raw_protocol_013_PtJakart))
+  -open Tezos_tx_rollup_013_PtJakart))
diff --git a/src/proto_013_PtJakart/lib_benchmarks_proto/dune b/src/proto_013_PtJakart/lib_benchmarks_proto/dune
index cf8a353a83734385779fcdd619d1804f5820128d..502bf84fb185a1f204eda03e0145d44db457923f 100644
--- a/src/proto_013_PtJakart/lib_benchmarks_proto/dune
+++ b/src/proto_013_PtJakart/lib_benchmarks_proto/dune
@@ -15,7 +15,6 @@
   tezos-benchmark-013-PtJakart
   tezos-benchmark-type-inference-013-PtJakart
   tezos-protocol-013-PtJakart
-  tezos-protocol-013-PtJakart.raw
   tezos-crypto
   tezos-shell-benchmarks
   tezos-micheline
@@ -35,7 +34,7 @@
   -open Tezos_benchmark_013_PtJakart
   -open Tezos_benchmark_type_inference_013_PtJakart
   -open Tezos_protocol_013_PtJakart
-  -open Tezos_raw_protocol_013_PtJakart
+  -open Tezos_protocol_013_PtJakart.Protocol
   -open Tezos_crypto
   -open Tezos_micheline
   -open Tezos_013_PtJakart_test_helpers
diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune
index 46802dc360d8f211d87a1db4031cf0a1f80c16a8..799c5b5a5ca55ab210fad8a0e0b1ca4b1807e45f 100644
--- a/src/proto_013_PtJakart/lib_protocol/dune
+++ b/src/proto_013_PtJakart/lib_protocol/dune
@@ -429,8 +429,7 @@
  (name tezos_protocol_013_PtJakart_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-013-PtJakart.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -w -51
diff --git a/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/test_sapling.ml b/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/test_sapling.ml
index f22fb8c0f05991c8959a92e5cfa919607f07fcf3..e8bf27f8a7f6ca692acf2a9f051c2038174f9666 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/test_sapling.ml
+++ b/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/test_sapling.ml
@@ -840,7 +840,7 @@ module Interpreter_tests = struct
           List.exists
             (function
               | Environment.Ecoproto_error
-                  (Tezos_raw_protocol_013_PtJakart.Script_tc_errors
+                  (Tezos_protocol_013_PtJakart.Protocol.Script_tc_errors
                    .Unexpected_forged_value _) ->
                   true
               | _ -> false)
diff --git a/src/proto_alpha/bin_tx_rollup_client/dune b/src/proto_alpha/bin_tx_rollup_client/dune
index 689f1653b61ed14d5617c2afd083f7de982bf78a..a6993f75fc9e227d7363d783f98fdfad3f0f5ccf 100644
--- a/src/proto_alpha/bin_tx_rollup_client/dune
+++ b/src/proto_alpha/bin_tx_rollup_client/dune
@@ -14,7 +14,6 @@
   tezos-client-base-unix
   tezos-stdlib-unix
   tezos-tx-rollup-alpha
-  tezos-protocol-alpha.raw
   uri)
  (link_flags
   (:standard)
@@ -24,9 +23,9 @@
   -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_alpha_commands
   -open Tezos_client_base_unix
   -open Tezos_stdlib_unix
-  -open Tezos_tx_rollup_alpha
-  -open Tezos_raw_protocol_alpha))
+  -open Tezos_tx_rollup_alpha))
diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune
index 7de0ac3e8dd77c1b2cd946b31952c10776cb6e48..f31b8568ca1449c8d6c9d7b685862d7c05f7eaa6 100644
--- a/src/proto_alpha/lib_benchmarks_proto/dune
+++ b/src/proto_alpha/lib_benchmarks_proto/dune
@@ -15,7 +15,6 @@
   tezos-benchmark-alpha
   tezos-benchmark-type-inference-alpha
   tezos-protocol-alpha
-  tezos-protocol-alpha.raw
   tezos-crypto
   tezos-shell-benchmarks
   tezos-micheline
@@ -35,7 +34,7 @@
   -open Tezos_benchmark_alpha
   -open Tezos_benchmark_type_inference_alpha
   -open Tezos_protocol_alpha
-  -open Tezos_raw_protocol_alpha
+  -open Tezos_protocol_alpha.Protocol
   -open Tezos_crypto
   -open Tezos_micheline
   -open Tezos_alpha_test_helpers
diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune
index a14172d55b10fa99320b5eb609d5856faadc1de8..2751c034f960470507e025b01fe31962200575c1 100644
--- a/src/proto_alpha/lib_protocol/dune
+++ b/src/proto_alpha/lib_protocol/dune
@@ -480,8 +480,7 @@
  (name tezos_protocol_alpha_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-alpha.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -nopervasives)
diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/test_sapling.ml b/src/proto_alpha/lib_protocol/test/integration/michelson/test_sapling.ml
index df7bf0f1908f31e6da0f5e10de6d33598155b913..134109df095bb2e2005bf4dffe0b3720d325f189 100644
--- a/src/proto_alpha/lib_protocol/test/integration/michelson/test_sapling.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/michelson/test_sapling.ml
@@ -848,7 +848,7 @@ module Interpreter_tests = struct
           List.exists
             (function
               | Environment.Ecoproto_error
-                  (Tezos_raw_protocol_alpha.Script_tc_errors
+                  (Tezos_protocol_alpha.Protocol.Script_tc_errors
                    .Unexpected_forged_value _) ->
                   true
               | _ -> false)
diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune
index cc1185e17d5eb8e6cb95a8517f1dfa18e459114a..c51e99c2ce6afda98d147c8519d45c213cd507ad 100644
--- a/src/proto_demo_counter/lib_protocol/dune
+++ b/src/proto_demo_counter/lib_protocol/dune
@@ -86,8 +86,7 @@
  (name tezos_protocol_demo_counter_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-demo-counter.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -nopervasives)
diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune
index d1dfb9af0a6b8f5b1fb2ba67c2b4c2ad41477840..1d732a8429d6989c28c41a0b5ecfa4ca38d2cf39 100644
--- a/src/proto_demo_noops/lib_protocol/dune
+++ b/src/proto_demo_noops/lib_protocol/dune
@@ -67,8 +67,7 @@
  (name tezos_protocol_demo_noops_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-demo-noops.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -nopervasives)
diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune
index d098d481f392805e57a24b2cec000599c2cde293..33e77372e2a1fa39b3f14600cf7cfe2f9e4024f3 100644
--- a/src/proto_genesis/lib_protocol/dune
+++ b/src/proto_genesis/lib_protocol/dune
@@ -69,8 +69,7 @@
  (name tezos_protocol_genesis_functor)
  (libraries
   tezos-protocol-environment
-  tezos-protocol-environment.sigs
-  tezos-protocol-genesis.raw)
+  tezos-protocol-environment.sigs)
  (flags
   (:standard)
   -nopervasives)