diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml
index 4985cd709ed9da16cf18d3671414576231defad0..79c32e14f0cc442e054689a6d34639422da45321 100644
--- a/.gitlab/ci/jobs/packaging/opam_package.yml
+++ b/.gitlab/ci/jobs/packaging/opam_package.yml
@@ -556,363 +556,279 @@ opam:octez-proto-libs:
   variables:
     package: octez-proto-libs
 
-opam:octez-protocol-compiler:
+opam:octez-protocol-000-Ps9mPmXa-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_exec_opam_batch_6
+    - .rules_template__trigger_all_opam_batch_3
   variables:
-    package: octez-protocol-compiler
+    package: octez-protocol-000-Ps9mPmXa-libs
 
-opam:octez-proxy-server:
+opam:octez-protocol-001-PtCJ7pwo-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_exec_opam_batch_1
+    - .rules_template__trigger_all_opam_batch_3
   variables:
-    package: octez-proxy-server
+    package: octez-protocol-001-PtCJ7pwo-libs
 
-opam:octez-shell-libs:
+opam:octez-protocol-002-PsYLVpVv-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
+    - .rules_template__trigger_all_opam_batch_3
   variables:
-    package: octez-shell-libs
+    package: octez-protocol-002-PsYLVpVv-libs
 
-# Ignoring unreleased package octez-shell-tests.
-
-opam:octez-signer:
+opam:octez-protocol-003-PsddFKi3-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_exec_opam_batch_3
+    - .rules_template__trigger_all_opam_batch_3
   variables:
-    package: octez-signer
+    package: octez-protocol-003-PsddFKi3-libs
 
-opam:octez-smart-rollup-client-Proxford:
+opam:octez-protocol-004-Pt24m4xi-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_exec_opam_batch_1
+    - .rules_template__trigger_all_opam_batch_3
   variables:
-    package: octez-smart-rollup-client-Proxford
+    package: octez-protocol-004-Pt24m4xi-libs
 
-opam:octez-smart-rollup-client-PtNairob:
+opam:octez-protocol-005-PsBabyM1-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_exec_opam_batch_1
+    - .rules_template__trigger_all_opam_batch_3
   variables:
-    package: octez-smart-rollup-client-PtNairob
+    package: octez-protocol-005-PsBabyM1-libs
 
-# Ignoring unreleased package octez-smart-rollup-client-alpha.
-
-# Ignoring unreleased package octez-smart-rollup-node.
-
-opam:octez-smart-rollup-node-Proxford:
+opam:octez-protocol-006-PsCARTHA-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_exec_opam_batch_1
+    - .rules_template__trigger_all_opam_batch_3
   variables:
-    package: octez-smart-rollup-node-Proxford
+    package: octez-protocol-006-PsCARTHA-libs
 
-opam:octez-smart-rollup-node-PtNairob:
+opam:octez-protocol-007-PsDELPH1-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_exec_opam_batch_1
+    - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: octez-smart-rollup-node-PtNairob
-
-# Ignoring unreleased package octez-smart-rollup-node-alpha.
+    package: octez-protocol-007-PsDELPH1-libs
 
-opam:octez-smart-rollup-node-lib:
+opam:octez-protocol-008-PtEdo2Zk-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_1
+    - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: octez-smart-rollup-node-lib
-
-# Ignoring unreleased package octez-smart-rollup-sequencer.
+    package: octez-protocol-008-PtEdo2Zk-libs
 
-# Ignoring unreleased package octez-smart-rollup-sequencer-node.
-
-opam:octez-smart-rollup-wasm-debugger:
+opam:octez-protocol-009-PsFLoren-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_exec_opam_batch_1
-  variables:
-    package: octez-smart-rollup-wasm-debugger
-
-# Ignoring unreleased package octez-snoop.
-
-# Ignoring unreleased package octez-store-tests.
-
-# Ignoring unreleased package octez-testnet-scenarios.
-
-# Ignoring unreleased package scoru-sequencer-test.
-
-opam:tezos-017-PtNairob-test-helpers:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_1
+    - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-017-PtNairob-test-helpers
+    package: octez-protocol-009-PsFLoren-libs
 
-opam:tezos-018-Proxford-test-helpers:
+opam:octez-protocol-010-PtGRANAD-libs:
   extends:
     - .opam_template
     - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-018-Proxford-test-helpers
+    package: octez-protocol-010-PtGRANAD-libs
 
-opam:tezos-alpha-test-helpers:
+opam:octez-protocol-011-PtHangz2-libs:
   extends:
     - .opam_template
     - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-alpha-test-helpers
+    package: octez-protocol-011-PtHangz2-libs
 
-opam:tezos-baking-017-PtNairob:
+opam:octez-protocol-012-Psithaca-libs:
   extends:
     - .opam_template
     - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-baking-017-PtNairob
+    package: octez-protocol-012-Psithaca-libs
 
-opam:tezos-baking-017-PtNairob-commands:
+opam:octez-protocol-013-PtJakart-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_1
+    - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-baking-017-PtNairob-commands
+    package: octez-protocol-013-PtJakart-libs
 
-opam:tezos-baking-018-Proxford:
+opam:octez-protocol-014-PtKathma-libs:
   extends:
     - .opam_template
     - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-baking-018-Proxford
+    package: octez-protocol-014-PtKathma-libs
 
-opam:tezos-baking-018-Proxford-commands:
+opam:octez-protocol-015-PtLimaPt-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_1
+    - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-baking-018-Proxford-commands
+    package: octez-protocol-015-PtLimaPt-libs
 
-opam:tezos-baking-alpha:
+opam:octez-protocol-016-PtMumbai-libs:
   extends:
     - .opam_template
     - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-baking-alpha
+    package: octez-protocol-016-PtMumbai-libs
 
-opam:tezos-baking-alpha-commands:
+opam:octez-protocol-017-PtNairob-libs:
   extends:
     - .opam_template
     - .rules_template__trigger_all_opam_batch_1
   variables:
-    package: tezos-baking-alpha-commands
+    package: octez-protocol-017-PtNairob-libs
 
-opam:tezos-benchmark:
+opam:octez-protocol-018-Proxford-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_7
+    - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-benchmark
-
-# Ignoring unreleased package tezos-benchmark-017-PtNairob.
-
-# Ignoring unreleased package tezos-benchmark-018-Proxford.
-
-# Ignoring unreleased package tezos-benchmark-alpha.
-
-# Ignoring unreleased package tezos-benchmark-examples.
-
-# Ignoring unreleased package tezos-benchmark-tests.
+    package: octez-protocol-018-Proxford-libs
 
-# Ignoring unreleased package tezos-benchmark-type-inference-017-PtNairob.
-
-# Ignoring unreleased package tezos-benchmark-type-inference-018-Proxford.
-
-# Ignoring unreleased package tezos-benchmark-type-inference-alpha.
-
-# Ignoring unreleased package tezos-benchmarks-proto-017-PtNairob.
-
-# Ignoring unreleased package tezos-benchmarks-proto-018-Proxford.
-
-# Ignoring unreleased package tezos-benchmarks-proto-alpha.
-
-opam:tezos-client-000-Ps9mPmXa:
+opam:octez-protocol-alpha-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
+    - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-client-000-Ps9mPmXa
+    package: octez-protocol-alpha-libs
 
-opam:tezos-client-001-PtCJ7pwo:
+opam:octez-protocol-compiler:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
+    - .rules_template__trigger_exec_opam_batch_5
   variables:
-    package: tezos-client-001-PtCJ7pwo
+    package: octez-protocol-compiler
 
-opam:tezos-client-002-PsYLVpVv:
+opam:octez-proxy-server:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
+    - .rules_template__trigger_exec_opam_batch_1
   variables:
-    package: tezos-client-002-PsYLVpVv
+    package: octez-proxy-server
 
-opam:tezos-client-003-PsddFKi3:
+opam:octez-shell-libs:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
+    - .rules_template__trigger_all_opam_batch_5
   variables:
-    package: tezos-client-003-PsddFKi3
+    package: octez-shell-libs
 
-opam:tezos-client-004-Pt24m4xi:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
-  variables:
-    package: tezos-client-004-Pt24m4xi
+# Ignoring unreleased package octez-shell-tests.
 
-opam:tezos-client-005-PsBabyM1:
+opam:octez-signer:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
+    - .rules_template__trigger_exec_opam_batch_3
   variables:
-    package: tezos-client-005-PsBabyM1
+    package: octez-signer
 
-opam:tezos-client-006-PsCARTHA:
+opam:octez-smart-rollup-client-Proxford:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
+    - .rules_template__trigger_exec_opam_batch_1
   variables:
-    package: tezos-client-006-PsCARTHA
+    package: octez-smart-rollup-client-Proxford
 
-opam:tezos-client-007-PsDELPH1:
+opam:octez-smart-rollup-client-PtNairob:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
+    - .rules_template__trigger_exec_opam_batch_1
   variables:
-    package: tezos-client-007-PsDELPH1
+    package: octez-smart-rollup-client-PtNairob
 
-opam:tezos-client-008-PtEdo2Zk:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
-  variables:
-    package: tezos-client-008-PtEdo2Zk
+# Ignoring unreleased package octez-smart-rollup-client-alpha.
 
-opam:tezos-client-009-PsFLoren:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
-  variables:
-    package: tezos-client-009-PsFLoren
+# Ignoring unreleased package octez-smart-rollup-node.
 
-opam:tezos-client-010-PtGRANAD:
+opam:octez-smart-rollup-node-Proxford:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
+    - .rules_template__trigger_exec_opam_batch_1
   variables:
-    package: tezos-client-010-PtGRANAD
+    package: octez-smart-rollup-node-Proxford
 
-opam:tezos-client-011-PtHangz2:
+opam:octez-smart-rollup-node-PtNairob:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
+    - .rules_template__trigger_exec_opam_batch_1
   variables:
-    package: tezos-client-011-PtHangz2
+    package: octez-smart-rollup-node-PtNairob
 
-opam:tezos-client-012-Psithaca:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
-  variables:
-    package: tezos-client-012-Psithaca
+# Ignoring unreleased package octez-smart-rollup-node-alpha.
 
-opam:tezos-client-013-PtJakart:
+opam:octez-smart-rollup-node-lib:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
+    - .rules_template__trigger_all_opam_batch_2
   variables:
-    package: tezos-client-013-PtJakart
+    package: octez-smart-rollup-node-lib
 
-opam:tezos-client-014-PtKathma:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_4
-  variables:
-    package: tezos-client-014-PtKathma
+# Ignoring unreleased package octez-smart-rollup-sequencer.
 
-opam:tezos-client-015-PtLimaPt:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_4
-  variables:
-    package: tezos-client-015-PtLimaPt
+# Ignoring unreleased package octez-smart-rollup-sequencer-node.
 
-opam:tezos-client-016-PtMumbai:
+opam:octez-smart-rollup-wasm-debugger:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
+    - .rules_template__trigger_exec_opam_batch_1
   variables:
-    package: tezos-client-016-PtMumbai
+    package: octez-smart-rollup-wasm-debugger
 
-opam:tezos-client-017-PtNairob:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-client-017-PtNairob
+# Ignoring unreleased package octez-snoop.
 
-opam:tezos-client-018-Proxford:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-client-018-Proxford
+# Ignoring unreleased package octez-store-tests.
 
-opam:tezos-client-alpha:
+# Ignoring unreleased package octez-testnet-scenarios.
+
+# Ignoring unreleased package scoru-sequencer-test.
+
+opam:tezos-benchmark:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
+    - .rules_template__trigger_all_opam_batch_7
   variables:
-    package: tezos-client-alpha
+    package: tezos-benchmark
+
+# Ignoring unreleased package tezos-benchmark-017-PtNairob.
+
+# Ignoring unreleased package tezos-benchmark-018-Proxford.
+
+# Ignoring unreleased package tezos-benchmark-alpha.
+
+# Ignoring unreleased package tezos-benchmark-examples.
+
+# Ignoring unreleased package tezos-benchmark-tests.
+
+# Ignoring unreleased package tezos-benchmark-type-inference-017-PtNairob.
+
+# Ignoring unreleased package tezos-benchmark-type-inference-018-Proxford.
+
+# Ignoring unreleased package tezos-benchmark-type-inference-alpha.
+
+# Ignoring unreleased package tezos-benchmarks-proto-017-PtNairob.
+
+# Ignoring unreleased package tezos-benchmarks-proto-018-Proxford.
+
+# Ignoring unreleased package tezos-benchmarks-proto-alpha.
 
 opam:tezos-client-demo-counter:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_4
+    - .rules_template__trigger_all_opam_batch_3
   variables:
     package: tezos-client-demo-counter
 
 opam:tezos-client-genesis:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_4
+    - .rules_template__trigger_all_opam_batch_3
   variables:
     package: tezos-client-genesis
 
-opam:tezos-dac-017-PtNairob:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_1
-  variables:
-    package: tezos-dac-017-PtNairob
-
-opam:tezos-dac-018-Proxford:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_1
-  variables:
-    package: tezos-dac-018-Proxford
-
-opam:tezos-dac-alpha:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_1
-  variables:
-    package: tezos-dac-alpha
-
 opam:tezos-dac-client-lib:
   extends:
     - .opam_template
@@ -923,7 +839,7 @@ opam:tezos-dac-client-lib:
 opam:tezos-dac-lib:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_4
+    - .rules_template__trigger_all_opam_batch_3
   variables:
     package: tezos-dac-lib
 
@@ -938,16 +854,10 @@ opam:tezos-dac-node-lib:
 
 # Ignoring unreleased package tezos-dac-node-lib-test.
 
-# Ignoring unreleased package tezos-dal-017-PtNairob.
-
-# Ignoring unreleased package tezos-dal-018-Proxford.
-
-# Ignoring unreleased package tezos-dal-alpha.
-
 opam:tezos-dal-node-lib:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_4
+    - .rules_template__trigger_all_opam_batch_3
   variables:
     package: tezos-dal-node-lib
 
@@ -961,14 +871,14 @@ opam:tezos-dal-node-services:
 opam:tezos-embedded-protocol-000-Ps9mPmXa:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_4
+    - .rules_template__trigger_all_opam_batch_3
   variables:
     package: tezos-embedded-protocol-000-Ps9mPmXa
 
 opam:tezos-embedded-protocol-001-PtCJ7pwo:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_4
+    - .rules_template__trigger_all_opam_batch_3
   variables:
     package: tezos-embedded-protocol-001-PtCJ7pwo
 
@@ -1080,7 +990,7 @@ opam:tezos-embedded-protocol-014-PtKathma:
 opam:tezos-embedded-protocol-015-PtLimaPt:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
+    - .rules_template__trigger_all_opam_batch_4
   variables:
     package: tezos-embedded-protocol-015-PtLimaPt
 
@@ -1133,24 +1043,6 @@ opam:tezos-embedded-protocol-genesis:
   variables:
     package: tezos-embedded-protocol-genesis
 
-# Ignoring unreleased package tezos-layer2-utils-016-PtMumbai.
-
-opam:tezos-layer2-utils-017-PtNairob:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-layer2-utils-017-PtNairob
-
-opam:tezos-layer2-utils-018-Proxford:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-layer2-utils-018-Proxford
-
-# Ignoring unreleased package tezos-layer2-utils-alpha.
-
 # Ignoring unreleased package tezos-lazy-containers-tests.
 
 # Ignoring unreleased package tezos-micheline-rewriting.
@@ -1160,49 +1052,49 @@ opam:tezos-layer2-utils-018-Proxford:
 opam:tezos-protocol-000-Ps9mPmXa:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
+    - .rules_template__trigger_all_opam_batch_5
   variables:
     package: tezos-protocol-000-Ps9mPmXa
 
 opam:tezos-protocol-001-PtCJ7pwo:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
+    - .rules_template__trigger_all_opam_batch_5
   variables:
     package: tezos-protocol-001-PtCJ7pwo
 
 opam:tezos-protocol-002-PsYLVpVv:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
+    - .rules_template__trigger_all_opam_batch_5
   variables:
     package: tezos-protocol-002-PsYLVpVv
 
 opam:tezos-protocol-003-PsddFKi3:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
+    - .rules_template__trigger_all_opam_batch_5
   variables:
     package: tezos-protocol-003-PsddFKi3
 
 opam:tezos-protocol-004-Pt24m4xi:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
+    - .rules_template__trigger_all_opam_batch_5
   variables:
     package: tezos-protocol-004-Pt24m4xi
 
 opam:tezos-protocol-005-PsBABY5H:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
+    - .rules_template__trigger_all_opam_batch_5
   variables:
     package: tezos-protocol-005-PsBABY5H
 
 opam:tezos-protocol-005-PsBabyM1:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
+    - .rules_template__trigger_all_opam_batch_5
   variables:
     package: tezos-protocol-005-PsBabyM1
 
@@ -1293,7 +1185,7 @@ opam:tezos-protocol-016-PtMumbai:
 opam:tezos-protocol-017-PtNairob:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_7
+    - .rules_template__trigger_all_opam_batch_6
   variables:
     package: tezos-protocol-017-PtNairob
 
@@ -1302,7 +1194,7 @@ opam:tezos-protocol-017-PtNairob:
 opam:tezos-protocol-018-Proxford:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_7
+    - .rules_template__trigger_all_opam_batch_6
   variables:
     package: tezos-protocol-018-Proxford
 
@@ -1311,7 +1203,7 @@ opam:tezos-protocol-018-Proxford:
 opam:tezos-protocol-alpha:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_7
+    - .rules_template__trigger_all_opam_batch_6
   variables:
     package: tezos-protocol-alpha
 
@@ -1320,7 +1212,7 @@ opam:tezos-protocol-alpha:
 opam:tezos-protocol-demo-counter:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_7
+    - .rules_template__trigger_all_opam_batch_6
   variables:
     package: tezos-protocol-demo-counter
 
@@ -1338,194 +1230,6 @@ opam:tezos-protocol-genesis:
   variables:
     package: tezos-protocol-genesis
 
-opam:tezos-protocol-plugin-007-PsDELPH1:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-007-PsDELPH1
-
-opam:tezos-protocol-plugin-007-PsDELPH1-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-protocol-plugin-007-PsDELPH1-registerer
-
-opam:tezos-protocol-plugin-008-PtEdo2Zk:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-008-PtEdo2Zk
-
-opam:tezos-protocol-plugin-008-PtEdo2Zk-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-protocol-plugin-008-PtEdo2Zk-registerer
-
-opam:tezos-protocol-plugin-009-PsFLoren:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-009-PsFLoren
-
-opam:tezos-protocol-plugin-009-PsFLoren-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-protocol-plugin-009-PsFLoren-registerer
-
-opam:tezos-protocol-plugin-010-PtGRANAD:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-010-PtGRANAD
-
-opam:tezos-protocol-plugin-010-PtGRANAD-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-protocol-plugin-010-PtGRANAD-registerer
-
-opam:tezos-protocol-plugin-011-PtHangz2:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-011-PtHangz2
-
-opam:tezos-protocol-plugin-011-PtHangz2-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-protocol-plugin-011-PtHangz2-registerer
-
-opam:tezos-protocol-plugin-012-Psithaca:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-012-Psithaca
-
-opam:tezos-protocol-plugin-012-Psithaca-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-protocol-plugin-012-Psithaca-registerer
-
-opam:tezos-protocol-plugin-013-PtJakart:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-013-PtJakart
-
-opam:tezos-protocol-plugin-013-PtJakart-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-protocol-plugin-013-PtJakart-registerer
-
-opam:tezos-protocol-plugin-014-PtKathma:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-014-PtKathma
-
-opam:tezos-protocol-plugin-014-PtKathma-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
-  variables:
-    package: tezos-protocol-plugin-014-PtKathma-registerer
-
-opam:tezos-protocol-plugin-015-PtLimaPt:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-015-PtLimaPt
-
-opam:tezos-protocol-plugin-015-PtLimaPt-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
-  variables:
-    package: tezos-protocol-plugin-015-PtLimaPt-registerer
-
-opam:tezos-protocol-plugin-016-PtMumbai:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-016-PtMumbai
-
-opam:tezos-protocol-plugin-016-PtMumbai-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
-  variables:
-    package: tezos-protocol-plugin-016-PtMumbai-registerer
-
-opam:tezos-protocol-plugin-017-PtNairob:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-017-PtNairob
-
-opam:tezos-protocol-plugin-017-PtNairob-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
-  variables:
-    package: tezos-protocol-plugin-017-PtNairob-registerer
-
-# Ignoring unreleased package tezos-protocol-plugin-017-PtNairob-tests.
-
-opam:tezos-protocol-plugin-018-Proxford:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-018-Proxford
-
-opam:tezos-protocol-plugin-018-Proxford-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
-  variables:
-    package: tezos-protocol-plugin-018-Proxford-registerer
-
-# Ignoring unreleased package tezos-protocol-plugin-018-Proxford-tests.
-
-opam:tezos-protocol-plugin-alpha:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-protocol-plugin-alpha
-
-opam:tezos-protocol-plugin-alpha-registerer:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_3
-  variables:
-    package: tezos-protocol-plugin-alpha-registerer
-
-# Ignoring unreleased package tezos-protocol-plugin-alpha-tests.
-
 opam:tezos-proxy-server-config:
   extends:
     - .opam_template
@@ -1537,52 +1241,6 @@ opam:tezos-proxy-server-config:
 
 # Ignoring unreleased package tezos-scoru-wasm-regressions.
 
-opam:tezos-smart-rollup-016-PtMumbai:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_5
-  variables:
-    package: tezos-smart-rollup-016-PtMumbai
-
-opam:tezos-smart-rollup-017-PtNairob:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
-  variables:
-    package: tezos-smart-rollup-017-PtNairob
-
-opam:tezos-smart-rollup-018-Proxford:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
-  variables:
-    package: tezos-smart-rollup-018-Proxford
-
-opam:tezos-smart-rollup-alpha:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
-  variables:
-    package: tezos-smart-rollup-alpha
-
-# Ignoring unreleased package tezos-smart-rollup-layer2-016-PtMumbai.
-
-opam:tezos-smart-rollup-layer2-017-PtNairob:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-smart-rollup-layer2-017-PtNairob
-
-opam:tezos-smart-rollup-layer2-018-Proxford:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_all_opam_batch_2
-  variables:
-    package: tezos-smart-rollup-layer2-018-Proxford
-
-# Ignoring unreleased package tezos-smart-rollup-layer2-alpha.
-
 # Ignoring unreleased package tezos-tooling.
 
 # Ignoring unreleased package tezos-tps-evaluation.
diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune
index c8c615235227ae0115a52651ca3672ea4f922183..fb3b37b21bce78bd8cbd1a165fe2fb77e3fbdec9 100644
--- a/devtools/get_contracts/dune
+++ b/devtools/get_contracts/dune
@@ -8,11 +8,11 @@
   octez-libs.tezos-base
   octez-shell-libs.tezos-store
   tezos-protocol-017-PtNairob
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   tezos-protocol-018-Proxford
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   tezos-protocol-alpha
-  tezos-client-alpha)
+  octez-protocol-alpha-libs.tezos-client)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/devtools/testnet_experiment_tools/dune b/devtools/testnet_experiment_tools/dune
index 273890bc05c940fc81e9d46b8e0cb95ed6b1addb..cfcc050e9a3420f18d32eb8f984f523adaf54651 100644
--- a/devtools/testnet_experiment_tools/dune
+++ b/devtools/testnet_experiment_tools/dune
@@ -10,7 +10,7 @@
   octez-libs.tezos-base
   octez-libs.tezos-base.unix
   octez-libs.tezos-stdlib-unix
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   tezos-protocol-alpha)
  (link_flags
   (:standard)
diff --git a/docs/doc_gen/errors/dune b/docs/doc_gen/errors/dune
index 169ee09d06838b06509db8adab796614b4249bb8..38cb0e31c17de26b12d84f2a3290f9ddefa754de 100644
--- a/docs/doc_gen/errors/dune
+++ b/docs/doc_gen/errors/dune
@@ -2,7 +2,7 @@
  (name error_doc)
  (libraries data-encoding
             octez-shell-libs.tezos-shell
-            tezos-client-alpha)
+            octez-protocol-alpha-libs.tezos-client)
  (flags (:standard -open Tezos_base
                    -open Tezos_error_monad
                    -open Data_encoding
diff --git a/docs/shell/the_big_picture.rst b/docs/shell/the_big_picture.rst
index 2f0332cddadb3a758742a3a93bf811e1350945e2..ef3d42c6af079123c1b99a5cf72c71e24d53b650 100644
--- a/docs/shell/the_big_picture.rst
+++ b/docs/shell/the_big_picture.rst
@@ -261,7 +261,7 @@ compatible, and library vs command-line interface.
     :package:`tezos-protocol-alpha`, are abstracted over this object
     type. That way, it is possible to use the same code for different
     platforms or toolkits.
-  - :package:`tezos-client-alpha` provides some functions to perform
+  - :package-api:`tezos-client-alpha <octez-protocol-alpha-libs/Tezos_client_alpha/index.html>` provides some functions to perform
     the operations of protocol Alpha using the wallet and signers from
     the client context.
   - :package:`tezos-client-genesis` contains the basic activator
diff --git a/dune-project b/dune-project
index ed631e8c74da8a6a906e80d296d375b800a2442a..de33402f1975e9b77a08412df5d50370b9166e76 100644
--- a/dune-project
+++ b/dune-project
@@ -29,6 +29,26 @@
 (package (name octez-node))
 (package (name octez-node-config))
 (package (name octez-proto-libs))
+(package (name octez-protocol-000-Ps9mPmXa-libs))
+(package (name octez-protocol-001-PtCJ7pwo-libs))
+(package (name octez-protocol-002-PsYLVpVv-libs))
+(package (name octez-protocol-003-PsddFKi3-libs))
+(package (name octez-protocol-004-Pt24m4xi-libs))
+(package (name octez-protocol-005-PsBabyM1-libs))
+(package (name octez-protocol-006-PsCARTHA-libs))
+(package (name octez-protocol-007-PsDELPH1-libs))
+(package (name octez-protocol-008-PtEdo2Zk-libs))
+(package (name octez-protocol-009-PsFLoren-libs))
+(package (name octez-protocol-010-PtGRANAD-libs))
+(package (name octez-protocol-011-PtHangz2-libs))
+(package (name octez-protocol-012-Psithaca-libs))
+(package (name octez-protocol-013-PtJakart-libs))
+(package (name octez-protocol-014-PtKathma-libs))
+(package (name octez-protocol-015-PtLimaPt-libs))
+(package (name octez-protocol-016-PtMumbai-libs))
+(package (name octez-protocol-017-PtNairob-libs))
+(package (name octez-protocol-018-Proxford-libs))
+(package (name octez-protocol-alpha-libs))
 (package (name octez-protocol-compiler))
 (package (name octez-proxy-server))
 (package (name octez-shell-libs))
@@ -49,15 +69,6 @@
 (package (name octez-store-tests)(allow_empty))
 (package (name octez-testnet-scenarios))
 (package (name scoru-sequencer-test)(allow_empty))
-(package (name tezos-017-PtNairob-test-helpers))
-(package (name tezos-018-Proxford-test-helpers))
-(package (name tezos-alpha-test-helpers))
-(package (name tezos-baking-017-PtNairob))
-(package (name tezos-baking-017-PtNairob-commands))
-(package (name tezos-baking-018-Proxford))
-(package (name tezos-baking-018-Proxford-commands))
-(package (name tezos-baking-alpha))
-(package (name tezos-baking-alpha-commands))
 (package (name tezos-benchmark))
 (package (name tezos-benchmark-017-PtNairob))
 (package (name tezos-benchmark-018-Proxford))
@@ -70,39 +81,13 @@
 (package (name tezos-benchmarks-proto-017-PtNairob))
 (package (name tezos-benchmarks-proto-018-Proxford))
 (package (name tezos-benchmarks-proto-alpha))
-(package (name tezos-client-000-Ps9mPmXa))
-(package (name tezos-client-001-PtCJ7pwo))
-(package (name tezos-client-002-PsYLVpVv))
-(package (name tezos-client-003-PsddFKi3))
-(package (name tezos-client-004-Pt24m4xi))
-(package (name tezos-client-005-PsBabyM1))
-(package (name tezos-client-006-PsCARTHA))
-(package (name tezos-client-007-PsDELPH1))
-(package (name tezos-client-008-PtEdo2Zk))
-(package (name tezos-client-009-PsFLoren))
-(package (name tezos-client-010-PtGRANAD))
-(package (name tezos-client-011-PtHangz2))
-(package (name tezos-client-012-Psithaca))
-(package (name tezos-client-013-PtJakart))
-(package (name tezos-client-014-PtKathma))
-(package (name tezos-client-015-PtLimaPt))
-(package (name tezos-client-016-PtMumbai))
-(package (name tezos-client-017-PtNairob))
-(package (name tezos-client-018-Proxford))
-(package (name tezos-client-alpha))
 (package (name tezos-client-demo-counter))
 (package (name tezos-client-genesis))
-(package (name tezos-dac-017-PtNairob))
-(package (name tezos-dac-018-Proxford))
-(package (name tezos-dac-alpha))
 (package (name tezos-dac-client-lib))
 (package (name tezos-dac-lib))
 (package (name tezos-dac-lib-test)(allow_empty))
 (package (name tezos-dac-node-lib)(allow_empty))
 (package (name tezos-dac-node-lib-test)(allow_empty))
-(package (name tezos-dal-017-PtNairob))
-(package (name tezos-dal-018-Proxford))
-(package (name tezos-dal-alpha))
 (package (name tezos-dal-node-lib))
 (package (name tezos-dal-node-services))
 (package (name tezos-embedded-protocol-000-Ps9mPmXa))
@@ -130,10 +115,6 @@
 (package (name tezos-embedded-protocol-demo-counter))
 (package (name tezos-embedded-protocol-demo-noops))
 (package (name tezos-embedded-protocol-genesis))
-(package (name tezos-layer2-utils-016-PtMumbai))
-(package (name tezos-layer2-utils-017-PtNairob))
-(package (name tezos-layer2-utils-018-Proxford))
-(package (name tezos-layer2-utils-alpha))
 (package (name tezos-lazy-containers-tests)(allow_empty))
 (package (name tezos-micheline-rewriting))
 (package (name tezos-openapi))
@@ -165,46 +146,9 @@
 (package (name tezos-protocol-demo-counter))
 (package (name tezos-protocol-demo-noops))
 (package (name tezos-protocol-genesis))
-(package (name tezos-protocol-plugin-007-PsDELPH1))
-(package (name tezos-protocol-plugin-007-PsDELPH1-registerer))
-(package (name tezos-protocol-plugin-008-PtEdo2Zk))
-(package (name tezos-protocol-plugin-008-PtEdo2Zk-registerer))
-(package (name tezos-protocol-plugin-009-PsFLoren))
-(package (name tezos-protocol-plugin-009-PsFLoren-registerer))
-(package (name tezos-protocol-plugin-010-PtGRANAD))
-(package (name tezos-protocol-plugin-010-PtGRANAD-registerer))
-(package (name tezos-protocol-plugin-011-PtHangz2))
-(package (name tezos-protocol-plugin-011-PtHangz2-registerer))
-(package (name tezos-protocol-plugin-012-Psithaca))
-(package (name tezos-protocol-plugin-012-Psithaca-registerer))
-(package (name tezos-protocol-plugin-013-PtJakart))
-(package (name tezos-protocol-plugin-013-PtJakart-registerer))
-(package (name tezos-protocol-plugin-014-PtKathma))
-(package (name tezos-protocol-plugin-014-PtKathma-registerer))
-(package (name tezos-protocol-plugin-015-PtLimaPt))
-(package (name tezos-protocol-plugin-015-PtLimaPt-registerer))
-(package (name tezos-protocol-plugin-016-PtMumbai))
-(package (name tezos-protocol-plugin-016-PtMumbai-registerer))
-(package (name tezos-protocol-plugin-017-PtNairob))
-(package (name tezos-protocol-plugin-017-PtNairob-registerer))
-(package (name tezos-protocol-plugin-017-PtNairob-tests)(allow_empty))
-(package (name tezos-protocol-plugin-018-Proxford))
-(package (name tezos-protocol-plugin-018-Proxford-registerer))
-(package (name tezos-protocol-plugin-018-Proxford-tests)(allow_empty))
-(package (name tezos-protocol-plugin-alpha))
-(package (name tezos-protocol-plugin-alpha-registerer))
-(package (name tezos-protocol-plugin-alpha-tests)(allow_empty))
 (package (name tezos-proxy-server-config))
 (package (name tezos-sc-rollup-node-test)(allow_empty))
 (package (name tezos-scoru-wasm-regressions)(allow_empty))
-(package (name tezos-smart-rollup-016-PtMumbai))
-(package (name tezos-smart-rollup-017-PtNairob))
-(package (name tezos-smart-rollup-018-Proxford))
-(package (name tezos-smart-rollup-alpha))
-(package (name tezos-smart-rollup-layer2-016-PtMumbai))
-(package (name tezos-smart-rollup-layer2-017-PtNairob))
-(package (name tezos-smart-rollup-layer2-018-Proxford))
-(package (name tezos-smart-rollup-layer2-alpha))
 (package (name tezos-tooling))
 (package (name tezos-tps-evaluation))
 (package (name tezos-tree-encoding-test)(allow_empty))
diff --git a/manifest/main.ml b/manifest/main.ml
index 9b9365a2a667be1865d6efb1d81220e450241fbc..998fcd5b80086ea497a86f77640dd4d5b87616b1 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -5584,6 +5584,16 @@ let hash = Protocol.hash
     let name_underscore = Name.name_underscore name in
     let number = Name.number name in
     let path = Name.base_path name in
+    (* Container of the registered sublibraries of [octez-protocol-libs] *)
+    let registered_octez_protocol_libs : Sub_lib.container =
+      Sub_lib.make_container ()
+    in
+    let octez_protocol_lib : Sub_lib.maker =
+      Sub_lib.sub_lib
+        ~package_synopsis:(sf "Octez protocol %s libraries" name_dash)
+        ~container:registered_octez_protocol_libs
+        ~package:(sf "octez-protocol-%s-libs" name_dash)
+    in
     let active =
       match status with
       | Frozen | Overridden | Not_mainnet -> false
@@ -5677,22 +5687,25 @@ let hash = Protocol.hash
     in
     let octez_sc_rollup =
       only_if N.(number >= 016) @@ fun () ->
-      public_lib
-        (sf "tezos-smart-rollup-%s" name_dash)
+      octez_protocol_lib
+        "tezos-smart-rollup"
+        ~internal_name:(sf "tezos_smart_rollup_%s" name_dash)
         ~path:(path // "lib_sc_rollup")
         ~synopsis:
-          "Tezos/Protocol: protocol specific library of helpers for \
-           `tezos-smart-rollup`"
+          "Protocol specific library of helpers for `tezos-smart-rollup`"
         ~deps:[octez_base |> open_ ~m:"TzPervasives"; main |> open_]
         ~inline_tests:ppx_expect
         ~linkall:true
     in
     let plugin =
       only_if (N.(number >= 007) && not_overridden) @@ fun () ->
-      public_lib
-        (sf "tezos-protocol-plugin-%s" name_dash)
+      octez_protocol_lib
+        "tezos-protocol-plugin"
+        ~internal_name:(sf "tezos_protocol_plugin_%s" name_dash)
         ~path:(path // "lib_plugin")
-        ~synopsis:"Tezos/Protocol: protocol plugin"
+        ~synopsis:"Protocol plugin"
+        ~documentation:
+          [Dune.[S "package"; S (sf "octez-protocol-%s-libs" name_dash)]]
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives"
@@ -5705,10 +5718,11 @@ let hash = Protocol.hash
     in
     let plugin_registerer =
       opt_map plugin @@ fun plugin ->
-      public_lib
-        (sf "tezos-protocol-plugin-%s-registerer" name_dash)
+      octez_protocol_lib
+        "tezos-protocol-plugin-registerer"
+        ~internal_name:(sf "tezos_protocol_plugin_%s_registerer" name_dash)
         ~path:(path // "lib_plugin")
-        ~synopsis:"Tezos/Protocol: protocol plugin registerer"
+        ~synopsis:"Protocol plugin registerer"
         ~release_status:optional_library_release_status
         ~deps:
           [
@@ -5723,10 +5737,11 @@ let hash = Protocol.hash
     in
     let client =
       only_if not_overridden @@ fun () ->
-      public_lib
-        (sf "tezos-client-%s" name_dash)
+      octez_protocol_lib
+        "tezos-client"
+        ~internal_name:(sf "tezos_client_%s" name_dash)
         ~path:(path // "lib_client")
-        ~synopsis:"Tezos/Protocol: protocol specific library for `tezos-client`"
+        ~synopsis:"Protocol specific library for `tezos-client`"
         ~release_status:optional_library_release_status
         ~deps:
           [
@@ -5754,15 +5769,13 @@ let hash = Protocol.hash
     in
     let test_helpers =
       only_if active @@ fun () ->
-      let name = sf "tezos-%s-test-helpers" name_dash in
-      public_lib
-        name
+      octez_protocol_lib
+        "tezos-test-helpers"
         ~path:
           (if active then path // "lib_protocol/test/helpers"
           else path // "lib_protocol")
-        ~opam:name
         ~internal_name:(sf "tezos_%s_test_helpers" name_underscore)
-        ~synopsis:"Tezos/Protocol: protocol testing framework"
+        ~synopsis:"Protocol testing framework"
         ~opam_only_deps:[octez_protocol_environment; parameters |> if_some]
         ~deps:
           [
@@ -5796,8 +5809,7 @@ let hash = Protocol.hash
         ]
         ~path:(path // "lib_plugin/test")
         ~with_macos_security_framework:true
-        ~synopsis:"Tezos/Protocol: protocol plugin tests"
-        ~opam:(sf "tezos-protocol-plugin-%s-tests" name_dash)
+        ~opam:(sf "octez-protocol-%s-libs" name_dash)
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives"
@@ -5825,7 +5837,7 @@ let hash = Protocol.hash
           "test_proxy";
         ]
         ~path:(path // "lib_client/test")
-        ~opam:(sf "tezos-client-%s" name_dash)
+        ~opam:(sf "octez-protocol-%s-libs" name_dash)
         ~with_macos_security_framework:true
         ~deps:
           [
@@ -5842,8 +5854,9 @@ let hash = Protocol.hash
     in
     let client_commands =
       only_if (N.(number >= 001) && not_overridden) @@ fun () ->
-      public_lib
-        (sf "tezos-client-%s.commands" name_dash)
+      octez_protocol_lib
+        "tezos-client.commands"
+        ~internal_name:(sf "tezos_client_%s_commands" name_dash)
         ~path:(path // "lib_client_commands")
         ~deps:
           [
@@ -5876,8 +5889,8 @@ let hash = Protocol.hash
     in
     let client_sapling =
       only_if (N.(number >= 011) && not_overridden) @@ fun () ->
-      public_lib
-        (sf "tezos-client-%s.sapling" name_dash)
+      octez_protocol_lib
+        "tezos-client.sapling"
         ~internal_name:(sf "tezos_client_sapling_%s" name_underscore)
         ~path:(path // "lib_client_sapling")
         ~deps:
@@ -5898,10 +5911,10 @@ let hash = Protocol.hash
     in
     let client_commands_registration =
       only_if (N.(number >= 001) && not_overridden) @@ fun () ->
-      public_lib
-        (sf "tezos-client-%s.commands-registration" name_dash)
+      octez_protocol_lib
+        "tezos-client.commands-registration"
+        ~internal_name:(sf "tezos_client_%s_commands_registration" name_dash)
         ~path:(path // "lib_client_commands")
-        ~opam:(sf "tezos-client-%s" name_dash)
         ~deps:
           [
             octez_base
@@ -5928,13 +5941,14 @@ let hash = Protocol.hash
     in
     let baking =
       only_if active @@ fun () ->
-      public_lib
-        ("tezos-baking-" ^ name_dash)
+      octez_protocol_lib
+        "tezos-baking"
+        ~internal_name:("tezos_baking_" ^ name_dash)
         ~path:(path // "lib_delegate")
         ~synopsis:
           (if N.(number <= 011) then
-           "Tezos/Protocol: base library for `tezos-baker/endorser/accuser`"
-          else "Tezos/Protocol: base library for `tezos-baker/accuser`")
+           "Base library for `tezos-baker/endorser/accuser`"
+          else "Base library for `tezos-baker/accuser`")
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives"
@@ -5971,8 +5985,8 @@ let hash = Protocol.hash
     in
     let tenderbrute =
       only_if (active && N.(number >= 013)) @@ fun () ->
-      public_lib
-        (sf "tezos-baking-%s.tenderbrute" name_dash)
+      octez_protocol_lib
+        "tezos-baking.tenderbrute"
         ~internal_name:(sf "tenderbrute_%s" name_underscore)
         ~path:(path // "lib_delegate/test/tenderbrute/lib")
         ~deps:
@@ -5995,7 +6009,7 @@ let hash = Protocol.hash
         ~alias:""
         ~path:(path // "lib_delegate/test/tenderbrute")
         ~with_macos_security_framework:true
-        ~opam:(sf "tezos-baking-%s" name_dash)
+        ~opam:(sf "octez-protocol-%s-libs" name_dash)
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives"
@@ -6013,8 +6027,8 @@ let hash = Protocol.hash
       only_if N.(number >= 011) @@ fun () ->
       let mockup_simulator =
         only_if N.(number >= 012) @@ fun () ->
-        public_lib
-          (sf "tezos-baking-%s.mockup-simulator" name_dash)
+        octez_protocol_lib
+          "tezos-bakings.mockup-simulator"
           ~internal_name:(sf "tezos_%s_mockup_simulator" name_underscore)
           ~path:(path // "lib_delegate/test/mockup_simulator")
           ~deps:
@@ -6039,7 +6053,7 @@ let hash = Protocol.hash
         ["test_scenario"]
         ~path:(path // "lib_delegate/test")
         ~with_macos_security_framework:true
-        ~opam:(sf "tezos-baking-%s" name_dash)
+        ~opam:(sf "octez-protocol-%s-libs" name_dash)
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives"
@@ -6062,10 +6076,11 @@ let hash = Protocol.hash
     in
     let baking_commands =
       only_if active @@ fun () ->
-      public_lib
-        (sf "tezos-baking-%s-commands" name_dash)
+      octez_protocol_lib
+        "tezos-baking-commands"
+        ~internal_name:(sf "tezos_baking_%s_commands" name_dash)
         ~path:(path // "lib_delegate")
-        ~synopsis:"Tezos/Protocol: protocol-specific commands for baking"
+        ~synopsis:"Protocol-specific commands for baking"
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives"
@@ -6091,8 +6106,9 @@ let hash = Protocol.hash
     in
     let baking_commands_registration =
       only_if active @@ fun () ->
-      public_lib
-        (sf "tezos-baking-%s-commands.registration" name_dash)
+      octez_protocol_lib
+        "tezos-baking-commands.registration"
+        ~internal_name:(sf "tezos_baking_%s_commands_registration" name_dash)
         ~path:(path // "lib_delegate")
         ~deps:
           [
@@ -6141,10 +6157,11 @@ let hash = Protocol.hash
     let _endorser = only_if N.(number <= 011) @@ fun () -> daemon "endorser" in
     let layer2_utils =
       only_if N.(number >= 016) @@ fun () ->
-      public_lib
-        (sf "tezos-layer2-utils-%s" name_dash)
+      octez_protocol_lib
+        "tezos-layer2-utils"
+        ~internal_name:(sf "tezos_layer2_utils_%s" name_dash)
         ~path:(path // "lib_layer2_utils")
-        ~synopsis:"Tezos/Protocol: protocol specific library for Layer 2 utils"
+        ~synopsis:"Protocol specific library for Layer 2 utils"
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives";
@@ -6156,10 +6173,11 @@ let hash = Protocol.hash
     in
     let injector =
       only_if (active && N.(number >= 013 && number <= 015)) @@ fun () ->
-      public_lib
-        (sf "tezos-injector-%s" name_dash)
+      octez_protocol_lib
+        "tezos-injector"
+        ~internal_name:(sf "tezos_injector_%s" name_dash)
         ~path:(path // "lib_injector")
-        ~synopsis:"Tezos/Protocol: protocol specific library building injectors"
+        ~synopsis:"Protocol specific library building injectors"
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives"
@@ -6181,12 +6199,11 @@ let hash = Protocol.hash
     in
     let dal =
       only_if (active && N.(number >= 016)) @@ fun () ->
-      public_lib
-        (sf "tezos-dal-%s" name_dash)
+      octez_protocol_lib
+        "tezos-dal"
+        ~internal_name:(sf "tezos_dal_%s" name_dash)
         ~path:(path // "lib_dal")
-        ~synopsis:
-          "Tezos/Protocol: protocol specific library for the Data availability \
-           Layer"
+        ~synopsis:"Protocol specific library for the Data availability Layer"
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives"
@@ -6215,7 +6232,7 @@ let hash = Protocol.hash
          ]
         else ["test_dal_slot_frame_encoding"; "test_helpers"])
         ~path:(path // "lib_dal/test")
-        ~opam:(sf "tezos-dal-%s" name_dash)
+        ~opam:(sf "octez-protocol-%s-libs" name_dash)
         ~with_macos_security_framework:true
         ~deps:
           [
@@ -6234,12 +6251,12 @@ let hash = Protocol.hash
          option would cause DAL related tezts to fail because the DAC
          plugin cannot be resolved. *)
       only_if (active && N.(number >= 017)) @@ fun () ->
-      public_lib
-        (sf "tezos-dac-%s" name_dash)
+      octez_protocol_lib
+        "tezos-dac"
+        ~internal_name:(sf "tezos_dac_%s" name_dash)
         ~path:(path // "lib_dac_plugin")
         ~synopsis:
-          "Tezos/Protocol: protocol specific library for the Data availability \
-           Committee"
+          "Protocol specific library for the Data availability Committee"
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives"
@@ -6265,7 +6282,7 @@ let hash = Protocol.hash
         ]
         ~path:(path // "lib_dac_plugin/test")
         ~with_macos_security_framework:true
-        ~opam:(sf "tezos-dac-%s" name_dash)
+        ~opam:(sf "octez-protocol-%s-libs" name_dash)
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives"
@@ -6281,11 +6298,11 @@ let hash = Protocol.hash
     in
     let octez_sc_rollup_layer2 =
       only_if N.(number >= 016) @@ fun () ->
-      public_lib
-        (sf "tezos-smart-rollup-layer2-%s" name_dash)
+      octez_protocol_lib
+        "tezos-smart-rollup-layer2"
+        ~internal_name:(sf "tezos_smart_rollup_layer2_%s" name_dash)
         ~path:(path // "lib_sc_rollup_layer2")
-        ~synopsis:
-          "Tezos/Protocol: protocol specific library for `tezos-smart-rollup`"
+        ~synopsis:"Protocol specific library for `tezos-smart-rollup`"
         ~deps:
           [
             octez_base |> open_ ~m:"TzPervasives";
@@ -6455,11 +6472,11 @@ let hash = Protocol.hash
     in
     let tx_rollup =
       only_if (active && N.(number >= 013 && number <= 015)) @@ fun () ->
-      public_lib
-        (sf "tezos-tx-rollup-%s" name_dash)
+      octez_protocol_lib
+        "tezos-tx-rollup"
+        ~internal_name:(sf "tezos_tx_rollup_%s" name_dash)
         ~path:(path // "lib_tx_rollup")
-        ~synopsis:
-          "Tezos/Protocol: protocol specific library for `tezos-tx-rollup`"
+        ~synopsis:"Protocol specific library for `tezos-tx-rollup`"
         ~deps:
           [
             index;
@@ -6686,6 +6703,24 @@ let hash = Protocol.hash
           ~name
           ()
     in
+    (* Generate documentation index for [octez-protocol-%s-libs] *)
+    let () =
+      write (path // "lib_plugin/index.mld") @@ fun fmt ->
+      let header =
+        sf
+          "{0 Octez-protocol-%s-libs: octez protocol %s libraries}\n\n\
+           This is a package containing some libraries related to the Tezos %s \
+           protocol.\n\n\
+           It contains the following libraries:\n\n"
+          name_dash
+          name_dash
+          name_dash
+      in
+      Sub_lib.pp_documentation_of_container
+        ~header
+        fmt
+        registered_octez_protocol_libs
+    in
     register
     @@ make
          ~status
diff --git a/opam/octez-accuser-Proxford.opam b/opam/octez-accuser-Proxford.opam
index 69d9a1eba9f7d4385f94add8985572022ce74eeb..8b3a43535d52c56e5b0bc37a4d8f7321a82375c3 100644
--- a/opam/octez-accuser-Proxford.opam
+++ b/opam/octez-accuser-Proxford.opam
@@ -12,9 +12,8 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "tezos-protocol-018-Proxford"
-  "tezos-client-018-Proxford"
+  "octez-protocol-018-Proxford-libs"
   "octez-shell-libs"
-  "tezos-baking-018-Proxford-commands"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-accuser-PtNairob.opam b/opam/octez-accuser-PtNairob.opam
index 4b3eac034c0c31918aa9a8e72b0ad7ec53c48811..f00365766a438175d83f808cc69793b8bf9ad095 100644
--- a/opam/octez-accuser-PtNairob.opam
+++ b/opam/octez-accuser-PtNairob.opam
@@ -12,9 +12,8 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "tezos-protocol-017-PtNairob"
-  "tezos-client-017-PtNairob"
+  "octez-protocol-017-PtNairob-libs"
   "octez-shell-libs"
-  "tezos-baking-017-PtNairob-commands"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-accuser-alpha.opam b/opam/octez-accuser-alpha.opam
index f173068a0123e45b3c4b2f58587a6f9f18c1792b..29b87f1150899117c3e01736fb7e3482389eac8a 100644
--- a/opam/octez-accuser-alpha.opam
+++ b/opam/octez-accuser-alpha.opam
@@ -12,9 +12,8 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "tezos-protocol-alpha"
-  "tezos-client-alpha"
+  "octez-protocol-alpha-libs"
   "octez-shell-libs"
-  "tezos-baking-alpha-commands"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-baker-Proxford.opam b/opam/octez-baker-Proxford.opam
index dca034ff1a022e606a6d50b616e3e08f7e70fd29..79bb7f3851862d22b6a11a4c46f2ebd58fcacf36 100644
--- a/opam/octez-baker-Proxford.opam
+++ b/opam/octez-baker-Proxford.opam
@@ -12,9 +12,8 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "tezos-protocol-018-Proxford"
-  "tezos-client-018-Proxford"
+  "octez-protocol-018-Proxford-libs"
   "octez-shell-libs"
-  "tezos-baking-018-Proxford-commands"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-baker-PtNairob.opam b/opam/octez-baker-PtNairob.opam
index 84a6d8c0d32643be405d29e214f4259eb3113cad..68717bc12c7aaebbb15a4d984f1b833257b4cda3 100644
--- a/opam/octez-baker-PtNairob.opam
+++ b/opam/octez-baker-PtNairob.opam
@@ -12,9 +12,8 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "tezos-protocol-017-PtNairob"
-  "tezos-client-017-PtNairob"
+  "octez-protocol-017-PtNairob-libs"
   "octez-shell-libs"
-  "tezos-baking-017-PtNairob-commands"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-baker-alpha.opam b/opam/octez-baker-alpha.opam
index e35c44e60cbb848bf8618fa2024a6f657bdfd080..6facc59cacd6257e97142aa39d98a65094557176 100644
--- a/opam/octez-baker-alpha.opam
+++ b/opam/octez-baker-alpha.opam
@@ -12,9 +12,8 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "tezos-protocol-alpha"
-  "tezos-client-alpha"
+  "octez-protocol-alpha-libs"
   "octez-shell-libs"
-  "tezos-baking-alpha-commands"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-client.opam b/opam/octez-client.opam
index e8a4fcd85a7d6227b0105666df5aa7002e58517c..4d9c042b44c88ed2c82270b46560dc471f7386cc 100644
--- a/opam/octez-client.opam
+++ b/opam/octez-client.opam
@@ -13,46 +13,30 @@ depends: [
   "octez-libs"
   "octez-shell-libs"
   "uri" { >= "3.1.0" }
-  "tezos-client-017-PtNairob"
-  "tezos-baking-017-PtNairob-commands"
-  "tezos-protocol-plugin-017-PtNairob"
-  "tezos-client-018-Proxford"
-  "tezos-baking-018-Proxford-commands"
-  "tezos-protocol-plugin-018-Proxford"
+  "octez-protocol-017-PtNairob-libs"
+  "octez-protocol-018-Proxford-libs"
 ]
 depopts: [
   "tezos-client-genesis"
   "tezos-client-demo-counter"
-  "tezos-client-000-Ps9mPmXa"
-  "tezos-client-001-PtCJ7pwo"
-  "tezos-client-002-PsYLVpVv"
-  "tezos-client-003-PsddFKi3"
-  "tezos-client-004-Pt24m4xi"
-  "tezos-client-005-PsBabyM1"
-  "tezos-client-006-PsCARTHA"
-  "tezos-client-007-PsDELPH1"
-  "tezos-protocol-plugin-007-PsDELPH1"
-  "tezos-client-008-PtEdo2Zk"
-  "tezos-protocol-plugin-008-PtEdo2Zk"
-  "tezos-client-009-PsFLoren"
-  "tezos-protocol-plugin-009-PsFLoren"
-  "tezos-client-010-PtGRANAD"
-  "tezos-protocol-plugin-010-PtGRANAD"
-  "tezos-client-011-PtHangz2"
-  "tezos-protocol-plugin-011-PtHangz2"
-  "tezos-client-012-Psithaca"
-  "tezos-protocol-plugin-012-Psithaca"
-  "tezos-client-013-PtJakart"
-  "tezos-protocol-plugin-013-PtJakart"
-  "tezos-client-014-PtKathma"
-  "tezos-protocol-plugin-014-PtKathma"
-  "tezos-client-015-PtLimaPt"
-  "tezos-protocol-plugin-015-PtLimaPt"
-  "tezos-client-016-PtMumbai"
-  "tezos-protocol-plugin-016-PtMumbai"
-  "tezos-client-alpha"
-  "tezos-baking-alpha-commands"
-  "tezos-protocol-plugin-alpha"
+  "octez-protocol-000-Ps9mPmXa-libs"
+  "octez-protocol-001-PtCJ7pwo-libs"
+  "octez-protocol-002-PsYLVpVv-libs"
+  "octez-protocol-003-PsddFKi3-libs"
+  "octez-protocol-004-Pt24m4xi-libs"
+  "octez-protocol-005-PsBabyM1-libs"
+  "octez-protocol-006-PsCARTHA-libs"
+  "octez-protocol-007-PsDELPH1-libs"
+  "octez-protocol-008-PtEdo2Zk-libs"
+  "octez-protocol-009-PsFLoren-libs"
+  "octez-protocol-010-PtGRANAD-libs"
+  "octez-protocol-011-PtHangz2-libs"
+  "octez-protocol-012-Psithaca-libs"
+  "octez-protocol-013-PtJakart-libs"
+  "octez-protocol-014-PtKathma-libs"
+  "octez-protocol-015-PtLimaPt-libs"
+  "octez-protocol-016-PtMumbai-libs"
+  "octez-protocol-alpha-libs"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam
index 24c96be19132f1364c1081407e6b7ecf487db5c2..d24cde83aab965dd01b53f5656b35ed3e6cbb4e6 100644
--- a/opam/octez-codec.opam
+++ b/opam/octez-codec.opam
@@ -16,21 +16,21 @@ depends: [
   "tezos-version"
 ]
 depopts: [
-  "tezos-client-005-PsBabyM1"
-  "tezos-client-006-PsCARTHA"
-  "tezos-client-007-PsDELPH1"
-  "tezos-client-008-PtEdo2Zk"
-  "tezos-client-009-PsFLoren"
-  "tezos-client-010-PtGRANAD"
-  "tezos-client-011-PtHangz2"
-  "tezos-client-012-Psithaca"
-  "tezos-client-013-PtJakart"
-  "tezos-client-014-PtKathma"
-  "tezos-client-015-PtLimaPt"
-  "tezos-client-016-PtMumbai"
-  "tezos-client-017-PtNairob"
-  "tezos-client-018-Proxford"
-  "tezos-client-alpha"
+  "octez-protocol-005-PsBabyM1-libs"
+  "octez-protocol-006-PsCARTHA-libs"
+  "octez-protocol-007-PsDELPH1-libs"
+  "octez-protocol-008-PtEdo2Zk-libs"
+  "octez-protocol-009-PsFLoren-libs"
+  "octez-protocol-010-PtGRANAD-libs"
+  "octez-protocol-011-PtHangz2-libs"
+  "octez-protocol-012-Psithaca-libs"
+  "octez-protocol-013-PtJakart-libs"
+  "octez-protocol-014-PtKathma-libs"
+  "octez-protocol-015-PtLimaPt-libs"
+  "octez-protocol-016-PtMumbai-libs"
+  "octez-protocol-017-PtNairob-libs"
+  "octez-protocol-018-Proxford-libs"
+  "octez-protocol-alpha-libs"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-dac-client.opam b/opam/octez-dac-client.opam
index 399cea91bf0febf8d1eb5103391ca995f0ab8c2d..4109db2a98f063cf72dc716b5e74cb4e3d845912 100644
--- a/opam/octez-dac-client.opam
+++ b/opam/octez-dac-client.opam
@@ -14,11 +14,11 @@ depends: [
   "octez-shell-libs"
   "tezos-dac-lib"
   "tezos-dac-client-lib"
-  "tezos-dac-017-PtNairob"
-  "tezos-dac-018-Proxford"
+  "octez-protocol-017-PtNairob-libs"
+  "octez-protocol-018-Proxford-libs"
 ]
 depopts: [
-  "tezos-dac-alpha"
+  "octez-protocol-alpha-libs"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-dac-node.opam b/opam/octez-dac-node.opam
index 5d77eed9f55ce94802a1eb85764ea4d5031a2834..dbf4dd588bb08664c1805682e6fa07b2776f843f 100644
--- a/opam/octez-dac-node.opam
+++ b/opam/octez-dac-node.opam
@@ -17,11 +17,11 @@ depends: [
   "octez-l2-libs"
   "irmin-pack" { >= "3.7.2" & < "3.8.0" }
   "irmin" { >= "3.7.2" & < "3.8.0" }
-  "tezos-dac-017-PtNairob"
-  "tezos-dac-018-Proxford"
+  "octez-protocol-017-PtNairob-libs"
+  "octez-protocol-018-Proxford-libs"
 ]
 depopts: [
-  "tezos-dac-alpha"
+  "octez-protocol-alpha-libs"
 ]
 conflicts: [
   "checkseum" { = "0.5.0" }
diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam
index 01c2ccb9be380ad19138e8a078cf1ced230696f4..cd41fda496b445b4f37d040629d7743ddb944aed 100644
--- a/opam/octez-dal-node.opam
+++ b/opam/octez-dal-node.opam
@@ -19,11 +19,11 @@ depends: [
   "irmin-pack" { >= "3.7.2" & < "3.8.0" }
   "irmin" { >= "3.7.2" & < "3.8.0" }
   "prometheus-app" { >= "1.2" }
-  "tezos-dal-017-PtNairob"
-  "tezos-dal-018-Proxford"
+  "octez-protocol-017-PtNairob-libs"
+  "octez-protocol-018-Proxford-libs"
 ]
 depopts: [
-  "tezos-dal-alpha"
+  "octez-protocol-alpha-libs"
 ]
 conflicts: [
   "checkseum" { = "0.5.0" }
diff --git a/opam/octez-node.opam b/opam/octez-node.opam
index 6d6f0cbcd34165c65e0348a16ac9186f8f1d9f4b..a7857532dfd33c6245c0bba20465e6c64e16974d 100644
--- a/opam/octez-node.opam
+++ b/opam/octez-node.opam
@@ -22,9 +22,9 @@ depends: [
   "uri" { >= "3.1.0" }
   "tezos-embedded-protocol-000-Ps9mPmXa"
   "tezos-embedded-protocol-017-PtNairob"
-  "tezos-protocol-plugin-017-PtNairob-registerer"
+  "octez-protocol-017-PtNairob-libs"
   "tezos-embedded-protocol-018-Proxford"
-  "tezos-protocol-plugin-018-Proxford-registerer"
+  "octez-protocol-018-Proxford-libs"
 ]
 depopts: [
   "tezos-embedded-protocol-genesis"
@@ -38,28 +38,28 @@ depopts: [
   "tezos-embedded-protocol-005-PsBabyM1"
   "tezos-embedded-protocol-006-PsCARTHA"
   "tezos-embedded-protocol-007-PsDELPH1"
-  "tezos-protocol-plugin-007-PsDELPH1-registerer"
+  "octez-protocol-007-PsDELPH1-libs"
   "tezos-embedded-protocol-008-PtEdoTez"
   "tezos-embedded-protocol-008-PtEdo2Zk"
-  "tezos-protocol-plugin-008-PtEdo2Zk-registerer"
+  "octez-protocol-008-PtEdo2Zk-libs"
   "tezos-embedded-protocol-009-PsFLoren"
-  "tezos-protocol-plugin-009-PsFLoren-registerer"
+  "octez-protocol-009-PsFLoren-libs"
   "tezos-embedded-protocol-010-PtGRANAD"
-  "tezos-protocol-plugin-010-PtGRANAD-registerer"
+  "octez-protocol-010-PtGRANAD-libs"
   "tezos-embedded-protocol-011-PtHangz2"
-  "tezos-protocol-plugin-011-PtHangz2-registerer"
+  "octez-protocol-011-PtHangz2-libs"
   "tezos-embedded-protocol-012-Psithaca"
-  "tezos-protocol-plugin-012-Psithaca-registerer"
+  "octez-protocol-012-Psithaca-libs"
   "tezos-embedded-protocol-013-PtJakart"
-  "tezos-protocol-plugin-013-PtJakart-registerer"
+  "octez-protocol-013-PtJakart-libs"
   "tezos-embedded-protocol-014-PtKathma"
-  "tezos-protocol-plugin-014-PtKathma-registerer"
+  "octez-protocol-014-PtKathma-libs"
   "tezos-embedded-protocol-015-PtLimaPt"
-  "tezos-protocol-plugin-015-PtLimaPt-registerer"
+  "octez-protocol-015-PtLimaPt-libs"
   "tezos-embedded-protocol-016-PtMumbai"
-  "tezos-protocol-plugin-016-PtMumbai-registerer"
+  "octez-protocol-016-PtMumbai-libs"
   "tezos-embedded-protocol-alpha"
-  "tezos-protocol-plugin-alpha-registerer"
+  "octez-protocol-alpha-libs"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/octez-protocol-000-Ps9mPmXa-libs.opam
similarity index 88%
rename from opam/tezos-client-000-Ps9mPmXa.opam
rename to opam/octez-protocol-000-Ps9mPmXa-libs.opam
index 34478b731426fd50cfc75c3221ec2cd51e608f0e..ad1c37a82b1dd086783afb093efe258bf34d5b4e 100644
--- a/opam/tezos-client-000-Ps9mPmXa.opam
+++ b/opam/octez-protocol-000-Ps9mPmXa-libs.opam
@@ -19,4 +19,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 000-Ps9mPmXa libraries"
diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/octez-protocol-001-PtCJ7pwo-libs.opam
similarity index 89%
rename from opam/tezos-client-001-PtCJ7pwo.opam
rename to opam/octez-protocol-001-PtCJ7pwo-libs.opam
index a7675bae5b8e40720e21c8a739ea39c955767316..f98f7117be43d38f0ba6b5fe4d96c6c893c4c7e4 100644
--- a/opam/tezos-client-001-PtCJ7pwo.opam
+++ b/opam/octez-protocol-001-PtCJ7pwo-libs.opam
@@ -21,4 +21,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 001-PtCJ7pwo libraries"
diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/octez-protocol-002-PsYLVpVv-libs.opam
similarity index 89%
rename from opam/tezos-client-002-PsYLVpVv.opam
rename to opam/octez-protocol-002-PsYLVpVv-libs.opam
index 4f14ba8cc848409025eca361ed3f4e711b6a0ebe..1d9ec853e2cc1e2a3cd5e3875180502f36e97fa4 100644
--- a/opam/tezos-client-002-PsYLVpVv.opam
+++ b/opam/octez-protocol-002-PsYLVpVv-libs.opam
@@ -21,4 +21,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 002-PsYLVpVv libraries"
diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/octez-protocol-003-PsddFKi3-libs.opam
similarity index 89%
rename from opam/tezos-client-003-PsddFKi3.opam
rename to opam/octez-protocol-003-PsddFKi3-libs.opam
index 5a536db3982e0a429ceb549bb03c2053fc6eda4b..6d29a36d7a925786d01dfe514bc70e20572d87de 100644
--- a/opam/tezos-client-003-PsddFKi3.opam
+++ b/opam/octez-protocol-003-PsddFKi3-libs.opam
@@ -21,4 +21,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 003-PsddFKi3 libraries"
diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/octez-protocol-004-Pt24m4xi-libs.opam
similarity index 89%
rename from opam/tezos-client-004-Pt24m4xi.opam
rename to opam/octez-protocol-004-Pt24m4xi-libs.opam
index 1095d164b45859452b6f128d18e9c421cbf12920..e06a0a8e0a634ba921d6c62e44e5d5b2114e7ef3 100644
--- a/opam/tezos-client-004-Pt24m4xi.opam
+++ b/opam/octez-protocol-004-Pt24m4xi-libs.opam
@@ -21,4 +21,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 004-Pt24m4xi libraries"
diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/octez-protocol-005-PsBabyM1-libs.opam
similarity index 89%
rename from opam/tezos-client-005-PsBabyM1.opam
rename to opam/octez-protocol-005-PsBabyM1-libs.opam
index f2a4db2f2b9d44f5ea2324cee76cdd0ee578bf5a..8f84cbe49222fb06f487e81b41f6b2e73865f83c 100644
--- a/opam/tezos-client-005-PsBabyM1.opam
+++ b/opam/octez-protocol-005-PsBabyM1-libs.opam
@@ -21,4 +21,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 005-PsBabyM1 libraries"
diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/octez-protocol-006-PsCARTHA-libs.opam
similarity index 89%
rename from opam/tezos-client-006-PsCARTHA.opam
rename to opam/octez-protocol-006-PsCARTHA-libs.opam
index 7888a8cc34d77de0373c599041007643078aece6..0ecb1fd109601f13a3f754e8f24b9435beb0ec97 100644
--- a/opam/tezos-client-006-PsCARTHA.opam
+++ b/opam/octez-protocol-006-PsCARTHA-libs.opam
@@ -21,4 +21,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 006-PsCARTHA libraries"
diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/octez-protocol-007-PsDELPH1-libs.opam
similarity index 84%
rename from opam/tezos-client-007-PsDELPH1.opam
rename to opam/octez-protocol-007-PsDELPH1-libs.opam
index 10e34130c530b198d5709952f869f99499329f28..d6b41069c2935c02a4a09a1095f8e34d1d7a8b38 100644
--- a/opam/tezos-client-007-PsDELPH1.opam
+++ b/opam/octez-protocol-007-PsDELPH1-libs.opam
@@ -11,9 +11,9 @@ depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
   "octez-libs"
-  "octez-shell-libs"
   "tezos-protocol-007-PsDELPH1"
-  "tezos-protocol-plugin-007-PsDELPH1"
+  "tezos-embedded-protocol-007-PsDELPH1"
+  "octez-shell-libs"
   "uri" { >= "3.1.0" }
   "octez-proto-libs"
 ]
@@ -22,4 +22,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 007-PsDELPH1 libraries"
diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/octez-protocol-008-PtEdo2Zk-libs.opam
similarity index 84%
rename from opam/tezos-client-008-PtEdo2Zk.opam
rename to opam/octez-protocol-008-PtEdo2Zk-libs.opam
index 8f13c37f06d2dee7a3deda1e5b9459808fe7c1af..e55952c9b6ff363feb7bd5b3200d4b97186b78e4 100644
--- a/opam/tezos-client-008-PtEdo2Zk.opam
+++ b/opam/octez-protocol-008-PtEdo2Zk-libs.opam
@@ -11,9 +11,9 @@ depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
   "octez-libs"
-  "octez-shell-libs"
   "tezos-protocol-008-PtEdo2Zk"
-  "tezos-protocol-plugin-008-PtEdo2Zk"
+  "tezos-embedded-protocol-008-PtEdo2Zk"
+  "octez-shell-libs"
   "uri" { >= "3.1.0" }
   "octez-proto-libs"
 ]
@@ -22,4 +22,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 008-PtEdo2Zk libraries"
diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/octez-protocol-009-PsFLoren-libs.opam
similarity index 85%
rename from opam/tezos-client-009-PsFLoren.opam
rename to opam/octez-protocol-009-PsFLoren-libs.opam
index 1df8299d1c5fb2ba03be262c5f427f1a65be292c..1fafafc0acf27560ead6b1259d162c37a7c6d7d0 100644
--- a/opam/tezos-client-009-PsFLoren.opam
+++ b/opam/octez-protocol-009-PsFLoren-libs.opam
@@ -10,11 +10,11 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
-  "ppx_expect"
   "octez-libs"
-  "octez-shell-libs"
   "tezos-protocol-009-PsFLoren"
-  "tezos-protocol-plugin-009-PsFLoren"
+  "tezos-embedded-protocol-009-PsFLoren"
+  "octez-shell-libs"
+  "ppx_expect"
   "uri" { >= "3.1.0" }
   "octez-proto-libs"
 ]
@@ -23,4 +23,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 009-PsFLoren libraries"
diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/octez-protocol-010-PtGRANAD-libs.opam
similarity index 85%
rename from opam/tezos-client-010-PtGRANAD.opam
rename to opam/octez-protocol-010-PtGRANAD-libs.opam
index 32026eee23eb2fe8502ffa28b9fdaf20986a2d75..4129993ca06aadd636cb92930424d22beca94524 100644
--- a/opam/tezos-client-010-PtGRANAD.opam
+++ b/opam/octez-protocol-010-PtGRANAD-libs.opam
@@ -10,11 +10,11 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
-  "ppx_expect"
   "octez-libs"
-  "octez-shell-libs"
   "tezos-protocol-010-PtGRANAD"
-  "tezos-protocol-plugin-010-PtGRANAD"
+  "tezos-embedded-protocol-010-PtGRANAD"
+  "octez-shell-libs"
+  "ppx_expect"
   "uri" { >= "3.1.0" }
   "octez-proto-libs"
 ]
@@ -23,4 +23,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 010-PtGRANAD libraries"
diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/octez-protocol-011-PtHangz2-libs.opam
similarity index 85%
rename from opam/tezos-client-011-PtHangz2.opam
rename to opam/octez-protocol-011-PtHangz2-libs.opam
index 55234da1761090bc41b6dfbed108d6548a7a7cee..2d3d6b97895f9005ac15f8391491d768d9cf1494 100644
--- a/opam/tezos-client-011-PtHangz2.opam
+++ b/opam/octez-protocol-011-PtHangz2-libs.opam
@@ -10,11 +10,11 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
-  "ppx_expect"
   "octez-libs"
-  "octez-shell-libs"
   "tezos-protocol-011-PtHangz2"
-  "tezos-protocol-plugin-011-PtHangz2"
+  "tezos-embedded-protocol-011-PtHangz2"
+  "octez-shell-libs"
+  "ppx_expect"
   "uri" { >= "3.1.0" }
   "octez-proto-libs"
 ]
@@ -23,4 +23,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 011-PtHangz2 libraries"
diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/octez-protocol-012-Psithaca-libs.opam
similarity index 85%
rename from opam/tezos-client-012-Psithaca.opam
rename to opam/octez-protocol-012-Psithaca-libs.opam
index 8518be735a5fd2ecabbc33b7629d5faa9c215919..d83701687b013db474e7ff5612fe3f389f05f323 100644
--- a/opam/tezos-client-012-Psithaca.opam
+++ b/opam/octez-protocol-012-Psithaca-libs.opam
@@ -10,11 +10,11 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
-  "ppx_expect"
   "octez-libs"
-  "octez-shell-libs"
   "tezos-protocol-012-Psithaca"
-  "tezos-protocol-plugin-012-Psithaca"
+  "tezos-embedded-protocol-012-Psithaca"
+  "octez-shell-libs"
+  "ppx_expect"
   "uri" { >= "3.1.0" }
   "octez-proto-libs"
 ]
@@ -23,4 +23,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 012-Psithaca libraries"
diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/octez-protocol-013-PtJakart-libs.opam
similarity index 85%
rename from opam/tezos-client-013-PtJakart.opam
rename to opam/octez-protocol-013-PtJakart-libs.opam
index 3b5ab7cfef4df33b5a39060458520bce01fdb9ac..af92c38e5981a6a197f46037581ee535721b7520 100644
--- a/opam/tezos-client-013-PtJakart.opam
+++ b/opam/octez-protocol-013-PtJakart-libs.opam
@@ -10,11 +10,11 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
-  "ppx_expect"
   "octez-libs"
-  "octez-shell-libs"
   "tezos-protocol-013-PtJakart"
-  "tezos-protocol-plugin-013-PtJakart"
+  "tezos-embedded-protocol-013-PtJakart"
+  "octez-shell-libs"
+  "ppx_expect"
   "uri" { >= "3.1.0" }
   "octez-proto-libs"
 ]
@@ -23,4 +23,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 013-PtJakart libraries"
diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/octez-protocol-014-PtKathma-libs.opam
similarity index 85%
rename from opam/tezos-client-014-PtKathma.opam
rename to opam/octez-protocol-014-PtKathma-libs.opam
index 7ec32415f93b239dc0f083704e44d8e957120763..3d14f66001a4e313b4c9697ca52399a2c1f85433 100644
--- a/opam/tezos-client-014-PtKathma.opam
+++ b/opam/octez-protocol-014-PtKathma-libs.opam
@@ -10,11 +10,11 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
-  "ppx_expect"
   "octez-libs"
-  "octez-shell-libs"
   "tezos-protocol-014-PtKathma"
-  "tezos-protocol-plugin-014-PtKathma"
+  "tezos-embedded-protocol-014-PtKathma"
+  "octez-shell-libs"
+  "ppx_expect"
   "uri" { >= "3.1.0" }
   "octez-proto-libs"
 ]
@@ -23,4 +23,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 014-PtKathma libraries"
diff --git a/opam/tezos-client-015-PtLimaPt.opam b/opam/octez-protocol-015-PtLimaPt-libs.opam
similarity index 85%
rename from opam/tezos-client-015-PtLimaPt.opam
rename to opam/octez-protocol-015-PtLimaPt-libs.opam
index b8be855704f19b01d3acf9e326b3748f2d6b2472..b18747b5e78903a07523bb62ddf77754a56b7a8a 100644
--- a/opam/tezos-client-015-PtLimaPt.opam
+++ b/opam/octez-protocol-015-PtLimaPt-libs.opam
@@ -10,11 +10,11 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
-  "ppx_expect"
   "octez-libs"
-  "octez-shell-libs"
   "tezos-protocol-015-PtLimaPt"
-  "tezos-protocol-plugin-015-PtLimaPt"
+  "tezos-embedded-protocol-015-PtLimaPt"
+  "octez-shell-libs"
+  "ppx_expect"
   "uri" { >= "3.1.0" }
   "octez-proto-libs"
 ]
@@ -23,4 +23,4 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 015-PtLimaPt libraries"
diff --git a/opam/tezos-client-016-PtMumbai.opam b/opam/octez-protocol-016-PtMumbai-libs.opam
similarity index 81%
rename from opam/tezos-client-016-PtMumbai.opam
rename to opam/octez-protocol-016-PtMumbai-libs.opam
index f59659e4d14cfe5ed11ee45cf1dec5e63eac017c..14629d6985b170ce5578ec2400ee86337ee0dfb2 100644
--- a/opam/tezos-client-016-PtMumbai.opam
+++ b/opam/octez-protocol-016-PtMumbai-libs.opam
@@ -12,16 +12,17 @@ depends: [
   "ocaml" { >= "4.14" }
   "ppx_expect"
   "octez-libs"
-  "octez-shell-libs"
   "tezos-protocol-016-PtMumbai"
-  "tezos-protocol-plugin-016-PtMumbai"
-  "tezos-smart-rollup-016-PtMumbai"
+  "tezos-embedded-protocol-016-PtMumbai"
+  "octez-shell-libs"
   "uri" { >= "3.1.0" }
   "octez-proto-libs"
+  "octez-injector"
+  "octez-l2-libs"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
+synopsis: "Octez protocol 016-PtMumbai libraries"
diff --git a/opam/tezos-baking-017-PtNairob.opam b/opam/octez-protocol-017-PtNairob-libs.opam
similarity index 73%
rename from opam/tezos-baking-017-PtNairob.opam
rename to opam/octez-protocol-017-PtNairob-libs.opam
index e6f42be8529f01b47e963bd7bfb4e3ff581c4347..f97dd477649d8142a69b53b4504ff34a81f24497 100644
--- a/opam/tezos-baking-017-PtNairob.opam
+++ b/opam/octez-protocol-017-PtNairob-libs.opam
@@ -10,24 +10,32 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
+  "ppx_expect"
   "octez-libs"
-  "tezos-version"
   "tezos-protocol-017-PtNairob"
-  "tezos-protocol-plugin-017-PtNairob"
-  "octez-proto-libs"
+  "tezos-embedded-protocol-017-PtNairob"
   "octez-shell-libs"
-  "tezos-client-017-PtNairob"
+  "uri" { >= "3.1.0" }
+  "qcheck-alcotest" { >= "0.20" }
+  "octez-proto-libs"
+  "tezos-version"
   "tezos-dal-node-services"
   "lwt-canceler" { >= "0.3" & < "0.4" }
   "lwt-exit"
-  "uri" { >= "3.1.0" }
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
+  "octez-protocol-compiler"
+  "tezos-dal-node-lib"
+  "tezos-dac-lib"
+  "tezos-dac-client-lib"
+  "octez-injector"
+  "octez-l2-libs"
   "tezt" { with-test & >= "3.1.1" }
   "octez-alcotezt" {with-test}
+  "tezos-dac-node-lib" {with-test}
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: base library for `tezos-baker/accuser`"
+synopsis: "Octez protocol 017-PtNairob libraries"
diff --git a/opam/tezos-baking-018-Proxford.opam b/opam/octez-protocol-018-Proxford-libs.opam
similarity index 73%
rename from opam/tezos-baking-018-Proxford.opam
rename to opam/octez-protocol-018-Proxford-libs.opam
index 85dbb2f6e4d4e3cc66339a3ff0cf883ba141fe42..9c7654cddc22cb9ec9fc546c8f795045022a81e9 100644
--- a/opam/tezos-baking-018-Proxford.opam
+++ b/opam/octez-protocol-018-Proxford-libs.opam
@@ -10,24 +10,32 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
+  "ppx_expect"
   "octez-libs"
-  "tezos-version"
   "tezos-protocol-018-Proxford"
-  "tezos-protocol-plugin-018-Proxford"
-  "octez-proto-libs"
+  "tezos-embedded-protocol-018-Proxford"
   "octez-shell-libs"
-  "tezos-client-018-Proxford"
+  "uri" { >= "3.1.0" }
+  "qcheck-alcotest" { >= "0.20" }
+  "octez-proto-libs"
+  "tezos-version"
   "tezos-dal-node-services"
   "lwt-canceler" { >= "0.3" & < "0.4" }
   "lwt-exit"
-  "uri" { >= "3.1.0" }
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
+  "octez-protocol-compiler"
+  "tezos-dal-node-lib"
+  "tezos-dac-lib"
+  "tezos-dac-client-lib"
+  "octez-injector"
+  "octez-l2-libs"
   "tezt" { with-test & >= "3.1.1" }
   "octez-alcotezt" {with-test}
+  "tezos-dac-node-lib" {with-test}
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: base library for `tezos-baker/accuser`"
+synopsis: "Octez protocol 018-Proxford libraries"
diff --git a/opam/tezos-baking-alpha.opam b/opam/octez-protocol-alpha-libs.opam
similarity index 74%
rename from opam/tezos-baking-alpha.opam
rename to opam/octez-protocol-alpha-libs.opam
index 7eec4c8750b1a8d17050b2a8fe2a54ecddf15281..ebde619f922bd961be74533fb45bcd2970c6bdb6 100644
--- a/opam/tezos-baking-alpha.opam
+++ b/opam/octez-protocol-alpha-libs.opam
@@ -10,24 +10,32 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
+  "ppx_expect"
   "octez-libs"
-  "tezos-version"
   "tezos-protocol-alpha"
-  "tezos-protocol-plugin-alpha"
-  "octez-proto-libs"
+  "tezos-embedded-protocol-alpha"
   "octez-shell-libs"
-  "tezos-client-alpha"
+  "uri" { >= "3.1.0" }
+  "qcheck-alcotest" { >= "0.20" }
+  "octez-proto-libs"
+  "tezos-version"
   "tezos-dal-node-services"
   "lwt-canceler" { >= "0.3" & < "0.4" }
   "lwt-exit"
-  "uri" { >= "3.1.0" }
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
+  "octez-protocol-compiler"
+  "tezos-dal-node-lib"
+  "tezos-dac-lib"
+  "tezos-dac-client-lib"
+  "octez-injector"
+  "octez-l2-libs"
   "tezt" { with-test & >= "3.1.1" }
   "octez-alcotezt" {with-test}
+  "tezos-dac-node-lib" {with-test}
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-synopsis: "Tezos/Protocol: base library for `tezos-baker/accuser`"
+synopsis: "Octez protocol alpha libraries"
diff --git a/opam/octez-proxy-server.opam b/opam/octez-proxy-server.opam
index 5116c74ae26f70ee414aa5404402d0875d7b2139..692d08e8e0694ea42ed5ff14f46405d54122b134 100644
--- a/opam/octez-proxy-server.opam
+++ b/opam/octez-proxy-server.opam
@@ -22,39 +22,26 @@ depends: [
 depopts: [
   "tezos-client-genesis"
   "tezos-client-demo-counter"
-  "tezos-client-000-Ps9mPmXa"
-  "tezos-client-001-PtCJ7pwo"
-  "tezos-client-002-PsYLVpVv"
-  "tezos-client-003-PsddFKi3"
-  "tezos-client-004-Pt24m4xi"
-  "tezos-client-005-PsBabyM1"
-  "tezos-client-006-PsCARTHA"
-  "tezos-client-007-PsDELPH1"
-  "tezos-protocol-plugin-007-PsDELPH1"
-  "tezos-client-008-PtEdo2Zk"
-  "tezos-protocol-plugin-008-PtEdo2Zk"
-  "tezos-client-009-PsFLoren"
-  "tezos-protocol-plugin-009-PsFLoren"
-  "tezos-client-010-PtGRANAD"
-  "tezos-protocol-plugin-010-PtGRANAD"
-  "tezos-client-011-PtHangz2"
-  "tezos-protocol-plugin-011-PtHangz2"
-  "tezos-client-012-Psithaca"
-  "tezos-protocol-plugin-012-Psithaca"
-  "tezos-client-013-PtJakart"
-  "tezos-protocol-plugin-013-PtJakart"
-  "tezos-client-014-PtKathma"
-  "tezos-protocol-plugin-014-PtKathma"
-  "tezos-client-015-PtLimaPt"
-  "tezos-protocol-plugin-015-PtLimaPt"
-  "tezos-client-016-PtMumbai"
-  "tezos-protocol-plugin-016-PtMumbai"
-  "tezos-client-017-PtNairob"
-  "tezos-protocol-plugin-017-PtNairob"
-  "tezos-client-018-Proxford"
-  "tezos-protocol-plugin-018-Proxford"
-  "tezos-client-alpha"
-  "tezos-protocol-plugin-alpha"
+  "octez-protocol-000-Ps9mPmXa-libs"
+  "octez-protocol-001-PtCJ7pwo-libs"
+  "octez-protocol-002-PsYLVpVv-libs"
+  "octez-protocol-003-PsddFKi3-libs"
+  "octez-protocol-004-Pt24m4xi-libs"
+  "octez-protocol-005-PsBabyM1-libs"
+  "octez-protocol-006-PsCARTHA-libs"
+  "octez-protocol-007-PsDELPH1-libs"
+  "octez-protocol-008-PtEdo2Zk-libs"
+  "octez-protocol-009-PsFLoren-libs"
+  "octez-protocol-010-PtGRANAD-libs"
+  "octez-protocol-011-PtHangz2-libs"
+  "octez-protocol-012-Psithaca-libs"
+  "octez-protocol-013-PtJakart-libs"
+  "octez-protocol-014-PtKathma-libs"
+  "octez-protocol-015-PtLimaPt-libs"
+  "octez-protocol-016-PtMumbai-libs"
+  "octez-protocol-017-PtNairob-libs"
+  "octez-protocol-018-Proxford-libs"
+  "octez-protocol-alpha-libs"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-smart-rollup-client-Proxford.opam b/opam/octez-smart-rollup-client-Proxford.opam
index 75a82d02d66ca1ef8b0cf69de6c9790bfb0e3ffb..097722ba7bc864677c79b4befb5a30cbbb624936 100644
--- a/opam/octez-smart-rollup-client-Proxford.opam
+++ b/opam/octez-smart-rollup-client-Proxford.opam
@@ -13,10 +13,8 @@ depends: [
   "octez-libs"
   "tezos-protocol-018-Proxford"
   "octez-shell-libs"
-  "tezos-client-018-Proxford"
+  "octez-protocol-018-Proxford-libs"
   "octez-l2-libs"
-  "tezos-smart-rollup-018-Proxford"
-  "tezos-smart-rollup-layer2-018-Proxford"
   "tezos-version"
 ]
 build: [
diff --git a/opam/octez-smart-rollup-client-PtNairob.opam b/opam/octez-smart-rollup-client-PtNairob.opam
index 663882fbfca2d9933948eb409ac031c9dc0a9d29..c113de173d7ae7b02e802865c09f1b93c6a40a76 100644
--- a/opam/octez-smart-rollup-client-PtNairob.opam
+++ b/opam/octez-smart-rollup-client-PtNairob.opam
@@ -13,10 +13,8 @@ depends: [
   "octez-libs"
   "tezos-protocol-017-PtNairob"
   "octez-shell-libs"
-  "tezos-client-017-PtNairob"
+  "octez-protocol-017-PtNairob-libs"
   "octez-l2-libs"
-  "tezos-smart-rollup-017-PtNairob"
-  "tezos-smart-rollup-layer2-017-PtNairob"
   "tezos-version"
 ]
 build: [
diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam
index 2435ef1a0809fd7f54b19338cf9ccc4b5bc051b1..9ec520f246ea88e481b3dd1bd47abfe20489f677 100644
--- a/opam/octez-smart-rollup-client-alpha.opam
+++ b/opam/octez-smart-rollup-client-alpha.opam
@@ -13,10 +13,8 @@ depends: [
   "octez-libs"
   "tezos-protocol-alpha"
   "octez-shell-libs"
-  "tezos-client-alpha"
+  "octez-protocol-alpha-libs"
   "octez-l2-libs"
-  "tezos-smart-rollup-alpha"
-  "tezos-smart-rollup-layer2-alpha"
   "tezos-version"
 ]
 build: [
diff --git a/opam/octez-smart-rollup-node-Proxford.opam b/opam/octez-smart-rollup-node-Proxford.opam
index 788e9d17bc85a1f221f812c376c06c037add59f2..1f59b4b64d37845455bc76ca8ea1b990e84d0b62 100644
--- a/opam/octez-smart-rollup-node-Proxford.opam
+++ b/opam/octez-smart-rollup-node-Proxford.opam
@@ -12,18 +12,13 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "octez-shell-libs"
-  "tezos-client-018-Proxford"
+  "octez-protocol-018-Proxford-libs"
   "tezos-protocol-018-Proxford"
-  "tezos-protocol-plugin-018-Proxford"
   "tezos-dal-node-services"
   "tezos-dal-node-lib"
-  "tezos-dac-018-Proxford"
   "tezos-dac-lib"
   "tezos-dac-client-lib"
   "octez-l2-libs"
-  "tezos-smart-rollup-018-Proxford"
-  "tezos-smart-rollup-layer2-018-Proxford"
-  "tezos-layer2-utils-018-Proxford"
   "octez-crawler"
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
   "irmin-pack" { >= "3.7.2" & < "3.8.0" }
diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam
index 001808105177df948fcdfe02f17b3b7689ec31d3..0f4c469f8deb60aceba3bd4411a84bf22eb3a4ec 100644
--- a/opam/octez-smart-rollup-node-PtNairob.opam
+++ b/opam/octez-smart-rollup-node-PtNairob.opam
@@ -12,16 +12,12 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "octez-shell-libs"
-  "tezos-client-017-PtNairob"
+  "octez-protocol-017-PtNairob-libs"
   "tezos-protocol-017-PtNairob"
-  "tezos-protocol-plugin-017-PtNairob"
   "tezos-dal-node-services"
   "tezos-dal-node-lib"
   "tezos-dac-lib"
   "octez-l2-libs"
-  "tezos-smart-rollup-017-PtNairob"
-  "tezos-smart-rollup-layer2-017-PtNairob"
-  "tezos-layer2-utils-017-PtNairob"
   "octez-crawler"
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
   "irmin-pack" { >= "3.7.2" & < "3.8.0" }
diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam
index 5ed5a52907fd394b034f4ef116ee02d2d3b7bf80..00026c8fc0ab0431af404fcf8eab0fcb0f3132f5 100644
--- a/opam/octez-smart-rollup-node-alpha.opam
+++ b/opam/octez-smart-rollup-node-alpha.opam
@@ -12,18 +12,13 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "octez-shell-libs"
-  "tezos-client-alpha"
+  "octez-protocol-alpha-libs"
   "tezos-protocol-alpha"
-  "tezos-protocol-plugin-alpha"
   "tezos-dal-node-services"
   "tezos-dal-node-lib"
-  "tezos-dac-alpha"
   "tezos-dac-lib"
   "tezos-dac-client-lib"
   "octez-l2-libs"
-  "tezos-smart-rollup-alpha"
-  "tezos-smart-rollup-layer2-alpha"
-  "tezos-layer2-utils-alpha"
   "octez-crawler"
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
   "irmin-pack" { >= "3.7.2" & < "3.8.0" }
diff --git a/opam/octez-smart-rollup-sequencer-node.opam b/opam/octez-smart-rollup-sequencer-node.opam
index 3c5ca005d43ac9134d1e7ff1c7c938b9aa2b38a2..71df4660bf3b6de865ee2b249603254ce42ae86b 100644
--- a/opam/octez-smart-rollup-sequencer-node.opam
+++ b/opam/octez-smart-rollup-sequencer-node.opam
@@ -13,7 +13,7 @@ depends: [
   "octez-libs"
   "octez-shell-libs"
   "octez-smart-rollup-node-lib"
-  "tezos-client-alpha"
+  "octez-protocol-alpha-libs"
   "octez-smart-rollup-node-alpha"
   "octez-smart-rollup-sequencer"
 ]
diff --git a/opam/octez-smart-rollup-sequencer.opam b/opam/octez-smart-rollup-sequencer.opam
index e1cf25e2623f5d72a9a88eaaf694d1d497413385..f40085b5c83fa718e4d7f206caaac988b4571047 100644
--- a/opam/octez-smart-rollup-sequencer.opam
+++ b/opam/octez-smart-rollup-sequencer.opam
@@ -11,7 +11,7 @@ depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
   "octez-libs"
-  "tezos-smart-rollup-layer2-alpha"
+  "octez-protocol-alpha-libs"
   "tezos-protocol-alpha"
   "octez-smart-rollup-node-alpha"
   "octez-smart-rollup-node-lib"
diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam
index 3dce96c0f7da5a64ec0beb978837945de2353f43..d6f50a8b9a46a037995e9be626b910143b7661f1 100644
--- a/opam/octez-smart-rollup-wasm-debugger.opam
+++ b/opam/octez-smart-rollup-wasm-debugger.opam
@@ -12,7 +12,7 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "yaml" { >= "3.1.0" }
-  "tezos-client-alpha"
+  "octez-protocol-alpha-libs"
   "octez-l2-libs"
   "tezos-version"
 ]
diff --git a/opam/octez-store-tests.opam b/opam/octez-store-tests.opam
index 20a9588fa5e5024927a57fb029a16cbff87ba00f..e287c4baf146f58d364a45295bece7a70de2417e 100644
--- a/opam/octez-store-tests.opam
+++ b/opam/octez-store-tests.opam
@@ -17,7 +17,7 @@ depends: [
   "tezos-embedded-protocol-genesis" {with-test}
   "tezos-embedded-protocol-alpha" {with-test}
   "tezos-protocol-alpha" {with-test}
-  "tezos-protocol-plugin-alpha" {with-test}
+  "octez-protocol-alpha-libs" {with-test}
   "octez-alcotezt" {with-test}
 ]
 build: [
diff --git a/opam/tezos-017-PtNairob-test-helpers.opam b/opam/tezos-017-PtNairob-test-helpers.opam
deleted file mode 100644
index fbdfd3046e346cf8c94406d32fc4bf240308a0bc..0000000000000000000000000000000000000000
--- a/opam/tezos-017-PtNairob-test-helpers.opam
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "qcheck-alcotest" { >= "0.20" }
-  "octez-libs"
-  "tezos-protocol-017-PtNairob"
-  "tezos-client-017-PtNairob"
-  "octez-proto-libs"
-  "tezos-protocol-plugin-017-PtNairob"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol testing framework"
diff --git a/opam/tezos-018-Proxford-test-helpers.opam b/opam/tezos-018-Proxford-test-helpers.opam
deleted file mode 100644
index f5cef06ca8a0026c44d866a54e0340169640617b..0000000000000000000000000000000000000000
--- a/opam/tezos-018-Proxford-test-helpers.opam
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "qcheck-alcotest" { >= "0.20" }
-  "octez-libs"
-  "tezos-protocol-018-Proxford"
-  "tezos-client-018-Proxford"
-  "octez-proto-libs"
-  "tezos-protocol-plugin-018-Proxford"
-  "octez-shell-libs"
-  "tezos-smart-rollup-018-Proxford"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol testing framework"
diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam
deleted file mode 100644
index 2b020742d02c9a9e7d7c2127b7610690e0a0a9db..0000000000000000000000000000000000000000
--- a/opam/tezos-alpha-test-helpers.opam
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "qcheck-alcotest" { >= "0.20" }
-  "octez-libs"
-  "tezos-protocol-alpha"
-  "tezos-client-alpha"
-  "octez-proto-libs"
-  "tezos-protocol-plugin-alpha"
-  "octez-shell-libs"
-  "tezos-smart-rollup-alpha"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol testing framework"
diff --git a/opam/tezos-baking-017-PtNairob-commands.opam b/opam/tezos-baking-017-PtNairob-commands.opam
deleted file mode 100644
index e342ad58e5078587aaa57d8ddb76ec105113af9b..0000000000000000000000000000000000000000
--- a/opam/tezos-baking-017-PtNairob-commands.opam
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-017-PtNairob"
-  "octez-proto-libs"
-  "octez-shell-libs"
-  "tezos-client-017-PtNairob"
-  "tezos-baking-017-PtNairob"
-  "uri" { >= "3.1.0" }
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol-specific commands for baking"
diff --git a/opam/tezos-baking-018-Proxford-commands.opam b/opam/tezos-baking-018-Proxford-commands.opam
deleted file mode 100644
index dee22181e02b13b6b2def4eebc015078a58c7860..0000000000000000000000000000000000000000
--- a/opam/tezos-baking-018-Proxford-commands.opam
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-018-Proxford"
-  "octez-proto-libs"
-  "octez-shell-libs"
-  "tezos-client-018-Proxford"
-  "tezos-baking-018-Proxford"
-  "uri" { >= "3.1.0" }
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol-specific commands for baking"
diff --git a/opam/tezos-baking-alpha-commands.opam b/opam/tezos-baking-alpha-commands.opam
deleted file mode 100644
index 5d068aa1b8aff988fb01540a7b2a0a4def7f8bf6..0000000000000000000000000000000000000000
--- a/opam/tezos-baking-alpha-commands.opam
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-alpha"
-  "octez-proto-libs"
-  "octez-shell-libs"
-  "tezos-client-alpha"
-  "tezos-baking-alpha"
-  "uri" { >= "3.1.0" }
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol-specific commands for baking"
diff --git a/opam/tezos-benchmark-017-PtNairob.opam b/opam/tezos-benchmark-017-PtNairob.opam
index 9b6c6d07e40967d295647f163a8d89535afc432b..5ede3bd3d067d37e2b079113302909d5bd32d1a1 100644
--- a/opam/tezos-benchmark-017-PtNairob.opam
+++ b/opam/tezos-benchmark-017-PtNairob.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-benchmark-type-inference-017-PtNairob"
   "tezos-protocol-017-PtNairob"
   "hashcons"
-  "tezos-017-PtNairob-test-helpers"
+  "octez-protocol-017-PtNairob-libs"
   "prbnmcn-stats" { = "0.0.6" }
 ]
 build: [
diff --git a/opam/tezos-benchmark-018-Proxford.opam b/opam/tezos-benchmark-018-Proxford.opam
index d055b0af0084929043548f74fc597645e6ac6506..cdb976f2c6b3ace4881da3a0b5d9dbf0216093e7 100644
--- a/opam/tezos-benchmark-018-Proxford.opam
+++ b/opam/tezos-benchmark-018-Proxford.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-benchmark-type-inference-018-Proxford"
   "tezos-protocol-018-Proxford"
   "hashcons"
-  "tezos-018-Proxford-test-helpers"
+  "octez-protocol-018-Proxford-libs"
   "prbnmcn-stats" { = "0.0.6" }
 ]
 build: [
diff --git a/opam/tezos-benchmark-alpha.opam b/opam/tezos-benchmark-alpha.opam
index e8036dac73d7213d7240005bfccc698167e0dfa5..2d78450a18bacb27ad39b6f41d52d8570e98a3a2 100644
--- a/opam/tezos-benchmark-alpha.opam
+++ b/opam/tezos-benchmark-alpha.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-benchmark-type-inference-alpha"
   "tezos-protocol-alpha"
   "hashcons"
-  "tezos-alpha-test-helpers"
+  "octez-protocol-alpha-libs"
   "prbnmcn-stats" { = "0.0.6" }
 ]
 build: [
diff --git a/opam/tezos-benchmark-type-inference-017-PtNairob.opam b/opam/tezos-benchmark-type-inference-017-PtNairob.opam
index c84e130714736cc0f0b96229c2a7bffe6d776eeb..f762d2d10af3eaa4fd858837a132610b208b4518 100644
--- a/opam/tezos-benchmark-type-inference-017-PtNairob.opam
+++ b/opam/tezos-benchmark-type-inference-017-PtNairob.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-micheline-rewriting"
   "tezos-protocol-017-PtNairob"
   "hashcons"
-  "tezos-client-017-PtNairob" {with-test}
+  "octez-protocol-017-PtNairob-libs" {with-test}
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/tezos-benchmark-type-inference-018-Proxford.opam b/opam/tezos-benchmark-type-inference-018-Proxford.opam
index 52328d8c099cb1286631e988f06714974148a0b3..00e43544ec163242abf22f297bc3fa55fde1bff7 100644
--- a/opam/tezos-benchmark-type-inference-018-Proxford.opam
+++ b/opam/tezos-benchmark-type-inference-018-Proxford.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-micheline-rewriting"
   "tezos-protocol-018-Proxford"
   "hashcons"
-  "tezos-client-018-Proxford" {with-test}
+  "octez-protocol-018-Proxford-libs" {with-test}
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/tezos-benchmark-type-inference-alpha.opam b/opam/tezos-benchmark-type-inference-alpha.opam
index cba77bf94c2809131f5bb2b65453d81bee58b4fb..d474339068dee6bf34205646b775a5cd821e753b 100644
--- a/opam/tezos-benchmark-type-inference-alpha.opam
+++ b/opam/tezos-benchmark-type-inference-alpha.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-micheline-rewriting"
   "tezos-protocol-alpha"
   "hashcons"
-  "tezos-client-alpha" {with-test}
+  "octez-protocol-alpha-libs" {with-test}
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/tezos-benchmarks-proto-017-PtNairob.opam b/opam/tezos-benchmarks-proto-017-PtNairob.opam
index 8d4b8cd1c08b84ff8b081b61ffee63f6fab3eefe..7088219981768dc2b4ae4a7c0cc90272b30f24d3 100644
--- a/opam/tezos-benchmarks-proto-017-PtNairob.opam
+++ b/opam/tezos-benchmarks-proto-017-PtNairob.opam
@@ -16,9 +16,7 @@ depends: [
   "tezos-benchmark-017-PtNairob"
   "tezos-benchmark-type-inference-017-PtNairob"
   "octez-shell-libs"
-  "tezos-017-PtNairob-test-helpers"
-  "tezos-client-017-PtNairob"
-  "tezos-protocol-plugin-017-PtNairob"
+  "octez-protocol-017-PtNairob-libs"
   "octez-proto-libs"
 ]
 build: [
diff --git a/opam/tezos-benchmarks-proto-018-Proxford.opam b/opam/tezos-benchmarks-proto-018-Proxford.opam
index 61c10ab40b5880ee013b2d5535976e9b949e8bc3..fdcc3845ccfa31204284633cd676bfe6bff02295 100644
--- a/opam/tezos-benchmarks-proto-018-Proxford.opam
+++ b/opam/tezos-benchmarks-proto-018-Proxford.opam
@@ -16,9 +16,7 @@ depends: [
   "tezos-benchmark-018-Proxford"
   "tezos-benchmark-type-inference-018-Proxford"
   "octez-shell-libs"
-  "tezos-018-Proxford-test-helpers"
-  "tezos-client-018-Proxford"
-  "tezos-protocol-plugin-018-Proxford"
+  "octez-protocol-018-Proxford-libs"
   "octez-proto-libs"
 ]
 build: [
diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam
index d76e5d4a095d43398d33b14e4bb39fadfaab8a91..884bcda89b6195e0219d9d06b548524275fbf5be 100644
--- a/opam/tezos-benchmarks-proto-alpha.opam
+++ b/opam/tezos-benchmarks-proto-alpha.opam
@@ -16,9 +16,7 @@ depends: [
   "tezos-benchmark-alpha"
   "tezos-benchmark-type-inference-alpha"
   "octez-shell-libs"
-  "tezos-alpha-test-helpers"
-  "tezos-client-alpha"
-  "tezos-protocol-plugin-alpha"
+  "octez-protocol-alpha-libs"
   "octez-proto-libs"
 ]
 build: [
diff --git a/opam/tezos-client-017-PtNairob.opam b/opam/tezos-client-017-PtNairob.opam
deleted file mode 100644
index a35c459577dcdd82eb6942db750cb7f6af3689a1..0000000000000000000000000000000000000000
--- a/opam/tezos-client-017-PtNairob.opam
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "octez-shell-libs"
-  "tezos-protocol-017-PtNairob"
-  "tezos-protocol-plugin-017-PtNairob"
-  "tezos-smart-rollup-017-PtNairob"
-  "uri" { >= "3.1.0" }
-  "octez-proto-libs"
-  "tezt" { with-test & >= "3.1.1" }
-  "octez-alcotezt" {with-test}
-  "qcheck-alcotest" { with-test & >= "0.20" }
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
diff --git a/opam/tezos-client-018-Proxford.opam b/opam/tezos-client-018-Proxford.opam
deleted file mode 100644
index 7e68da963275501ad17229f1af52fe4a4908165c..0000000000000000000000000000000000000000
--- a/opam/tezos-client-018-Proxford.opam
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "octez-shell-libs"
-  "tezos-protocol-018-Proxford"
-  "tezos-protocol-plugin-018-Proxford"
-  "tezos-smart-rollup-018-Proxford"
-  "uri" { >= "3.1.0" }
-  "octez-proto-libs"
-  "tezt" { with-test & >= "3.1.1" }
-  "octez-alcotezt" {with-test}
-  "qcheck-alcotest" { with-test & >= "0.20" }
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam
deleted file mode 100644
index 48991ce7e6aa74302fbb84ffef17367aa8df1e9d..0000000000000000000000000000000000000000
--- a/opam/tezos-client-alpha.opam
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "octez-shell-libs"
-  "tezos-protocol-alpha"
-  "tezos-protocol-plugin-alpha"
-  "tezos-smart-rollup-alpha"
-  "uri" { >= "3.1.0" }
-  "octez-proto-libs"
-  "tezt" { with-test & >= "3.1.1" }
-  "octez-alcotezt" {with-test}
-  "qcheck-alcotest" { with-test & >= "0.20" }
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-client`"
diff --git a/opam/tezos-dac-017-PtNairob.opam b/opam/tezos-dac-017-PtNairob.opam
deleted file mode 100644
index 381409b54a7e2c7aebda83e13ab0733052f2c908..0000000000000000000000000000000000000000
--- a/opam/tezos-dac-017-PtNairob.opam
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "octez-protocol-compiler"
-  "tezos-dac-lib"
-  "tezos-dac-client-lib"
-  "tezos-client-017-PtNairob"
-  "tezos-embedded-protocol-017-PtNairob"
-  "tezos-protocol-017-PtNairob"
-  "tezt" { with-test & >= "3.1.1" }
-  "tezos-017-PtNairob-test-helpers" {with-test}
-  "tezos-dac-node-lib" {with-test}
-  "octez-alcotezt" {with-test}
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for the Data availability Committee"
diff --git a/opam/tezos-dac-018-Proxford.opam b/opam/tezos-dac-018-Proxford.opam
deleted file mode 100644
index ac1dcb89c77eb764dd1087eeab51e0d532706b9e..0000000000000000000000000000000000000000
--- a/opam/tezos-dac-018-Proxford.opam
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "octez-protocol-compiler"
-  "tezos-dac-lib"
-  "tezos-dac-client-lib"
-  "tezos-client-018-Proxford"
-  "tezos-embedded-protocol-018-Proxford"
-  "tezos-protocol-018-Proxford"
-  "tezt" { with-test & >= "3.1.1" }
-  "tezos-018-Proxford-test-helpers" {with-test}
-  "tezos-dac-node-lib" {with-test}
-  "octez-alcotezt" {with-test}
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for the Data availability Committee"
diff --git a/opam/tezos-dac-alpha.opam b/opam/tezos-dac-alpha.opam
deleted file mode 100644
index 0484150bc5f2ab777b528724fc0cd241fac4a634..0000000000000000000000000000000000000000
--- a/opam/tezos-dac-alpha.opam
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "octez-protocol-compiler"
-  "tezos-dac-lib"
-  "tezos-dac-client-lib"
-  "tezos-client-alpha"
-  "tezos-embedded-protocol-alpha"
-  "tezos-protocol-alpha"
-  "tezt" { with-test & >= "3.1.1" }
-  "tezos-alpha-test-helpers" {with-test}
-  "tezos-dac-node-lib" {with-test}
-  "octez-alcotezt" {with-test}
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for the Data availability Committee"
diff --git a/opam/tezos-dal-017-PtNairob.opam b/opam/tezos-dal-017-PtNairob.opam
deleted file mode 100644
index bbde245b9641e2212e2835542034e2626174b362..0000000000000000000000000000000000000000
--- a/opam/tezos-dal-017-PtNairob.opam
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "octez-protocol-compiler"
-  "tezos-dal-node-lib"
-  "tezos-client-017-PtNairob"
-  "tezos-protocol-plugin-017-PtNairob"
-  "tezos-embedded-protocol-017-PtNairob"
-  "tezos-layer2-utils-017-PtNairob"
-  "tezos-protocol-017-PtNairob"
-  "tezt" { with-test & >= "3.1.1" }
-  "tezos-017-PtNairob-test-helpers" {with-test}
-  "octez-alcotezt" {with-test}
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for the Data availability Layer"
diff --git a/opam/tezos-dal-018-Proxford.opam b/opam/tezos-dal-018-Proxford.opam
deleted file mode 100644
index 2ce0b3c7601db7c4b8884cebd869b8eb4e744d5c..0000000000000000000000000000000000000000
--- a/opam/tezos-dal-018-Proxford.opam
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "octez-protocol-compiler"
-  "tezos-dal-node-lib"
-  "tezos-client-018-Proxford"
-  "tezos-protocol-plugin-018-Proxford"
-  "tezos-embedded-protocol-018-Proxford"
-  "tezos-layer2-utils-018-Proxford"
-  "tezos-protocol-018-Proxford"
-  "tezt" { with-test & >= "3.1.1" }
-  "tezos-018-Proxford-test-helpers" {with-test}
-  "octez-alcotezt" {with-test}
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for the Data availability Layer"
diff --git a/opam/tezos-dal-alpha.opam b/opam/tezos-dal-alpha.opam
deleted file mode 100644
index d4aa76138fd19fa69395b3204d69b35fe0083ea7..0000000000000000000000000000000000000000
--- a/opam/tezos-dal-alpha.opam
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "octez-protocol-compiler"
-  "tezos-dal-node-lib"
-  "tezos-client-alpha"
-  "tezos-protocol-plugin-alpha"
-  "tezos-embedded-protocol-alpha"
-  "tezos-layer2-utils-alpha"
-  "tezos-protocol-alpha"
-  "tezt" { with-test & >= "3.1.1" }
-  "tezos-alpha-test-helpers" {with-test}
-  "octez-alcotezt" {with-test}
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for the Data availability Layer"
diff --git a/opam/tezos-layer2-utils-016-PtMumbai.opam b/opam/tezos-layer2-utils-016-PtMumbai.opam
deleted file mode 100644
index 79d0374927b9d0f4c7200c88c37bef5548149022..0000000000000000000000000000000000000000
--- a/opam/tezos-layer2-utils-016-PtMumbai.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-016-PtMumbai"
-  "tezos-client-016-PtMumbai"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for Layer 2 utils"
diff --git a/opam/tezos-layer2-utils-017-PtNairob.opam b/opam/tezos-layer2-utils-017-PtNairob.opam
deleted file mode 100644
index ea0aa9697e960e6f4e210e09d0aa086e0bc84f52..0000000000000000000000000000000000000000
--- a/opam/tezos-layer2-utils-017-PtNairob.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-017-PtNairob"
-  "tezos-client-017-PtNairob"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for Layer 2 utils"
diff --git a/opam/tezos-layer2-utils-018-Proxford.opam b/opam/tezos-layer2-utils-018-Proxford.opam
deleted file mode 100644
index c62068d9e93fce08437f943dc0ff997ab1c755c4..0000000000000000000000000000000000000000
--- a/opam/tezos-layer2-utils-018-Proxford.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-018-Proxford"
-  "tezos-client-018-Proxford"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for Layer 2 utils"
diff --git a/opam/tezos-layer2-utils-alpha.opam b/opam/tezos-layer2-utils-alpha.opam
deleted file mode 100644
index 8045e0687a881873a76ddbe0ec9c88e18c288c70..0000000000000000000000000000000000000000
--- a/opam/tezos-layer2-utils-alpha.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-alpha"
-  "tezos-client-alpha"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for Layer 2 utils"
diff --git a/opam/tezos-micheline-rewriting.opam b/opam/tezos-micheline-rewriting.opam
index 659ad55a125385cd63a198741b4e97edd6a06b5f..e02f39e1db53a296a1420df71588fd5c1b89c336 100644
--- a/opam/tezos-micheline-rewriting.opam
+++ b/opam/tezos-micheline-rewriting.opam
@@ -15,7 +15,7 @@ depends: [
   "octez-libs"
   "tezt" { with-test & >= "3.1.1" }
   "tezos-protocol-alpha" {with-test}
-  "tezos-client-alpha" {with-test}
+  "octez-protocol-alpha-libs" {with-test}
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam
index ca7c8e15ac7c868adffeceb3aed9a4964fb35d4f..6f350ae75855989a38a643ec8a8366d24102c396 100644
--- a/opam/tezos-protocol-017-PtNairob-tests.opam
+++ b/opam/tezos-protocol-017-PtNairob-tests.opam
@@ -13,15 +13,12 @@ depends: [
   "tezt" { with-test & >= "3.1.1" }
   "octez-libs" {with-test}
   "octez-alcotezt" {with-test}
-  "tezos-client-017-PtNairob" {with-test}
+  "octez-protocol-017-PtNairob-libs" {with-test}
   "tezos-protocol-017-PtNairob" {with-test}
-  "tezos-017-PtNairob-test-helpers" {with-test}
-  "tezos-protocol-plugin-017-PtNairob" {with-test}
   "tezos-benchmark" {with-test}
   "tezos-benchmark-017-PtNairob" {with-test}
   "tezos-benchmark-type-inference-017-PtNairob" {with-test}
   "qcheck-alcotest" { with-test & >= "0.20" }
-  "tezos-smart-rollup-017-PtNairob" {with-test}
   "tezt-tezos" {with-test}
   "octez-shell-libs" {with-test}
   "octez-proto-libs" {with-test}
diff --git a/opam/tezos-protocol-018-Proxford-tests.opam b/opam/tezos-protocol-018-Proxford-tests.opam
index 1fdbc55ae1c2408c61941907776fc75fea2df73d..41a078c3542d235498071b317229fa3065559923 100644
--- a/opam/tezos-protocol-018-Proxford-tests.opam
+++ b/opam/tezos-protocol-018-Proxford-tests.opam
@@ -13,15 +13,12 @@ depends: [
   "tezt" { with-test & >= "3.1.1" }
   "octez-libs" {with-test}
   "octez-alcotezt" {with-test}
-  "tezos-client-018-Proxford" {with-test}
+  "octez-protocol-018-Proxford-libs" {with-test}
   "tezos-protocol-018-Proxford" {with-test}
-  "tezos-018-Proxford-test-helpers" {with-test}
-  "tezos-protocol-plugin-018-Proxford" {with-test}
   "tezos-benchmark" {with-test}
   "tezos-benchmark-018-Proxford" {with-test}
   "tezos-benchmark-type-inference-018-Proxford" {with-test}
   "qcheck-alcotest" { with-test & >= "0.20" }
-  "tezos-smart-rollup-018-Proxford" {with-test}
   "tezt-tezos" {with-test}
   "octez-shell-libs" {with-test}
   "octez-proto-libs" {with-test}
diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam
index 5688a1232e4f558939ed311bddd176f362e775a2..16c5502d0bbe7c0ef7e95920f345d0db39dc8481 100644
--- a/opam/tezos-protocol-alpha-tests.opam
+++ b/opam/tezos-protocol-alpha-tests.opam
@@ -13,15 +13,12 @@ depends: [
   "tezt" { with-test & >= "3.1.1" }
   "octez-libs" {with-test}
   "octez-alcotezt" {with-test}
-  "tezos-client-alpha" {with-test}
+  "octez-protocol-alpha-libs" {with-test}
   "tezos-protocol-alpha" {with-test}
-  "tezos-alpha-test-helpers" {with-test}
-  "tezos-protocol-plugin-alpha" {with-test}
   "tezos-benchmark" {with-test}
   "tezos-benchmark-alpha" {with-test}
   "tezos-benchmark-type-inference-alpha" {with-test}
   "qcheck-alcotest" { with-test & >= "0.20" }
-  "tezos-smart-rollup-alpha" {with-test}
   "tezt-tezos" {with-test}
   "octez-shell-libs" {with-test}
   "octez-proto-libs" {with-test}
diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam
deleted file mode 100644
index cf70abe9cc5b08d6446b159af825377644db7cde..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-007-PsDELPH1"
-  "tezos-protocol-plugin-007-PsDELPH1"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1.opam b/opam/tezos-protocol-plugin-007-PsDELPH1.opam
deleted file mode 100644
index a7566f7b6d49f297f178ba603a3602deab88a99d..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-007-PsDELPH1.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-007-PsDELPH1"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam
deleted file mode 100644
index 7affbba96c989426199bd118b4ee87fcc593c7bb..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-008-PtEdo2Zk"
-  "tezos-protocol-plugin-008-PtEdo2Zk"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam
deleted file mode 100644
index c53875ae93d6eb0e41ac6d96076befd6cbcc15c9..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-008-PtEdo2Zk"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam
deleted file mode 100644
index fbd31f6a2d85483b105431aaaa1d8c2860590290..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-009-PsFLoren"
-  "tezos-protocol-plugin-009-PsFLoren"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-009-PsFLoren.opam b/opam/tezos-protocol-plugin-009-PsFLoren.opam
deleted file mode 100644
index a1f73f6a01eb7e7d9910e3e3117f1a2a7e321875..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-009-PsFLoren.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-009-PsFLoren"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam
deleted file mode 100644
index 5926a5e7de767b4a8f3284ac557968ae75c157f1..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-010-PtGRANAD"
-  "tezos-protocol-plugin-010-PtGRANAD"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD.opam b/opam/tezos-protocol-plugin-010-PtGRANAD.opam
deleted file mode 100644
index 0ed34abe179ae84079d3748a953254a4dba56f90..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-010-PtGRANAD.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-010-PtGRANAD"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam
deleted file mode 100644
index 209857bd3c920b226660e7a1e1c872c96d7cd232..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-011-PtHangz2"
-  "tezos-protocol-plugin-011-PtHangz2"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-011-PtHangz2.opam b/opam/tezos-protocol-plugin-011-PtHangz2.opam
deleted file mode 100644
index 795d80df656cb7c5ba05d1b04b5b144aa3eac6fd..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-011-PtHangz2.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-011-PtHangz2"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam
deleted file mode 100644
index 365269db3f3cf75a71bf8008ddd689f69c215f36..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-012-Psithaca"
-  "tezos-protocol-plugin-012-Psithaca"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-012-Psithaca.opam b/opam/tezos-protocol-plugin-012-Psithaca.opam
deleted file mode 100644
index 63da8f48cef64a56e4c964fadc07f5f9c697a282..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-012-Psithaca.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-012-Psithaca"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam
deleted file mode 100644
index 17d7f726826642922f8961f6e28dc4e4f71df056..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-013-PtJakart"
-  "tezos-protocol-plugin-013-PtJakart"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-013-PtJakart.opam b/opam/tezos-protocol-plugin-013-PtJakart.opam
deleted file mode 100644
index decd43ddba157ecec4960072c53306ebfde354e5..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-013-PtJakart.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-013-PtJakart"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam
deleted file mode 100644
index 164d583b89a10ea285e4d5ccb8b8e9d194787a8a..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-014-PtKathma"
-  "tezos-protocol-plugin-014-PtKathma"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-014-PtKathma.opam b/opam/tezos-protocol-plugin-014-PtKathma.opam
deleted file mode 100644
index 9fad8874af2e8f8b3eb87e4470ca0b4c364c5f3a..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-014-PtKathma.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-014-PtKathma"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam
deleted file mode 100644
index d76366e9237d6ccfc0ff363a5da855674b6975e2..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-015-PtLimaPt"
-  "tezos-protocol-plugin-015-PtLimaPt"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt.opam b/opam/tezos-protocol-plugin-015-PtLimaPt.opam
deleted file mode 100644
index 143e248316365f87c5a6ab5753eb99b95821480d..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-015-PtLimaPt.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-015-PtLimaPt"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam
deleted file mode 100644
index ed31fc92d6c147dd6978bd7135bec98f59a3a8c7..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-016-PtMumbai"
-  "tezos-protocol-plugin-016-PtMumbai"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-016-PtMumbai.opam b/opam/tezos-protocol-plugin-016-PtMumbai.opam
deleted file mode 100644
index 73cb3bafc9ea774d517e99443cac58d7548e11da..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-016-PtMumbai.opam
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-016-PtMumbai"
-  "tezos-smart-rollup-016-PtMumbai"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam
deleted file mode 100644
index 3dec8b37c9c57c28aa5ab0e4852b779ce90c935d..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-017-PtNairob"
-  "tezos-protocol-plugin-017-PtNairob"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam
deleted file mode 100644
index cb04281b4de9130a179fff9875a260ad3561af7d..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "tezt" { with-test & >= "3.1.1" }
-  "octez-libs" {with-test}
-  "octez-alcotezt" {with-test}
-  "qcheck-alcotest" { with-test & >= "0.20" }
-  "tezos-protocol-plugin-017-PtNairob" {with-test}
-  "tezos-protocol-017-PtNairob" {with-test}
-  "tezos-017-PtNairob-test-helpers" {with-test}
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin tests"
diff --git a/opam/tezos-protocol-plugin-017-PtNairob.opam b/opam/tezos-protocol-plugin-017-PtNairob.opam
deleted file mode 100644
index 80178807bdf19d143b4866f5efe82eb88cc8cebd..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-017-PtNairob.opam
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-017-PtNairob"
-  "tezos-smart-rollup-017-PtNairob"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-018-Proxford-registerer.opam b/opam/tezos-protocol-plugin-018-Proxford-registerer.opam
deleted file mode 100644
index b94d56784b565b3872ed4a9851a389821f31f9fa..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-018-Proxford-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-018-Proxford"
-  "tezos-protocol-plugin-018-Proxford"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-018-Proxford-tests.opam b/opam/tezos-protocol-plugin-018-Proxford-tests.opam
deleted file mode 100644
index ceb78b7a545fb5eaa7e62db9d9402ebc3b47ec98..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-018-Proxford-tests.opam
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "tezt" { with-test & >= "3.1.1" }
-  "octez-libs" {with-test}
-  "octez-alcotezt" {with-test}
-  "qcheck-alcotest" { with-test & >= "0.20" }
-  "tezos-protocol-plugin-018-Proxford" {with-test}
-  "tezos-protocol-018-Proxford" {with-test}
-  "tezos-018-Proxford-test-helpers" {with-test}
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin tests"
diff --git a/opam/tezos-protocol-plugin-018-Proxford.opam b/opam/tezos-protocol-plugin-018-Proxford.opam
deleted file mode 100644
index 50a99cff942f8b63047871ac4541c60d062c6084..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-018-Proxford.opam
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-018-Proxford"
-  "tezos-smart-rollup-018-Proxford"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-protocol-plugin-alpha-registerer.opam b/opam/tezos-protocol-plugin-alpha-registerer.opam
deleted file mode 100644
index dcc88e2f5f24d71efa76b4db85f422b7cdb6d08c..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-alpha-registerer.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-embedded-protocol-alpha"
-  "tezos-protocol-plugin-alpha"
-  "octez-shell-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin registerer"
diff --git a/opam/tezos-protocol-plugin-alpha-tests.opam b/opam/tezos-protocol-plugin-alpha-tests.opam
deleted file mode 100644
index cf001dfe3a7f7bac6b60e396ca29e5df8fbbef80..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-alpha-tests.opam
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "tezt" { with-test & >= "3.1.1" }
-  "octez-libs" {with-test}
-  "octez-alcotezt" {with-test}
-  "qcheck-alcotest" { with-test & >= "0.20" }
-  "tezos-protocol-plugin-alpha" {with-test}
-  "tezos-protocol-alpha" {with-test}
-  "tezos-alpha-test-helpers" {with-test}
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin tests"
diff --git a/opam/tezos-protocol-plugin-alpha.opam b/opam/tezos-protocol-plugin-alpha.opam
deleted file mode 100644
index aad417a33a279a73a0d52e9bba80af059ab21ea3..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-plugin-alpha.opam
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "octez-libs"
-  "tezos-protocol-alpha"
-  "tezos-smart-rollup-alpha"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol plugin"
diff --git a/opam/tezos-sc-rollup-node-test.opam b/opam/tezos-sc-rollup-node-test.opam
index 50008caa82ce0493d6e8158845c3a08573ea6acb..348a4e591794d593303a5265bc3c281293de53ee 100644
--- a/opam/tezos-sc-rollup-node-test.opam
+++ b/opam/tezos-sc-rollup-node-test.opam
@@ -12,20 +12,17 @@ depends: [
   "ocaml" { >= "4.14" }
   "octez-libs"
   "tezos-protocol-017-PtNairob"
-  "tezos-client-017-PtNairob"
+  "octez-protocol-017-PtNairob-libs"
   "qcheck-alcotest" { >= "0.20" }
   "qcheck-core"
   "logs"
-  "tezos-smart-rollup-layer2-017-PtNairob"
   "octez-smart-rollup-node-PtNairob"
   "octez-alcotezt"
   "tezos-protocol-018-Proxford"
-  "tezos-client-018-Proxford"
-  "tezos-smart-rollup-layer2-018-Proxford"
+  "octez-protocol-018-Proxford-libs"
   "octez-smart-rollup-node-Proxford"
   "tezos-protocol-alpha"
-  "tezos-client-alpha"
-  "tezos-smart-rollup-layer2-alpha"
+  "octez-protocol-alpha-libs"
   "octez-smart-rollup-node-alpha"
   "tezt" { with-test & >= "3.1.1" }
 ]
diff --git a/opam/tezos-scoru-wasm-regressions.opam b/opam/tezos-scoru-wasm-regressions.opam
index 8cec8eed635d8a4c527ebfd5ce30febe9aeb11c1..68261f683b4ca747f373f53d8f4462f921100c5f 100644
--- a/opam/tezos-scoru-wasm-regressions.opam
+++ b/opam/tezos-scoru-wasm-regressions.opam
@@ -15,7 +15,7 @@ depends: [
   "octez-libs"
   "octez-l2-libs"
   "tezos-protocol-alpha"
-  "tezos-smart-rollup-alpha"
+  "octez-protocol-alpha-libs"
   "tezt" { >= "3.1.1" }
 ]
 build: [
diff --git a/opam/tezos-smart-rollup-016-PtMumbai.opam b/opam/tezos-smart-rollup-016-PtMumbai.opam
deleted file mode 100644
index 5084c678b598c3f24736c7194c072d5c61c856a7..0000000000000000000000000000000000000000
--- a/opam/tezos-smart-rollup-016-PtMumbai.opam
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-016-PtMumbai"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library of helpers for `tezos-smart-rollup`"
diff --git a/opam/tezos-smart-rollup-017-PtNairob.opam b/opam/tezos-smart-rollup-017-PtNairob.opam
deleted file mode 100644
index f9a6963b45a4f7c41b3c72ea1d8c90b28e3c5f0d..0000000000000000000000000000000000000000
--- a/opam/tezos-smart-rollup-017-PtNairob.opam
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-017-PtNairob"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library of helpers for `tezos-smart-rollup`"
diff --git a/opam/tezos-smart-rollup-018-Proxford.opam b/opam/tezos-smart-rollup-018-Proxford.opam
deleted file mode 100644
index d01badfdf6bbdf364e934840a0285ad11f774747..0000000000000000000000000000000000000000
--- a/opam/tezos-smart-rollup-018-Proxford.opam
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-018-Proxford"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library of helpers for `tezos-smart-rollup`"
diff --git a/opam/tezos-smart-rollup-alpha.opam b/opam/tezos-smart-rollup-alpha.opam
deleted file mode 100644
index 2ecf80d94fafa7c2fe0a141328cdee83e980e2d3..0000000000000000000000000000000000000000
--- a/opam/tezos-smart-rollup-alpha.opam
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-alpha"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library of helpers for `tezos-smart-rollup`"
diff --git a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam
deleted file mode 100644
index 11af261c8103d1da95d43b9402dd5a9db7d77bb3..0000000000000000000000000000000000000000
--- a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-016-PtMumbai"
-  "octez-injector"
-  "octez-l2-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-smart-rollup`"
diff --git a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam
deleted file mode 100644
index 4001b4a7e9c2728d766269f2eee48bd7405a8deb..0000000000000000000000000000000000000000
--- a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-017-PtNairob"
-  "octez-injector"
-  "octez-l2-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-smart-rollup`"
diff --git a/opam/tezos-smart-rollup-layer2-018-Proxford.opam b/opam/tezos-smart-rollup-layer2-018-Proxford.opam
deleted file mode 100644
index a3a2b43bb5e2435ca5d4d1f9ca4b0590e793e02a..0000000000000000000000000000000000000000
--- a/opam/tezos-smart-rollup-layer2-018-Proxford.opam
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-018-Proxford"
-  "octez-injector"
-  "octez-l2-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-smart-rollup`"
diff --git a/opam/tezos-smart-rollup-layer2-alpha.opam b/opam/tezos-smart-rollup-layer2-alpha.opam
deleted file mode 100644
index b213d6ed2c5d817cfc31f4b6f8c47f5b2086815e..0000000000000000000000000000000000000000
--- a/opam/tezos-smart-rollup-layer2-alpha.opam
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "3.0" }
-  "ocaml" { >= "4.14" }
-  "ppx_expect"
-  "octez-libs"
-  "tezos-protocol-alpha"
-  "octez-injector"
-  "octez-l2-libs"
-]
-build: [
-  ["rm" "-r" "vendors" "contrib"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: protocol specific library for `tezos-smart-rollup`"
diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam
index d5e15d43b9b927bde253e6ed47626132c837584e..7ad5ed553078daac54b38548480177101b711ac2 100644
--- a/opam/tezos-tps-evaluation.opam
+++ b/opam/tezos-tps-evaluation.opam
@@ -16,8 +16,7 @@ depends: [
   "caqti-lwt"
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
   "lwt" { >= "5.6.0" }
-  "tezos-baking-alpha"
-  "tezos-client-alpha"
+  "octez-protocol-alpha-libs"
   "octez-shell-libs"
   "tezos-protocol-alpha"
   "tezt" { >= "3.1.1" }
diff --git a/src/bin_client/dune b/src/bin_client/dune
index e48900d144da10dcf234512f617332a1890c3f9d..84a1d52bbcfd2ba4c404dfcc160ae3eadd0ca185 100644
--- a/src/bin_client/dune
+++ b/src/bin_client/dune
@@ -26,102 +26,102 @@
   (select void_for_linking-tezos-client-demo-counter from
    (tezos-client-demo-counter -> void_for_linking-tezos-client-demo-counter.empty)
    (-> void_for_linking-tezos-client-demo-counter.empty))
-  (select void_for_linking-tezos-client-000-Ps9mPmXa from
-   (tezos-client-000-Ps9mPmXa -> void_for_linking-tezos-client-000-Ps9mPmXa.empty)
-   (-> void_for_linking-tezos-client-000-Ps9mPmXa.empty))
-  (select void_for_linking-tezos-client-001-PtCJ7pwo-commands-registration from
-   (tezos-client-001-PtCJ7pwo.commands-registration -> void_for_linking-tezos-client-001-PtCJ7pwo-commands-registration.empty)
-   (-> void_for_linking-tezos-client-001-PtCJ7pwo-commands-registration.empty))
-  (select void_for_linking-tezos-client-002-PsYLVpVv-commands-registration from
-   (tezos-client-002-PsYLVpVv.commands-registration -> void_for_linking-tezos-client-002-PsYLVpVv-commands-registration.empty)
-   (-> void_for_linking-tezos-client-002-PsYLVpVv-commands-registration.empty))
-  (select void_for_linking-tezos-client-003-PsddFKi3-commands-registration from
-   (tezos-client-003-PsddFKi3.commands-registration -> void_for_linking-tezos-client-003-PsddFKi3-commands-registration.empty)
-   (-> void_for_linking-tezos-client-003-PsddFKi3-commands-registration.empty))
-  (select void_for_linking-tezos-client-004-Pt24m4xi-commands-registration from
-   (tezos-client-004-Pt24m4xi.commands-registration -> void_for_linking-tezos-client-004-Pt24m4xi-commands-registration.empty)
-   (-> void_for_linking-tezos-client-004-Pt24m4xi-commands-registration.empty))
-  (select void_for_linking-tezos-client-005-PsBabyM1-commands-registration from
-   (tezos-client-005-PsBabyM1.commands-registration -> void_for_linking-tezos-client-005-PsBabyM1-commands-registration.empty)
-   (-> void_for_linking-tezos-client-005-PsBabyM1-commands-registration.empty))
-  (select void_for_linking-tezos-client-006-PsCARTHA-commands-registration from
-   (tezos-client-006-PsCARTHA.commands-registration -> void_for_linking-tezos-client-006-PsCARTHA-commands-registration.empty)
-   (-> void_for_linking-tezos-client-006-PsCARTHA-commands-registration.empty))
-  (select void_for_linking-tezos-client-007-PsDELPH1-commands-registration from
-   (tezos-client-007-PsDELPH1.commands-registration -> void_for_linking-tezos-client-007-PsDELPH1-commands-registration.empty)
-   (-> void_for_linking-tezos-client-007-PsDELPH1-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-007-PsDELPH1 from
-   (tezos-protocol-plugin-007-PsDELPH1 -> void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty)
-   (-> void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty))
-  (select void_for_linking-tezos-client-008-PtEdo2Zk-commands-registration from
-   (tezos-client-008-PtEdo2Zk.commands-registration -> void_for_linking-tezos-client-008-PtEdo2Zk-commands-registration.empty)
-   (-> void_for_linking-tezos-client-008-PtEdo2Zk-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk from
-   (tezos-protocol-plugin-008-PtEdo2Zk -> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty)
-   (-> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty))
-  (select void_for_linking-tezos-client-009-PsFLoren-commands-registration from
-   (tezos-client-009-PsFLoren.commands-registration -> void_for_linking-tezos-client-009-PsFLoren-commands-registration.empty)
-   (-> void_for_linking-tezos-client-009-PsFLoren-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-009-PsFLoren from
-   (tezos-protocol-plugin-009-PsFLoren -> void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty)
-   (-> void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty))
-  (select void_for_linking-tezos-client-010-PtGRANAD-commands-registration from
-   (tezos-client-010-PtGRANAD.commands-registration -> void_for_linking-tezos-client-010-PtGRANAD-commands-registration.empty)
-   (-> void_for_linking-tezos-client-010-PtGRANAD-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-010-PtGRANAD from
-   (tezos-protocol-plugin-010-PtGRANAD -> void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty)
-   (-> void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty))
-  (select void_for_linking-tezos-client-011-PtHangz2-commands-registration from
-   (tezos-client-011-PtHangz2.commands-registration -> void_for_linking-tezos-client-011-PtHangz2-commands-registration.empty)
-   (-> void_for_linking-tezos-client-011-PtHangz2-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-011-PtHangz2 from
-   (tezos-protocol-plugin-011-PtHangz2 -> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty)
-   (-> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty))
-  (select void_for_linking-tezos-client-012-Psithaca-commands-registration from
-   (tezos-client-012-Psithaca.commands-registration -> void_for_linking-tezos-client-012-Psithaca-commands-registration.empty)
-   (-> void_for_linking-tezos-client-012-Psithaca-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-012-Psithaca from
-   (tezos-protocol-plugin-012-Psithaca -> void_for_linking-tezos-protocol-plugin-012-Psithaca.empty)
-   (-> void_for_linking-tezos-protocol-plugin-012-Psithaca.empty))
-  (select void_for_linking-tezos-client-013-PtJakart-commands-registration from
-   (tezos-client-013-PtJakart.commands-registration -> void_for_linking-tezos-client-013-PtJakart-commands-registration.empty)
-   (-> void_for_linking-tezos-client-013-PtJakart-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-013-PtJakart from
-   (tezos-protocol-plugin-013-PtJakart -> void_for_linking-tezos-protocol-plugin-013-PtJakart.empty)
-   (-> void_for_linking-tezos-protocol-plugin-013-PtJakart.empty))
-  (select void_for_linking-tezos-client-014-PtKathma-commands-registration from
-   (tezos-client-014-PtKathma.commands-registration -> void_for_linking-tezos-client-014-PtKathma-commands-registration.empty)
-   (-> void_for_linking-tezos-client-014-PtKathma-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-014-PtKathma from
-   (tezos-protocol-plugin-014-PtKathma -> void_for_linking-tezos-protocol-plugin-014-PtKathma.empty)
-   (-> void_for_linking-tezos-protocol-plugin-014-PtKathma.empty))
-  (select void_for_linking-tezos-client-015-PtLimaPt-commands-registration from
-   (tezos-client-015-PtLimaPt.commands-registration -> void_for_linking-tezos-client-015-PtLimaPt-commands-registration.empty)
-   (-> void_for_linking-tezos-client-015-PtLimaPt-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-015-PtLimaPt from
-   (tezos-protocol-plugin-015-PtLimaPt -> void_for_linking-tezos-protocol-plugin-015-PtLimaPt.empty)
-   (-> void_for_linking-tezos-protocol-plugin-015-PtLimaPt.empty))
-  (select void_for_linking-tezos-client-016-PtMumbai-commands-registration from
-   (tezos-client-016-PtMumbai.commands-registration -> void_for_linking-tezos-client-016-PtMumbai-commands-registration.empty)
-   (-> void_for_linking-tezos-client-016-PtMumbai-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-016-PtMumbai from
-   (tezos-protocol-plugin-016-PtMumbai -> void_for_linking-tezos-protocol-plugin-016-PtMumbai.empty)
-   (-> void_for_linking-tezos-protocol-plugin-016-PtMumbai.empty))
-  tezos-client-017-PtNairob.commands-registration
-  tezos-baking-017-PtNairob-commands.registration
-  tezos-protocol-plugin-017-PtNairob
-  tezos-client-018-Proxford.commands-registration
-  tezos-baking-018-Proxford-commands.registration
-  tezos-protocol-plugin-018-Proxford
-  (select void_for_linking-tezos-client-alpha-commands-registration from
-   (tezos-client-alpha.commands-registration -> void_for_linking-tezos-client-alpha-commands-registration.empty)
-   (-> void_for_linking-tezos-client-alpha-commands-registration.empty))
-  (select void_for_linking-tezos-baking-alpha-commands-registration from
-   (tezos-baking-alpha-commands.registration -> void_for_linking-tezos-baking-alpha-commands-registration.empty)
-   (-> void_for_linking-tezos-baking-alpha-commands-registration.empty))
-  (select void_for_linking-tezos-protocol-plugin-alpha from
-   (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty)
-   (-> void_for_linking-tezos-protocol-plugin-alpha.empty)))
+  (select void_for_linking-octez-protocol-000-Ps9mPmXa-libs-tezos-client from
+   (octez-protocol-000-Ps9mPmXa-libs.tezos-client -> void_for_linking-octez-protocol-000-Ps9mPmXa-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-000-Ps9mPmXa-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-001-PtCJ7pwo-libs-tezos-client-commands-registration from
+   (octez-protocol-001-PtCJ7pwo-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-001-PtCJ7pwo-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-001-PtCJ7pwo-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-002-PsYLVpVv-libs-tezos-client-commands-registration from
+   (octez-protocol-002-PsYLVpVv-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-002-PsYLVpVv-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-002-PsYLVpVv-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-003-PsddFKi3-libs-tezos-client-commands-registration from
+   (octez-protocol-003-PsddFKi3-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-003-PsddFKi3-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-003-PsddFKi3-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-004-Pt24m4xi-libs-tezos-client-commands-registration from
+   (octez-protocol-004-Pt24m4xi-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-004-Pt24m4xi-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-004-Pt24m4xi-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client-commands-registration from
+   (octez-protocol-005-PsBabyM1-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client-commands-registration from
+   (octez-protocol-006-PsCARTHA-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client-commands-registration from
+   (octez-protocol-007-PsDELPH1-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin from
+   (octez-protocol-007-PsDELPH1-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client-commands-registration from
+   (octez-protocol-008-PtEdo2Zk-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin from
+   (octez-protocol-008-PtEdo2Zk-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client-commands-registration from
+   (octez-protocol-009-PsFLoren-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin from
+   (octez-protocol-009-PsFLoren-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client-commands-registration from
+   (octez-protocol-010-PtGRANAD-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin from
+   (octez-protocol-010-PtGRANAD-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client-commands-registration from
+   (octez-protocol-011-PtHangz2-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin from
+   (octez-protocol-011-PtHangz2-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client-commands-registration from
+   (octez-protocol-012-Psithaca-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin from
+   (octez-protocol-012-Psithaca-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client-commands-registration from
+   (octez-protocol-013-PtJakart-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin from
+   (octez-protocol-013-PtJakart-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client-commands-registration from
+   (octez-protocol-014-PtKathma-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin from
+   (octez-protocol-014-PtKathma-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client-commands-registration from
+   (octez-protocol-015-PtLimaPt-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin from
+   (octez-protocol-015-PtLimaPt-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client-commands-registration from
+   (octez-protocol-016-PtMumbai-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin from
+   (octez-protocol-016-PtMumbai-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin.empty))
+  octez-protocol-017-PtNairob-libs.tezos-client.commands-registration
+  octez-protocol-017-PtNairob-libs.tezos-baking-commands.registration
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
+  octez-protocol-018-Proxford-libs.tezos-client.commands-registration
+  octez-protocol-018-Proxford-libs.tezos-baking-commands.registration
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
+  (select void_for_linking-octez-protocol-alpha-libs-tezos-client-commands-registration from
+   (octez-protocol-alpha-libs.tezos-client.commands-registration -> void_for_linking-octez-protocol-alpha-libs-tezos-client-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-alpha-libs-tezos-client-commands-registration.empty))
+  (select void_for_linking-octez-protocol-alpha-libs-tezos-baking-commands-registration from
+   (octez-protocol-alpha-libs.tezos-baking-commands.registration -> void_for_linking-octez-protocol-alpha-libs-tezos-baking-commands-registration.empty)
+   (-> void_for_linking-octez-protocol-alpha-libs-tezos-baking-commands-registration.empty))
+  (select void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin from
+   (octez-protocol-alpha-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin.empty)))
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
@@ -143,36 +143,36 @@
   (progn
    (write-file void_for_linking-tezos-client-genesis.empty "")
    (write-file void_for_linking-tezos-client-demo-counter.empty "")
-   (write-file void_for_linking-tezos-client-000-Ps9mPmXa.empty "")
-   (write-file void_for_linking-tezos-client-001-PtCJ7pwo-commands-registration.empty "")
-   (write-file void_for_linking-tezos-client-002-PsYLVpVv-commands-registration.empty "")
-   (write-file void_for_linking-tezos-client-003-PsddFKi3-commands-registration.empty "")
-   (write-file void_for_linking-tezos-client-004-Pt24m4xi-commands-registration.empty "")
-   (write-file void_for_linking-tezos-client-005-PsBabyM1-commands-registration.empty "")
-   (write-file void_for_linking-tezos-client-006-PsCARTHA-commands-registration.empty "")
-   (write-file void_for_linking-tezos-client-007-PsDELPH1-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty "")
-   (write-file void_for_linking-tezos-client-008-PtEdo2Zk-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty "")
-   (write-file void_for_linking-tezos-client-009-PsFLoren-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty "")
-   (write-file void_for_linking-tezos-client-010-PtGRANAD-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty "")
-   (write-file void_for_linking-tezos-client-011-PtHangz2-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty "")
-   (write-file void_for_linking-tezos-client-012-Psithaca-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-012-Psithaca.empty "")
-   (write-file void_for_linking-tezos-client-013-PtJakart-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-013-PtJakart.empty "")
-   (write-file void_for_linking-tezos-client-014-PtKathma-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-014-PtKathma.empty "")
-   (write-file void_for_linking-tezos-client-015-PtLimaPt-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-015-PtLimaPt.empty "")
-   (write-file void_for_linking-tezos-client-016-PtMumbai-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-016-PtMumbai.empty "")
-   (write-file void_for_linking-tezos-client-alpha-commands-registration.empty "")
-   (write-file void_for_linking-tezos-baking-alpha-commands-registration.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-alpha.empty ""))))
+   (write-file void_for_linking-octez-protocol-000-Ps9mPmXa-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-001-PtCJ7pwo-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-002-PsYLVpVv-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-003-PsddFKi3-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-004-Pt24m4xi-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-alpha-libs-tezos-client-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-alpha-libs-tezos-baking-commands-registration.empty "")
+   (write-file void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin.empty ""))))
 
 (install
  (package octez-client)
diff --git a/src/bin_codec/dune b/src/bin_codec/dune
index 717be5a55dd41932fe5f591b688a266164d5b30d..876fb3248f539d7031d56959a7705a5233623001 100644
--- a/src/bin_codec/dune
+++ b/src/bin_codec/dune
@@ -17,51 +17,51 @@
   octez-libs.tezos-event-logging
   octez-shell-libs.tezos-signer-services
   tezos-version.value
-  (select void_for_linking-tezos-client-005-PsBabyM1 from
-   (tezos-client-005-PsBabyM1 -> void_for_linking-tezos-client-005-PsBabyM1.empty)
-   (-> void_for_linking-tezos-client-005-PsBabyM1.empty))
-  (select void_for_linking-tezos-client-006-PsCARTHA from
-   (tezos-client-006-PsCARTHA -> void_for_linking-tezos-client-006-PsCARTHA.empty)
-   (-> void_for_linking-tezos-client-006-PsCARTHA.empty))
-  (select void_for_linking-tezos-client-007-PsDELPH1 from
-   (tezos-client-007-PsDELPH1 -> void_for_linking-tezos-client-007-PsDELPH1.empty)
-   (-> void_for_linking-tezos-client-007-PsDELPH1.empty))
-  (select void_for_linking-tezos-client-008-PtEdo2Zk from
-   (tezos-client-008-PtEdo2Zk -> void_for_linking-tezos-client-008-PtEdo2Zk.empty)
-   (-> void_for_linking-tezos-client-008-PtEdo2Zk.empty))
-  (select void_for_linking-tezos-client-009-PsFLoren from
-   (tezos-client-009-PsFLoren -> void_for_linking-tezos-client-009-PsFLoren.empty)
-   (-> void_for_linking-tezos-client-009-PsFLoren.empty))
-  (select void_for_linking-tezos-client-010-PtGRANAD from
-   (tezos-client-010-PtGRANAD -> void_for_linking-tezos-client-010-PtGRANAD.empty)
-   (-> void_for_linking-tezos-client-010-PtGRANAD.empty))
-  (select void_for_linking-tezos-client-011-PtHangz2 from
-   (tezos-client-011-PtHangz2 -> void_for_linking-tezos-client-011-PtHangz2.empty)
-   (-> void_for_linking-tezos-client-011-PtHangz2.empty))
-  (select void_for_linking-tezos-client-012-Psithaca from
-   (tezos-client-012-Psithaca -> void_for_linking-tezos-client-012-Psithaca.empty)
-   (-> void_for_linking-tezos-client-012-Psithaca.empty))
-  (select void_for_linking-tezos-client-013-PtJakart from
-   (tezos-client-013-PtJakart -> void_for_linking-tezos-client-013-PtJakart.empty)
-   (-> void_for_linking-tezos-client-013-PtJakart.empty))
-  (select void_for_linking-tezos-client-014-PtKathma from
-   (tezos-client-014-PtKathma -> void_for_linking-tezos-client-014-PtKathma.empty)
-   (-> void_for_linking-tezos-client-014-PtKathma.empty))
-  (select void_for_linking-tezos-client-015-PtLimaPt from
-   (tezos-client-015-PtLimaPt -> void_for_linking-tezos-client-015-PtLimaPt.empty)
-   (-> void_for_linking-tezos-client-015-PtLimaPt.empty))
-  (select void_for_linking-tezos-client-016-PtMumbai from
-   (tezos-client-016-PtMumbai -> void_for_linking-tezos-client-016-PtMumbai.empty)
-   (-> void_for_linking-tezos-client-016-PtMumbai.empty))
-  (select void_for_linking-tezos-client-017-PtNairob from
-   (tezos-client-017-PtNairob -> void_for_linking-tezos-client-017-PtNairob.empty)
-   (-> void_for_linking-tezos-client-017-PtNairob.empty))
-  (select void_for_linking-tezos-client-018-Proxford from
-   (tezos-client-018-Proxford -> void_for_linking-tezos-client-018-Proxford.empty)
-   (-> void_for_linking-tezos-client-018-Proxford.empty))
-  (select void_for_linking-tezos-client-alpha from
-   (tezos-client-alpha -> void_for_linking-tezos-client-alpha.empty)
-   (-> void_for_linking-tezos-client-alpha.empty)))
+  (select void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client from
+   (octez-protocol-005-PsBabyM1-libs.tezos-client -> void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client from
+   (octez-protocol-006-PsCARTHA-libs.tezos-client -> void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client from
+   (octez-protocol-007-PsDELPH1-libs.tezos-client -> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client from
+   (octez-protocol-008-PtEdo2Zk-libs.tezos-client -> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client from
+   (octez-protocol-009-PsFLoren-libs.tezos-client -> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client from
+   (octez-protocol-010-PtGRANAD-libs.tezos-client -> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client from
+   (octez-protocol-011-PtHangz2-libs.tezos-client -> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client from
+   (octez-protocol-012-Psithaca-libs.tezos-client -> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client from
+   (octez-protocol-013-PtJakart-libs.tezos-client -> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client from
+   (octez-protocol-014-PtKathma-libs.tezos-client -> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client from
+   (octez-protocol-015-PtLimaPt-libs.tezos-client -> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client from
+   (octez-protocol-016-PtMumbai-libs.tezos-client -> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-017-PtNairob-libs-tezos-client from
+   (octez-protocol-017-PtNairob-libs.tezos-client -> void_for_linking-octez-protocol-017-PtNairob-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-017-PtNairob-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-018-Proxford-libs-tezos-client from
+   (octez-protocol-018-Proxford-libs.tezos-client -> void_for_linking-octez-protocol-018-Proxford-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-018-Proxford-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-alpha-libs-tezos-client from
+   (octez-protocol-alpha-libs.tezos-client -> void_for_linking-octez-protocol-alpha-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-alpha-libs-tezos-client.empty)))
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
@@ -79,18 +79,18 @@
 (rule
  (action
   (progn
-   (write-file void_for_linking-tezos-client-005-PsBabyM1.empty "")
-   (write-file void_for_linking-tezos-client-006-PsCARTHA.empty "")
-   (write-file void_for_linking-tezos-client-007-PsDELPH1.empty "")
-   (write-file void_for_linking-tezos-client-008-PtEdo2Zk.empty "")
-   (write-file void_for_linking-tezos-client-009-PsFLoren.empty "")
-   (write-file void_for_linking-tezos-client-010-PtGRANAD.empty "")
-   (write-file void_for_linking-tezos-client-011-PtHangz2.empty "")
-   (write-file void_for_linking-tezos-client-012-Psithaca.empty "")
-   (write-file void_for_linking-tezos-client-013-PtJakart.empty "")
-   (write-file void_for_linking-tezos-client-014-PtKathma.empty "")
-   (write-file void_for_linking-tezos-client-015-PtLimaPt.empty "")
-   (write-file void_for_linking-tezos-client-016-PtMumbai.empty "")
-   (write-file void_for_linking-tezos-client-017-PtNairob.empty "")
-   (write-file void_for_linking-tezos-client-018-Proxford.empty "")
-   (write-file void_for_linking-tezos-client-alpha.empty ""))))
+   (write-file void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-017-PtNairob-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-018-Proxford-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-alpha-libs-tezos-client.empty ""))))
diff --git a/src/bin_dac_client/dune b/src/bin_dac_client/dune
index c639d0ae5a563896eec474c3232900e6063aac17..0fd37c68672d60964f1064a1a5eb708efc554882 100644
--- a/src/bin_dac_client/dune
+++ b/src/bin_dac_client/dune
@@ -17,11 +17,11 @@
   octez-libs.tezos-stdlib
   tezos-dac-lib
   tezos-dac-client-lib
-  tezos-dac-017-PtNairob
-  tezos-dac-018-Proxford
-  (select void_for_linking-tezos-dac-alpha from
-   (tezos-dac-alpha -> void_for_linking-tezos-dac-alpha.empty)
-   (-> void_for_linking-tezos-dac-alpha.empty)))
+  octez-protocol-017-PtNairob-libs.tezos-dac
+  octez-protocol-018-Proxford-libs.tezos-dac
+  (select void_for_linking-octez-protocol-alpha-libs-tezos-dac from
+   (octez-protocol-alpha-libs.tezos-dac -> void_for_linking-octez-protocol-alpha-libs-tezos-dac.empty)
+   (-> void_for_linking-octez-protocol-alpha-libs-tezos-dac.empty)))
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
@@ -37,4 +37,7 @@
   -open Tezos_dac_lib
   -open Tezos_dac_client_lib))
 
-(rule (action (progn (write-file void_for_linking-tezos-dac-alpha.empty ""))))
+(rule
+ (action
+  (progn
+   (write-file void_for_linking-octez-protocol-alpha-libs-tezos-dac.empty ""))))
diff --git a/src/bin_dac_node/dune b/src/bin_dac_node/dune
index 05857d0ddc1c053a6924658a39e6394b1e26b5ee..eb26d59fa583419a552a167ae29295b1d9d3d2cf 100644
--- a/src/bin_dac_node/dune
+++ b/src/bin_dac_node/dune
@@ -25,11 +25,11 @@
   irmin-pack
   irmin-pack.unix
   irmin
-  tezos-dac-017-PtNairob
-  tezos-dac-018-Proxford
-  (select void_for_linking-tezos-dac-alpha from
-   (tezos-dac-alpha -> void_for_linking-tezos-dac-alpha.empty)
-   (-> void_for_linking-tezos-dac-alpha.empty)))
+  octez-protocol-017-PtNairob-libs.tezos-dac
+  octez-protocol-018-Proxford-libs.tezos-dac
+  (select void_for_linking-octez-protocol-alpha-libs-tezos-dac from
+   (octez-protocol-alpha-libs.tezos-dac -> void_for_linking-octez-protocol-alpha-libs-tezos-dac.empty)
+   (-> void_for_linking-octez-protocol-alpha-libs-tezos-dac.empty)))
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
@@ -47,4 +47,7 @@
   -open Tezos_dac_node_lib
   -open Tezos_layer2_store))
 
-(rule (action (progn (write-file void_for_linking-tezos-dac-alpha.empty ""))))
+(rule
+ (action
+  (progn
+   (write-file void_for_linking-octez-protocol-alpha-libs-tezos-dac.empty ""))))
diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune
index fe2c50eef5fa6cb1ae5b59c7944a198552b9426d..320e81e80a4af7d32356e0a20772ace242a76ce9 100644
--- a/src/bin_dal_node/dune
+++ b/src/bin_dal_node/dune
@@ -37,11 +37,11 @@
   irmin-pack.unix
   irmin
   prometheus-app
-  tezos-dal-017-PtNairob
-  tezos-dal-018-Proxford
-  (select void_for_linking-tezos-dal-alpha from
-   (tezos-dal-alpha -> void_for_linking-tezos-dal-alpha.empty)
-   (-> void_for_linking-tezos-dal-alpha.empty)))
+  octez-protocol-017-PtNairob-libs.tezos-dal
+  octez-protocol-018-Proxford-libs.tezos-dal
+  (select void_for_linking-octez-protocol-alpha-libs-tezos-dal from
+   (octez-protocol-alpha-libs.tezos-dal -> void_for_linking-octez-protocol-alpha-libs-tezos-dal.empty)
+   (-> void_for_linking-octez-protocol-alpha-libs-tezos-dal.empty)))
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
@@ -68,4 +68,7 @@
   -open Tezos_base_p2p_identity_file
   -open Tezos_shell_services))
 
-(rule (action (progn (write-file void_for_linking-tezos-dal-alpha.empty ""))))
+(rule
+ (action
+  (progn
+   (write-file void_for_linking-octez-protocol-alpha-libs-tezos-dal.empty ""))))
diff --git a/src/bin_node/dune b/src/bin_node/dune
index 27f244e3eafd48f5b638b87876d0e03961178429..53e82c7317ae7db09308f334308874329c12f04e 100644
--- a/src/bin_node/dune
+++ b/src/bin_node/dune
@@ -68,76 +68,76 @@
   (select void_for_linking-tezos-embedded-protocol-007-PsDELPH1 from
    (tezos-embedded-protocol-007-PsDELPH1 -> void_for_linking-tezos-embedded-protocol-007-PsDELPH1.empty)
    (-> void_for_linking-tezos-embedded-protocol-007-PsDELPH1.empty))
-  (select void_for_linking-tezos-protocol-plugin-007-PsDELPH1-registerer from
-   (tezos-protocol-plugin-007-PsDELPH1-registerer -> void_for_linking-tezos-protocol-plugin-007-PsDELPH1-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-007-PsDELPH1-registerer.empty))
+  (select void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-007-PsDELPH1-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin-registerer.empty))
   (select void_for_linking-tezos-embedded-protocol-008-PtEdoTez from
    (tezos-embedded-protocol-008-PtEdoTez -> void_for_linking-tezos-embedded-protocol-008-PtEdoTez.empty)
    (-> void_for_linking-tezos-embedded-protocol-008-PtEdoTez.empty))
   (select void_for_linking-tezos-embedded-protocol-008-PtEdo2Zk from
    (tezos-embedded-protocol-008-PtEdo2Zk -> void_for_linking-tezos-embedded-protocol-008-PtEdo2Zk.empty)
    (-> void_for_linking-tezos-embedded-protocol-008-PtEdo2Zk.empty))
-  (select void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk-registerer from
-   (tezos-protocol-plugin-008-PtEdo2Zk-registerer -> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk-registerer.empty))
+  (select void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-008-PtEdo2Zk-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin-registerer.empty))
   (select void_for_linking-tezos-embedded-protocol-009-PsFLoren from
    (tezos-embedded-protocol-009-PsFLoren -> void_for_linking-tezos-embedded-protocol-009-PsFLoren.empty)
    (-> void_for_linking-tezos-embedded-protocol-009-PsFLoren.empty))
-  (select void_for_linking-tezos-protocol-plugin-009-PsFLoren-registerer from
-   (tezos-protocol-plugin-009-PsFLoren-registerer -> void_for_linking-tezos-protocol-plugin-009-PsFLoren-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-009-PsFLoren-registerer.empty))
+  (select void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-009-PsFLoren-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin-registerer.empty))
   (select void_for_linking-tezos-embedded-protocol-010-PtGRANAD from
    (tezos-embedded-protocol-010-PtGRANAD -> void_for_linking-tezos-embedded-protocol-010-PtGRANAD.empty)
    (-> void_for_linking-tezos-embedded-protocol-010-PtGRANAD.empty))
-  (select void_for_linking-tezos-protocol-plugin-010-PtGRANAD-registerer from
-   (tezos-protocol-plugin-010-PtGRANAD-registerer -> void_for_linking-tezos-protocol-plugin-010-PtGRANAD-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-010-PtGRANAD-registerer.empty))
+  (select void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-010-PtGRANAD-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin-registerer.empty))
   (select void_for_linking-tezos-embedded-protocol-011-PtHangz2 from
    (tezos-embedded-protocol-011-PtHangz2 -> void_for_linking-tezos-embedded-protocol-011-PtHangz2.empty)
    (-> void_for_linking-tezos-embedded-protocol-011-PtHangz2.empty))
-  (select void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer from
-   (tezos-protocol-plugin-011-PtHangz2-registerer -> void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer.empty))
+  (select void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-011-PtHangz2-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin-registerer.empty))
   (select void_for_linking-tezos-embedded-protocol-012-Psithaca from
    (tezos-embedded-protocol-012-Psithaca -> void_for_linking-tezos-embedded-protocol-012-Psithaca.empty)
    (-> void_for_linking-tezos-embedded-protocol-012-Psithaca.empty))
-  (select void_for_linking-tezos-protocol-plugin-012-Psithaca-registerer from
-   (tezos-protocol-plugin-012-Psithaca-registerer -> void_for_linking-tezos-protocol-plugin-012-Psithaca-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-012-Psithaca-registerer.empty))
+  (select void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-012-Psithaca-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin-registerer.empty))
   (select void_for_linking-tezos-embedded-protocol-013-PtJakart from
    (tezos-embedded-protocol-013-PtJakart -> void_for_linking-tezos-embedded-protocol-013-PtJakart.empty)
    (-> void_for_linking-tezos-embedded-protocol-013-PtJakart.empty))
-  (select void_for_linking-tezos-protocol-plugin-013-PtJakart-registerer from
-   (tezos-protocol-plugin-013-PtJakart-registerer -> void_for_linking-tezos-protocol-plugin-013-PtJakart-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-013-PtJakart-registerer.empty))
+  (select void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-013-PtJakart-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin-registerer.empty))
   (select void_for_linking-tezos-embedded-protocol-014-PtKathma from
    (tezos-embedded-protocol-014-PtKathma -> void_for_linking-tezos-embedded-protocol-014-PtKathma.empty)
    (-> void_for_linking-tezos-embedded-protocol-014-PtKathma.empty))
-  (select void_for_linking-tezos-protocol-plugin-014-PtKathma-registerer from
-   (tezos-protocol-plugin-014-PtKathma-registerer -> void_for_linking-tezos-protocol-plugin-014-PtKathma-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-014-PtKathma-registerer.empty))
+  (select void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-014-PtKathma-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin-registerer.empty))
   (select void_for_linking-tezos-embedded-protocol-015-PtLimaPt from
    (tezos-embedded-protocol-015-PtLimaPt -> void_for_linking-tezos-embedded-protocol-015-PtLimaPt.empty)
    (-> void_for_linking-tezos-embedded-protocol-015-PtLimaPt.empty))
-  (select void_for_linking-tezos-protocol-plugin-015-PtLimaPt-registerer from
-   (tezos-protocol-plugin-015-PtLimaPt-registerer -> void_for_linking-tezos-protocol-plugin-015-PtLimaPt-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-015-PtLimaPt-registerer.empty))
+  (select void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-015-PtLimaPt-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin-registerer.empty))
   (select void_for_linking-tezos-embedded-protocol-016-PtMumbai from
    (tezos-embedded-protocol-016-PtMumbai -> void_for_linking-tezos-embedded-protocol-016-PtMumbai.empty)
    (-> void_for_linking-tezos-embedded-protocol-016-PtMumbai.empty))
-  (select void_for_linking-tezos-protocol-plugin-016-PtMumbai-registerer from
-   (tezos-protocol-plugin-016-PtMumbai-registerer -> void_for_linking-tezos-protocol-plugin-016-PtMumbai-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-016-PtMumbai-registerer.empty))
+  (select void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-016-PtMumbai-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin-registerer.empty))
   tezos-embedded-protocol-017-PtNairob
-  tezos-protocol-plugin-017-PtNairob-registerer
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin-registerer
   tezos-embedded-protocol-018-Proxford
-  tezos-protocol-plugin-018-Proxford-registerer
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin-registerer
   (select void_for_linking-tezos-embedded-protocol-alpha from
    (tezos-embedded-protocol-alpha -> void_for_linking-tezos-embedded-protocol-alpha.empty)
    (-> void_for_linking-tezos-embedded-protocol-alpha.empty))
-  (select void_for_linking-tezos-protocol-plugin-alpha-registerer from
-   (tezos-protocol-plugin-alpha-registerer -> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty)
-   (-> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty)))
+  (select void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin-registerer from
+   (octez-protocol-alpha-libs.tezos-protocol-plugin-registerer -> void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin-registerer.empty)
+   (-> void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin-registerer.empty)))
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
@@ -177,28 +177,28 @@
    (write-file void_for_linking-tezos-embedded-protocol-005-PsBabyM1.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-006-PsCARTHA.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-007-PsDELPH1.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-007-PsDELPH1-registerer.empty "")
+   (write-file void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin-registerer.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-008-PtEdoTez.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-008-PtEdo2Zk.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk-registerer.empty "")
+   (write-file void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin-registerer.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-009-PsFLoren.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-009-PsFLoren-registerer.empty "")
+   (write-file void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin-registerer.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-010-PtGRANAD.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-010-PtGRANAD-registerer.empty "")
+   (write-file void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin-registerer.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-011-PtHangz2.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-011-PtHangz2-registerer.empty "")
+   (write-file void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin-registerer.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-012-Psithaca.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-012-Psithaca-registerer.empty "")
+   (write-file void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin-registerer.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-013-PtJakart.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-013-PtJakart-registerer.empty "")
+   (write-file void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin-registerer.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-014-PtKathma.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-014-PtKathma-registerer.empty "")
+   (write-file void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin-registerer.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-015-PtLimaPt.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-015-PtLimaPt-registerer.empty "")
+   (write-file void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin-registerer.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-016-PtMumbai.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-016-PtMumbai-registerer.empty "")
+   (write-file void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin-registerer.empty "")
    (write-file void_for_linking-tezos-embedded-protocol-alpha.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-alpha-registerer.empty ""))))
+   (write-file void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin-registerer.empty ""))))
 
 (install
  (package octez-node)
diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune
index 85018824bafa1dfa1ee8c8dfc87caeccef00dd70..53b2f85a103b3a222a4316ec7cbae762ffafa108 100644
--- a/src/bin_proxy_server/dune
+++ b/src/bin_proxy_server/dune
@@ -28,105 +28,105 @@
   (select void_for_linking-tezos-client-demo-counter from
    (tezos-client-demo-counter -> void_for_linking-tezos-client-demo-counter.empty)
    (-> void_for_linking-tezos-client-demo-counter.empty))
-  (select void_for_linking-tezos-client-000-Ps9mPmXa from
-   (tezos-client-000-Ps9mPmXa -> void_for_linking-tezos-client-000-Ps9mPmXa.empty)
-   (-> void_for_linking-tezos-client-000-Ps9mPmXa.empty))
-  (select void_for_linking-tezos-client-001-PtCJ7pwo from
-   (tezos-client-001-PtCJ7pwo -> void_for_linking-tezos-client-001-PtCJ7pwo.empty)
-   (-> void_for_linking-tezos-client-001-PtCJ7pwo.empty))
-  (select void_for_linking-tezos-client-002-PsYLVpVv from
-   (tezos-client-002-PsYLVpVv -> void_for_linking-tezos-client-002-PsYLVpVv.empty)
-   (-> void_for_linking-tezos-client-002-PsYLVpVv.empty))
-  (select void_for_linking-tezos-client-003-PsddFKi3 from
-   (tezos-client-003-PsddFKi3 -> void_for_linking-tezos-client-003-PsddFKi3.empty)
-   (-> void_for_linking-tezos-client-003-PsddFKi3.empty))
-  (select void_for_linking-tezos-client-004-Pt24m4xi from
-   (tezos-client-004-Pt24m4xi -> void_for_linking-tezos-client-004-Pt24m4xi.empty)
-   (-> void_for_linking-tezos-client-004-Pt24m4xi.empty))
-  (select void_for_linking-tezos-client-005-PsBabyM1 from
-   (tezos-client-005-PsBabyM1 -> void_for_linking-tezos-client-005-PsBabyM1.empty)
-   (-> void_for_linking-tezos-client-005-PsBabyM1.empty))
-  (select void_for_linking-tezos-client-006-PsCARTHA from
-   (tezos-client-006-PsCARTHA -> void_for_linking-tezos-client-006-PsCARTHA.empty)
-   (-> void_for_linking-tezos-client-006-PsCARTHA.empty))
-  (select void_for_linking-tezos-client-007-PsDELPH1 from
-   (tezos-client-007-PsDELPH1 -> void_for_linking-tezos-client-007-PsDELPH1.empty)
-   (-> void_for_linking-tezos-client-007-PsDELPH1.empty))
-  (select void_for_linking-tezos-protocol-plugin-007-PsDELPH1 from
-   (tezos-protocol-plugin-007-PsDELPH1 -> void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty)
-   (-> void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty))
-  (select void_for_linking-tezos-client-008-PtEdo2Zk from
-   (tezos-client-008-PtEdo2Zk -> void_for_linking-tezos-client-008-PtEdo2Zk.empty)
-   (-> void_for_linking-tezos-client-008-PtEdo2Zk.empty))
-  (select void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk from
-   (tezos-protocol-plugin-008-PtEdo2Zk -> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty)
-   (-> void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty))
-  (select void_for_linking-tezos-client-009-PsFLoren from
-   (tezos-client-009-PsFLoren -> void_for_linking-tezos-client-009-PsFLoren.empty)
-   (-> void_for_linking-tezos-client-009-PsFLoren.empty))
-  (select void_for_linking-tezos-protocol-plugin-009-PsFLoren from
-   (tezos-protocol-plugin-009-PsFLoren -> void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty)
-   (-> void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty))
-  (select void_for_linking-tezos-client-010-PtGRANAD from
-   (tezos-client-010-PtGRANAD -> void_for_linking-tezos-client-010-PtGRANAD.empty)
-   (-> void_for_linking-tezos-client-010-PtGRANAD.empty))
-  (select void_for_linking-tezos-protocol-plugin-010-PtGRANAD from
-   (tezos-protocol-plugin-010-PtGRANAD -> void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty)
-   (-> void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty))
-  (select void_for_linking-tezos-client-011-PtHangz2 from
-   (tezos-client-011-PtHangz2 -> void_for_linking-tezos-client-011-PtHangz2.empty)
-   (-> void_for_linking-tezos-client-011-PtHangz2.empty))
-  (select void_for_linking-tezos-protocol-plugin-011-PtHangz2 from
-   (tezos-protocol-plugin-011-PtHangz2 -> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty)
-   (-> void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty))
-  (select void_for_linking-tezos-client-012-Psithaca from
-   (tezos-client-012-Psithaca -> void_for_linking-tezos-client-012-Psithaca.empty)
-   (-> void_for_linking-tezos-client-012-Psithaca.empty))
-  (select void_for_linking-tezos-protocol-plugin-012-Psithaca from
-   (tezos-protocol-plugin-012-Psithaca -> void_for_linking-tezos-protocol-plugin-012-Psithaca.empty)
-   (-> void_for_linking-tezos-protocol-plugin-012-Psithaca.empty))
-  (select void_for_linking-tezos-client-013-PtJakart from
-   (tezos-client-013-PtJakart -> void_for_linking-tezos-client-013-PtJakart.empty)
-   (-> void_for_linking-tezos-client-013-PtJakart.empty))
-  (select void_for_linking-tezos-protocol-plugin-013-PtJakart from
-   (tezos-protocol-plugin-013-PtJakart -> void_for_linking-tezos-protocol-plugin-013-PtJakart.empty)
-   (-> void_for_linking-tezos-protocol-plugin-013-PtJakart.empty))
-  (select void_for_linking-tezos-client-014-PtKathma from
-   (tezos-client-014-PtKathma -> void_for_linking-tezos-client-014-PtKathma.empty)
-   (-> void_for_linking-tezos-client-014-PtKathma.empty))
-  (select void_for_linking-tezos-protocol-plugin-014-PtKathma from
-   (tezos-protocol-plugin-014-PtKathma -> void_for_linking-tezos-protocol-plugin-014-PtKathma.empty)
-   (-> void_for_linking-tezos-protocol-plugin-014-PtKathma.empty))
-  (select void_for_linking-tezos-client-015-PtLimaPt from
-   (tezos-client-015-PtLimaPt -> void_for_linking-tezos-client-015-PtLimaPt.empty)
-   (-> void_for_linking-tezos-client-015-PtLimaPt.empty))
-  (select void_for_linking-tezos-protocol-plugin-015-PtLimaPt from
-   (tezos-protocol-plugin-015-PtLimaPt -> void_for_linking-tezos-protocol-plugin-015-PtLimaPt.empty)
-   (-> void_for_linking-tezos-protocol-plugin-015-PtLimaPt.empty))
-  (select void_for_linking-tezos-client-016-PtMumbai from
-   (tezos-client-016-PtMumbai -> void_for_linking-tezos-client-016-PtMumbai.empty)
-   (-> void_for_linking-tezos-client-016-PtMumbai.empty))
-  (select void_for_linking-tezos-protocol-plugin-016-PtMumbai from
-   (tezos-protocol-plugin-016-PtMumbai -> void_for_linking-tezos-protocol-plugin-016-PtMumbai.empty)
-   (-> void_for_linking-tezos-protocol-plugin-016-PtMumbai.empty))
-  (select void_for_linking-tezos-client-017-PtNairob from
-   (tezos-client-017-PtNairob -> void_for_linking-tezos-client-017-PtNairob.empty)
-   (-> void_for_linking-tezos-client-017-PtNairob.empty))
-  (select void_for_linking-tezos-protocol-plugin-017-PtNairob from
-   (tezos-protocol-plugin-017-PtNairob -> void_for_linking-tezos-protocol-plugin-017-PtNairob.empty)
-   (-> void_for_linking-tezos-protocol-plugin-017-PtNairob.empty))
-  (select void_for_linking-tezos-client-018-Proxford from
-   (tezos-client-018-Proxford -> void_for_linking-tezos-client-018-Proxford.empty)
-   (-> void_for_linking-tezos-client-018-Proxford.empty))
-  (select void_for_linking-tezos-protocol-plugin-018-Proxford from
-   (tezos-protocol-plugin-018-Proxford -> void_for_linking-tezos-protocol-plugin-018-Proxford.empty)
-   (-> void_for_linking-tezos-protocol-plugin-018-Proxford.empty))
-  (select void_for_linking-tezos-client-alpha from
-   (tezos-client-alpha -> void_for_linking-tezos-client-alpha.empty)
-   (-> void_for_linking-tezos-client-alpha.empty))
-  (select void_for_linking-tezos-protocol-plugin-alpha from
-   (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty)
-   (-> void_for_linking-tezos-protocol-plugin-alpha.empty)))
+  (select void_for_linking-octez-protocol-000-Ps9mPmXa-libs-tezos-client from
+   (octez-protocol-000-Ps9mPmXa-libs.tezos-client -> void_for_linking-octez-protocol-000-Ps9mPmXa-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-000-Ps9mPmXa-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-001-PtCJ7pwo-libs-tezos-client from
+   (octez-protocol-001-PtCJ7pwo-libs.tezos-client -> void_for_linking-octez-protocol-001-PtCJ7pwo-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-001-PtCJ7pwo-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-002-PsYLVpVv-libs-tezos-client from
+   (octez-protocol-002-PsYLVpVv-libs.tezos-client -> void_for_linking-octez-protocol-002-PsYLVpVv-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-002-PsYLVpVv-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-003-PsddFKi3-libs-tezos-client from
+   (octez-protocol-003-PsddFKi3-libs.tezos-client -> void_for_linking-octez-protocol-003-PsddFKi3-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-003-PsddFKi3-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-004-Pt24m4xi-libs-tezos-client from
+   (octez-protocol-004-Pt24m4xi-libs.tezos-client -> void_for_linking-octez-protocol-004-Pt24m4xi-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-004-Pt24m4xi-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client from
+   (octez-protocol-005-PsBabyM1-libs.tezos-client -> void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client from
+   (octez-protocol-006-PsCARTHA-libs.tezos-client -> void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client from
+   (octez-protocol-007-PsDELPH1-libs.tezos-client -> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin from
+   (octez-protocol-007-PsDELPH1-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client from
+   (octez-protocol-008-PtEdo2Zk-libs.tezos-client -> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin from
+   (octez-protocol-008-PtEdo2Zk-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client from
+   (octez-protocol-009-PsFLoren-libs.tezos-client -> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin from
+   (octez-protocol-009-PsFLoren-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client from
+   (octez-protocol-010-PtGRANAD-libs.tezos-client -> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin from
+   (octez-protocol-010-PtGRANAD-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client from
+   (octez-protocol-011-PtHangz2-libs.tezos-client -> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin from
+   (octez-protocol-011-PtHangz2-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client from
+   (octez-protocol-012-Psithaca-libs.tezos-client -> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin from
+   (octez-protocol-012-Psithaca-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client from
+   (octez-protocol-013-PtJakart-libs.tezos-client -> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin from
+   (octez-protocol-013-PtJakart-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client from
+   (octez-protocol-014-PtKathma-libs.tezos-client -> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin from
+   (octez-protocol-014-PtKathma-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client from
+   (octez-protocol-015-PtLimaPt-libs.tezos-client -> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin from
+   (octez-protocol-015-PtLimaPt-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client from
+   (octez-protocol-016-PtMumbai-libs.tezos-client -> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin from
+   (octez-protocol-016-PtMumbai-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-017-PtNairob-libs-tezos-client from
+   (octez-protocol-017-PtNairob-libs.tezos-client -> void_for_linking-octez-protocol-017-PtNairob-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-017-PtNairob-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-017-PtNairob-libs-tezos-protocol-plugin from
+   (octez-protocol-017-PtNairob-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-017-PtNairob-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-017-PtNairob-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-018-Proxford-libs-tezos-client from
+   (octez-protocol-018-Proxford-libs.tezos-client -> void_for_linking-octez-protocol-018-Proxford-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-018-Proxford-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-018-Proxford-libs-tezos-protocol-plugin from
+   (octez-protocol-018-Proxford-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-018-Proxford-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-018-Proxford-libs-tezos-protocol-plugin.empty))
+  (select void_for_linking-octez-protocol-alpha-libs-tezos-client from
+   (octez-protocol-alpha-libs.tezos-client -> void_for_linking-octez-protocol-alpha-libs-tezos-client.empty)
+   (-> void_for_linking-octez-protocol-alpha-libs-tezos-client.empty))
+  (select void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin from
+   (octez-protocol-alpha-libs.tezos-protocol-plugin -> void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin.empty)
+   (-> void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin.empty)))
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
@@ -143,36 +143,36 @@
   (progn
    (write-file void_for_linking-tezos-client-genesis.empty "")
    (write-file void_for_linking-tezos-client-demo-counter.empty "")
-   (write-file void_for_linking-tezos-client-000-Ps9mPmXa.empty "")
-   (write-file void_for_linking-tezos-client-001-PtCJ7pwo.empty "")
-   (write-file void_for_linking-tezos-client-002-PsYLVpVv.empty "")
-   (write-file void_for_linking-tezos-client-003-PsddFKi3.empty "")
-   (write-file void_for_linking-tezos-client-004-Pt24m4xi.empty "")
-   (write-file void_for_linking-tezos-client-005-PsBabyM1.empty "")
-   (write-file void_for_linking-tezos-client-006-PsCARTHA.empty "")
-   (write-file void_for_linking-tezos-client-007-PsDELPH1.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-007-PsDELPH1.empty "")
-   (write-file void_for_linking-tezos-client-008-PtEdo2Zk.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-008-PtEdo2Zk.empty "")
-   (write-file void_for_linking-tezos-client-009-PsFLoren.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-009-PsFLoren.empty "")
-   (write-file void_for_linking-tezos-client-010-PtGRANAD.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-010-PtGRANAD.empty "")
-   (write-file void_for_linking-tezos-client-011-PtHangz2.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-011-PtHangz2.empty "")
-   (write-file void_for_linking-tezos-client-012-Psithaca.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-012-Psithaca.empty "")
-   (write-file void_for_linking-tezos-client-013-PtJakart.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-013-PtJakart.empty "")
-   (write-file void_for_linking-tezos-client-014-PtKathma.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-014-PtKathma.empty "")
-   (write-file void_for_linking-tezos-client-015-PtLimaPt.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-015-PtLimaPt.empty "")
-   (write-file void_for_linking-tezos-client-016-PtMumbai.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-016-PtMumbai.empty "")
-   (write-file void_for_linking-tezos-client-017-PtNairob.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-017-PtNairob.empty "")
-   (write-file void_for_linking-tezos-client-018-Proxford.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-018-Proxford.empty "")
-   (write-file void_for_linking-tezos-client-alpha.empty "")
-   (write-file void_for_linking-tezos-protocol-plugin-alpha.empty ""))))
+   (write-file void_for_linking-octez-protocol-000-Ps9mPmXa-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-001-PtCJ7pwo-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-002-PsYLVpVv-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-003-PsddFKi3-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-004-Pt24m4xi-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-006-PsCARTHA-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-007-PsDELPH1-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-008-PtEdo2Zk-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-009-PsFLoren-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-010-PtGRANAD-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-011-PtHangz2-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-012-Psithaca-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-012-Psithaca-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-013-PtJakart-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-013-PtJakart-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-014-PtKathma-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-014-PtKathma-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-015-PtLimaPt-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-016-PtMumbai-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-017-PtNairob-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-017-PtNairob-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-018-Proxford-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-018-Proxford-libs-tezos-protocol-plugin.empty "")
+   (write-file void_for_linking-octez-protocol-alpha-libs-tezos-client.empty "")
+   (write-file void_for_linking-octez-protocol-alpha-libs-tezos-protocol-plugin.empty ""))))
diff --git a/src/bin_sequencer_node/dune b/src/bin_sequencer_node/dune
index 30d3ccd63ccb85e16ddfe503c66e73a504f044bb..ff5d5384407293eac5ae0ae1b785ed7932693281 100644
--- a/src/bin_sequencer_node/dune
+++ b/src/bin_sequencer_node/dune
@@ -13,7 +13,7 @@
   octez-shell-libs.tezos-client-base-unix
   octez-shell-libs.tezos-client-commands
   octez-smart-rollup-node-lib
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez_smart_rollup_node_alpha
   octez_smart_rollup_sequencer)
  (link_flags
diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune
index 6e6fecf6627b929937581dff6e577ece4c537fdc..83ef984aedf8d6bf3399be03faf9680b72d59490 100644
--- a/src/bin_tps_evaluation/dune
+++ b/src/bin_tps_evaluation/dune
@@ -13,8 +13,8 @@
   caqti-lwt
   data-encoding
   lwt
-  tezos-baking-alpha
-  tezos-client-alpha.commands
+  octez-protocol-alpha-libs.tezos-baking
+  octez-protocol-alpha-libs.tezos-client.commands
   octez-shell-libs.tezos-client-base-unix
   tezos-protocol-alpha
   tezt
diff --git a/src/bin_wasm_debugger/dune b/src/bin_wasm_debugger/dune
index d23198b63ba7dd7f170c7ab7eec9d747ad6b641f..665c9dff3678d5c63fe8dad27e3c93d18998c98d 100644
--- a/src/bin_wasm_debugger/dune
+++ b/src/bin_wasm_debugger/dune
@@ -12,7 +12,7 @@
   octez-libs.tezos-tree-encoding
   octez-libs.tezos-base.unix
   yaml
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-l2-libs.tezos-scoru-wasm
   octez-l2-libs.tezos-scoru-wasm-helpers
   octez-l2-libs.tezos-webassembly-interpreter
diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune
index bbacd8451b18b3e8c39f47a3c714df2d324d71b8..bf2ae33df7ced888b7f6e34773e49a84ab97af9d 100644
--- a/src/lib_benchmark/lib_micheline_rewriting/test/dune
+++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune
@@ -10,7 +10,7 @@
   tezos-micheline-rewriting
   tezos-protocol-alpha
   octez-libs.tezos-error-monad
-  tezos-client-alpha)
+  octez-protocol-alpha-libs.tezos-client)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_scoru_sequencer/dune b/src/lib_scoru_sequencer/dune
index 177a499a3a3b42a72bfe6e116a924ff2ddc902df..fcce47eab97994ce6e5ac5a10f4ebb205e27eb84 100644
--- a/src/lib_scoru_sequencer/dune
+++ b/src/lib_scoru_sequencer/dune
@@ -7,7 +7,7 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
-  tezos-smart-rollup-layer2-alpha
+  octez-protocol-alpha-libs.tezos-smart-rollup-layer2
   tezos-protocol-alpha
   octez_smart_rollup_node_alpha
   octez-libs.tezos-workers
diff --git a/src/lib_scoru_wasm/regressions/dune b/src/lib_scoru_wasm/regressions/dune
index bccc3bdea7e1c5e2462f14e527556952cea3f7b8..a993d04dfcdf40f2379dbb21ddd11f077a9b197f 100644
--- a/src/lib_scoru_wasm/regressions/dune
+++ b/src/lib_scoru_wasm/regressions/dune
@@ -11,7 +11,7 @@
   octez-l2-libs.tezos-scoru-wasm-helpers
   octez-libs.tezos-test-helpers
   tezos-protocol-alpha
-  tezos-smart-rollup-alpha
+  octez-protocol-alpha-libs.tezos-smart-rollup
   tezos-protocol-alpha.parameters
   tezt)
  (preprocess (staged_pps ppx_import ppx_deriving.show))
diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune
index d26b95f3cebfc4669971e27637ace70acebea63f..e1d897793713ad99fb9238706cbf648078c2f5b5 100644
--- a/src/lib_store/unix/test/dune
+++ b/src/lib_store/unix/test/dune
@@ -21,7 +21,7 @@
   tezos-embedded-protocol-genesis
   tezos-embedded-protocol-alpha
   tezos-protocol-alpha.parameters
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   octez-alcotezt
   octez-libs.tezos-test-helpers)
  (library_flags (:standard -linkall))
diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune
index be0c20aef472c5cbb98ff08dea449206c821c298..8f0dfd0b93817af7260be4f7e0b4e3078c7fa298 100644
--- a/src/proto_000_Ps9mPmXa/lib_client/dune
+++ b/src/proto_000_Ps9mPmXa/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_000_Ps9mPmXa)
- (public_name tezos-client-000-Ps9mPmXa)
+ (public_name octez-protocol-000-Ps9mPmXa-libs.tezos-client)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
diff --git a/src/proto_000_Ps9mPmXa/lib_plugin/index.mld b/src/proto_000_Ps9mPmXa/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..cfbbe80b7d9d1987c5f07a26914fc495482462e6
--- /dev/null
+++ b/src/proto_000_Ps9mPmXa/lib_plugin/index.mld
@@ -0,0 +1,7 @@
+{0 Octez-protocol-000-Ps9mPmXa-libs: octez protocol 000-Ps9mPmXa libraries}
+
+This is a package containing some libraries related to the Tezos 000-Ps9mPmXa protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_000_Ps9mPmXa}Tezos_client_000_Ps9mPmXa}: Protocol specific library for `tezos-client`
diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune b/src/proto_001_PtCJ7pwo/lib_client/dune
index 353880e954b009919b9cc75abf25657e0f316a04..8503632b37fce1b41282a6eacfe5dcb3702e376a 100644
--- a/src/proto_001_PtCJ7pwo/lib_client/dune
+++ b/src/proto_001_PtCJ7pwo/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_001_PtCJ7pwo)
- (public_name tezos-client-001-PtCJ7pwo)
+ (public_name octez-protocol-001-PtCJ7pwo-libs.tezos-client)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune
index 0e5e4f4f7a8f06387c672dce9e8b6b6fd46c5016..d64138d50135bdb30f3607e8165e1ae319f6dcb6 100644
--- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune
+++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_001_PtCJ7pwo_commands)
- (public_name tezos-client-001-PtCJ7pwo.commands)
+ (public_name octez-protocol-001-PtCJ7pwo-libs.tezos-client.commands)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -12,7 +12,7 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-001-PtCJ7pwo
+  octez-protocol-001-PtCJ7pwo-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
@@ -30,7 +30,8 @@
 
 (library
  (name tezos_client_001_PtCJ7pwo_commands_registration)
- (public_name tezos-client-001-PtCJ7pwo.commands-registration)
+ (public_name
+  octez-protocol-001-PtCJ7pwo-libs.tezos-client.commands-registration)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -38,9 +39,9 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-001-PtCJ7pwo
+  octez-protocol-001-PtCJ7pwo-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-001-PtCJ7pwo.commands
+  octez-protocol-001-PtCJ7pwo-libs.tezos-client.commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_001_PtCJ7pwo/lib_plugin/index.mld b/src/proto_001_PtCJ7pwo/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..017ddcaaf5d2d2fef0190b632812f76e6bed1983
--- /dev/null
+++ b/src/proto_001_PtCJ7pwo/lib_plugin/index.mld
@@ -0,0 +1,9 @@
+{0 Octez-protocol-001-PtCJ7pwo-libs: octez protocol 001-PtCJ7pwo libraries}
+
+This is a package containing some libraries related to the Tezos 001-PtCJ7pwo protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_001_PtCJ7pwo}Tezos_client_001_PtCJ7pwo}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_001_PtCJ7pwo_commands}Tezos_client_001_PtCJ7pwo_commands}
+- {{!module-Tezos_client_001_PtCJ7pwo_commands_registration}Tezos_client_001_PtCJ7pwo_commands_registration}
diff --git a/src/proto_002_PsYLVpVv/lib_client/dune b/src/proto_002_PsYLVpVv/lib_client/dune
index c8b9213a9c54cb122673f29d3158016a1b801de7..1a28d48527d018ae89e3628554813bfa9af2b645 100644
--- a/src/proto_002_PsYLVpVv/lib_client/dune
+++ b/src/proto_002_PsYLVpVv/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_002_PsYLVpVv)
- (public_name tezos-client-002-PsYLVpVv)
+ (public_name octez-protocol-002-PsYLVpVv-libs.tezos-client)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune
index a9ddd8b6055dfed38d77219c90d9b29bb5b47c88..8de65034691770ce9789e1a612fdd6392d6c8887 100644
--- a/src/proto_002_PsYLVpVv/lib_client_commands/dune
+++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_002_PsYLVpVv_commands)
- (public_name tezos-client-002-PsYLVpVv.commands)
+ (public_name octez-protocol-002-PsYLVpVv-libs.tezos-client.commands)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -12,7 +12,7 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-002-PsYLVpVv
+  octez-protocol-002-PsYLVpVv-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
@@ -30,7 +30,8 @@
 
 (library
  (name tezos_client_002_PsYLVpVv_commands_registration)
- (public_name tezos-client-002-PsYLVpVv.commands-registration)
+ (public_name
+  octez-protocol-002-PsYLVpVv-libs.tezos-client.commands-registration)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -38,9 +39,9 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-002-PsYLVpVv
+  octez-protocol-002-PsYLVpVv-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-002-PsYLVpVv.commands
+  octez-protocol-002-PsYLVpVv-libs.tezos-client.commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_002_PsYLVpVv/lib_plugin/index.mld b/src/proto_002_PsYLVpVv/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..472de48612c8b6e49a141028b5b9abd0ff91dfdf
--- /dev/null
+++ b/src/proto_002_PsYLVpVv/lib_plugin/index.mld
@@ -0,0 +1,9 @@
+{0 Octez-protocol-002-PsYLVpVv-libs: octez protocol 002-PsYLVpVv libraries}
+
+This is a package containing some libraries related to the Tezos 002-PsYLVpVv protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_002_PsYLVpVv}Tezos_client_002_PsYLVpVv}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_002_PsYLVpVv_commands}Tezos_client_002_PsYLVpVv_commands}
+- {{!module-Tezos_client_002_PsYLVpVv_commands_registration}Tezos_client_002_PsYLVpVv_commands_registration}
diff --git a/src/proto_003_PsddFKi3/lib_client/dune b/src/proto_003_PsddFKi3/lib_client/dune
index a033c9bf4ff88f4f5a9f151c8a13b6662e097dc2..3aa6eea7ed30ca3516e0313089a2692b54fc03ed 100644
--- a/src/proto_003_PsddFKi3/lib_client/dune
+++ b/src/proto_003_PsddFKi3/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_003_PsddFKi3)
- (public_name tezos-client-003-PsddFKi3)
+ (public_name octez-protocol-003-PsddFKi3-libs.tezos-client)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune
index ccd279d0efe5749ba12000533ce80f5c86f675fe..aac112eab80997293c9d3b4eb6a2d8513c4c0943 100644
--- a/src/proto_003_PsddFKi3/lib_client_commands/dune
+++ b/src/proto_003_PsddFKi3/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_003_PsddFKi3_commands)
- (public_name tezos-client-003-PsddFKi3.commands)
+ (public_name octez-protocol-003-PsddFKi3-libs.tezos-client.commands)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -12,7 +12,7 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-003-PsddFKi3
+  octez-protocol-003-PsddFKi3-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
@@ -30,7 +30,8 @@
 
 (library
  (name tezos_client_003_PsddFKi3_commands_registration)
- (public_name tezos-client-003-PsddFKi3.commands-registration)
+ (public_name
+  octez-protocol-003-PsddFKi3-libs.tezos-client.commands-registration)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -38,9 +39,9 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-003-PsddFKi3
+  octez-protocol-003-PsddFKi3-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-003-PsddFKi3.commands
+  octez-protocol-003-PsddFKi3-libs.tezos-client.commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_003_PsddFKi3/lib_plugin/index.mld b/src/proto_003_PsddFKi3/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..309b0767d4ff6057606ef508738e769e7257ef32
--- /dev/null
+++ b/src/proto_003_PsddFKi3/lib_plugin/index.mld
@@ -0,0 +1,9 @@
+{0 Octez-protocol-003-PsddFKi3-libs: octez protocol 003-PsddFKi3 libraries}
+
+This is a package containing some libraries related to the Tezos 003-PsddFKi3 protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_003_PsddFKi3}Tezos_client_003_PsddFKi3}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_003_PsddFKi3_commands}Tezos_client_003_PsddFKi3_commands}
+- {{!module-Tezos_client_003_PsddFKi3_commands_registration}Tezos_client_003_PsddFKi3_commands_registration}
diff --git a/src/proto_004_Pt24m4xi/lib_client/dune b/src/proto_004_Pt24m4xi/lib_client/dune
index 9a280b70b341067b5f3f0f54750616d572d060a1..a29aacc99afe1bf41a03df642a2e7d745448e24c 100644
--- a/src/proto_004_Pt24m4xi/lib_client/dune
+++ b/src/proto_004_Pt24m4xi/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_004_Pt24m4xi)
- (public_name tezos-client-004-Pt24m4xi)
+ (public_name octez-protocol-004-Pt24m4xi-libs.tezos-client)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune
index 4f70f8a1f391c9d421502176390e167e32785181..3306de04ce5493940b665b760300d1ffee0bea31 100644
--- a/src/proto_004_Pt24m4xi/lib_client_commands/dune
+++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_004_Pt24m4xi_commands)
- (public_name tezos-client-004-Pt24m4xi.commands)
+ (public_name octez-protocol-004-Pt24m4xi-libs.tezos-client.commands)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -12,7 +12,7 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-004-Pt24m4xi
+  octez-protocol-004-Pt24m4xi-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
@@ -30,7 +30,8 @@
 
 (library
  (name tezos_client_004_Pt24m4xi_commands_registration)
- (public_name tezos-client-004-Pt24m4xi.commands-registration)
+ (public_name
+  octez-protocol-004-Pt24m4xi-libs.tezos-client.commands-registration)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -38,9 +39,9 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-004-Pt24m4xi
+  octez-protocol-004-Pt24m4xi-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-004-Pt24m4xi.commands
+  octez-protocol-004-Pt24m4xi-libs.tezos-client.commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_004_Pt24m4xi/lib_plugin/index.mld b/src/proto_004_Pt24m4xi/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..4ebf55f12dc5c79db901c18439102feb1d5a5d14
--- /dev/null
+++ b/src/proto_004_Pt24m4xi/lib_plugin/index.mld
@@ -0,0 +1,9 @@
+{0 Octez-protocol-004-Pt24m4xi-libs: octez protocol 004-Pt24m4xi libraries}
+
+This is a package containing some libraries related to the Tezos 004-Pt24m4xi protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_004_Pt24m4xi}Tezos_client_004_Pt24m4xi}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_004_Pt24m4xi_commands}Tezos_client_004_Pt24m4xi_commands}
+- {{!module-Tezos_client_004_Pt24m4xi_commands_registration}Tezos_client_004_Pt24m4xi_commands_registration}
diff --git a/src/proto_005_PsBABY5H/lib_plugin/index.mld b/src/proto_005_PsBABY5H/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..a65b2bf9878b9a436395785902424c43a399a3df
--- /dev/null
+++ b/src/proto_005_PsBABY5H/lib_plugin/index.mld
@@ -0,0 +1,6 @@
+{0 Octez-protocol-005-PsBABY5H-libs: octez protocol 005-PsBABY5H libraries}
+
+This is a package containing some libraries related to the Tezos 005-PsBABY5H protocol.
+
+It contains the following libraries:
+
diff --git a/src/proto_005_PsBabyM1/lib_client/dune b/src/proto_005_PsBabyM1/lib_client/dune
index f2b73ef96af817cf539539986b83e7f27439f69f..1bde69aaa0a8c00cb2015cf179f1671d01085f79 100644
--- a/src/proto_005_PsBabyM1/lib_client/dune
+++ b/src/proto_005_PsBabyM1/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_005_PsBabyM1)
- (public_name tezos-client-005-PsBabyM1)
+ (public_name octez-protocol-005-PsBabyM1-libs.tezos-client)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune
index 1b39d46cd9eeda92fd302c8ee3d3bd50f335e5ad..350c2e0861bbaaae446860af9f136737daa2b742 100644
--- a/src/proto_005_PsBabyM1/lib_client_commands/dune
+++ b/src/proto_005_PsBabyM1/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_005_PsBabyM1_commands)
- (public_name tezos-client-005-PsBabyM1.commands)
+ (public_name octez-protocol-005-PsBabyM1-libs.tezos-client.commands)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -12,7 +12,7 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-005-PsBabyM1
+  octez-protocol-005-PsBabyM1-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
@@ -30,7 +30,8 @@
 
 (library
  (name tezos_client_005_PsBabyM1_commands_registration)
- (public_name tezos-client-005-PsBabyM1.commands-registration)
+ (public_name
+  octez-protocol-005-PsBabyM1-libs.tezos-client.commands-registration)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -38,9 +39,9 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-005-PsBabyM1
+  octez-protocol-005-PsBabyM1-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-005-PsBabyM1.commands
+  octez-protocol-005-PsBabyM1-libs.tezos-client.commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_005_PsBabyM1/lib_plugin/index.mld b/src/proto_005_PsBabyM1/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..b8ec55be3ad9309496254b8d957b811357656f3f
--- /dev/null
+++ b/src/proto_005_PsBabyM1/lib_plugin/index.mld
@@ -0,0 +1,9 @@
+{0 Octez-protocol-005-PsBabyM1-libs: octez protocol 005-PsBabyM1 libraries}
+
+This is a package containing some libraries related to the Tezos 005-PsBabyM1 protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_005_PsBabyM1}Tezos_client_005_PsBabyM1}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_005_PsBabyM1_commands}Tezos_client_005_PsBabyM1_commands}
+- {{!module-Tezos_client_005_PsBabyM1_commands_registration}Tezos_client_005_PsBabyM1_commands_registration}
diff --git a/src/proto_006_PsCARTHA/lib_client/dune b/src/proto_006_PsCARTHA/lib_client/dune
index c563f00cf8c569db2ba4ed40ef310c375edb620c..564e855b576ec8313ce15f2026a33e617e3d1580 100644
--- a/src/proto_006_PsCARTHA/lib_client/dune
+++ b/src/proto_006_PsCARTHA/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_006_PsCARTHA)
- (public_name tezos-client-006-PsCARTHA)
+ (public_name octez-protocol-006-PsCARTHA-libs.tezos-client)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune
index 795c565a7f16102199e37350787fd1c9b5e8fe07..4d94b6a094a1837a53fac342c871188e409c04ce 100644
--- a/src/proto_006_PsCARTHA/lib_client_commands/dune
+++ b/src/proto_006_PsCARTHA/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_006_PsCARTHA_commands)
- (public_name tezos-client-006-PsCARTHA.commands)
+ (public_name octez-protocol-006-PsCARTHA-libs.tezos-client.commands)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -12,7 +12,7 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-006-PsCARTHA
+  octez-protocol-006-PsCARTHA-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
@@ -30,7 +30,8 @@
 
 (library
  (name tezos_client_006_PsCARTHA_commands_registration)
- (public_name tezos-client-006-PsCARTHA.commands-registration)
+ (public_name
+  octez-protocol-006-PsCARTHA-libs.tezos-client.commands-registration)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -38,9 +39,9 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-006-PsCARTHA
+  octez-protocol-006-PsCARTHA-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-006-PsCARTHA.commands
+  octez-protocol-006-PsCARTHA-libs.tezos-client.commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_006_PsCARTHA/lib_plugin/index.mld b/src/proto_006_PsCARTHA/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..39183d56c39172144fe03b6c21e7bdee74072bcf
--- /dev/null
+++ b/src/proto_006_PsCARTHA/lib_plugin/index.mld
@@ -0,0 +1,9 @@
+{0 Octez-protocol-006-PsCARTHA-libs: octez protocol 006-PsCARTHA libraries}
+
+This is a package containing some libraries related to the Tezos 006-PsCARTHA protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_006_PsCARTHA}Tezos_client_006_PsCARTHA}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_006_PsCARTHA_commands}Tezos_client_006_PsCARTHA_commands}
+- {{!module-Tezos_client_006_PsCARTHA_commands_registration}Tezos_client_006_PsCARTHA_commands_registration}
diff --git a/src/proto_007_PsDELPH1/lib_client/dune b/src/proto_007_PsDELPH1/lib_client/dune
index 2657f1a7b1cb1e31e51d1488634b7aabdecd861d..77bc6cc45bc825db70f8f3c35c37290f3b2e02dd 100644
--- a/src/proto_007_PsDELPH1/lib_client/dune
+++ b/src/proto_007_PsDELPH1/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_007_PsDELPH1)
- (public_name tezos-client-007-PsDELPH1)
+ (public_name octez-protocol-007-PsDELPH1-libs.tezos-client)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -12,7 +12,7 @@
   tezos-protocol-007-PsDELPH1
   tezos-protocol-007-PsDELPH1.lifted
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-007-PsDELPH1
+  octez-protocol-007-PsDELPH1-libs.tezos-protocol-plugin
   octez-libs.tezos-rpc
   uri)
  (library_flags (:standard -linkall))
diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune
index a2588955e7ecb515a8de6f2f06801c6750172ed7..d065337686ed6de44741833fd43300020acc0e12 100644
--- a/src/proto_007_PsDELPH1/lib_client_commands/dune
+++ b/src/proto_007_PsDELPH1/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_007_PsDELPH1_commands)
- (public_name tezos-client-007-PsDELPH1.commands)
+ (public_name octez-protocol-007-PsDELPH1-libs.tezos-client.commands)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -12,7 +12,7 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-007-PsDELPH1
+  octez-protocol-007-PsDELPH1-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
@@ -30,7 +30,8 @@
 
 (library
  (name tezos_client_007_PsDELPH1_commands_registration)
- (public_name tezos-client-007-PsDELPH1.commands-registration)
+ (public_name
+  octez-protocol-007-PsDELPH1-libs.tezos-client.commands-registration)
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
@@ -38,9 +39,9 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-007-PsDELPH1
+  octez-protocol-007-PsDELPH1-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-007-PsDELPH1.commands
+  octez-protocol-007-PsDELPH1-libs.tezos-client.commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_007_PsDELPH1/lib_plugin/dune b/src/proto_007_PsDELPH1/lib_plugin/dune
index bf631d9ebf1800caab7c61d911585b20fb9b63ea..3bf1c4b829545b517959b5969eb043fdc9524fa0 100644
--- a/src/proto_007_PsDELPH1/lib_plugin/dune
+++ b/src/proto_007_PsDELPH1/lib_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_protocol_plugin_007_PsDELPH1)
- (public_name tezos-protocol-plugin-007-PsDELPH1)
+ (public_name octez-protocol-007-PsDELPH1-libs.tezos-protocol-plugin)
  (libraries
   octez-libs.tezos-base
   tezos-protocol-007-PsDELPH1)
@@ -14,13 +14,16 @@
   -open Tezos_protocol_007_PsDELPH1)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-007-PsDELPH1-libs))
+
 (library
  (name tezos_protocol_plugin_007_PsDELPH1_registerer)
- (public_name tezos-protocol-plugin-007-PsDELPH1-registerer)
+ (public_name
+  octez-protocol-007-PsDELPH1-libs.tezos-protocol-plugin-registerer)
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-007-PsDELPH1
-  tezos-protocol-plugin-007-PsDELPH1
+  octez-protocol-007-PsDELPH1-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_007_PsDELPH1/lib_plugin/index.mld b/src/proto_007_PsDELPH1/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..fc1e570c0477a13703c56035183a84dc92523868
--- /dev/null
+++ b/src/proto_007_PsDELPH1/lib_plugin/index.mld
@@ -0,0 +1,11 @@
+{0 Octez-protocol-007-PsDELPH1-libs: octez protocol 007-PsDELPH1 libraries}
+
+This is a package containing some libraries related to the Tezos 007-PsDELPH1 protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_007_PsDELPH1}Tezos_client_007_PsDELPH1}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_007_PsDELPH1_commands}Tezos_client_007_PsDELPH1_commands}
+- {{!module-Tezos_client_007_PsDELPH1_commands_registration}Tezos_client_007_PsDELPH1_commands_registration}
+- {{!module-Tezos_protocol_plugin_007_PsDELPH1}Tezos_protocol_plugin_007_PsDELPH1}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_007_PsDELPH1_registerer}Tezos_protocol_plugin_007_PsDELPH1_registerer}: Protocol plugin registerer
diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune
index 76185dc16ab0c364317bd4edb8971a210f4c2d81..b452a17d05e048afc0d3bf7810c04b63ff88cfa2 100644
--- a/src/proto_008_PtEdo2Zk/lib_client/dune
+++ b/src/proto_008_PtEdo2Zk/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_008_PtEdo2Zk)
- (public_name tezos-client-008-PtEdo2Zk)
+ (public_name octez-protocol-008-PtEdo2Zk-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -13,7 +13,7 @@
   tezos-protocol-008-PtEdo2Zk
   tezos-protocol-008-PtEdo2Zk.lifted
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-008-PtEdo2Zk
+  octez-protocol-008-PtEdo2Zk-libs.tezos-protocol-plugin
   octez-libs.tezos-rpc
   uri)
  (library_flags (:standard -linkall))
diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune
index a76298f50c065a1ce623b5fd341550721c9425c5..140cbf8facad087947ffd3286193ac54c394f50a 100644
--- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune
+++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_008_PtEdo2Zk_commands)
- (public_name tezos-client-008-PtEdo2Zk.commands)
+ (public_name octez-protocol-008-PtEdo2Zk-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -13,10 +13,10 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-008-PtEdo2Zk
+  octez-protocol-008-PtEdo2Zk-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-008-PtEdo2Zk)
+  octez-protocol-008-PtEdo2Zk-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -33,7 +33,8 @@
 
 (library
  (name tezos_client_008_PtEdo2Zk_commands_registration)
- (public_name tezos-client-008-PtEdo2Zk.commands-registration)
+ (public_name
+  octez-protocol-008-PtEdo2Zk-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -42,11 +43,11 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-008-PtEdo2Zk
+  octez-protocol-008-PtEdo2Zk-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-008-PtEdo2Zk.commands
+  octez-protocol-008-PtEdo2Zk-libs.tezos-client.commands
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-008-PtEdo2Zk)
+  octez-protocol-008-PtEdo2Zk-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_008_PtEdo2Zk/lib_plugin/dune b/src/proto_008_PtEdo2Zk/lib_plugin/dune
index ad6285a26c97b415ef6bd393b429980d1e1e049b..ce88cf7da63d885d5d2dff1138726f53667a560c 100644
--- a/src/proto_008_PtEdo2Zk/lib_plugin/dune
+++ b/src/proto_008_PtEdo2Zk/lib_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_protocol_plugin_008_PtEdo2Zk)
- (public_name tezos-protocol-plugin-008-PtEdo2Zk)
+ (public_name octez-protocol-008-PtEdo2Zk-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,14 +15,17 @@
   -open Tezos_protocol_008_PtEdo2Zk)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-008-PtEdo2Zk-libs))
+
 (library
  (name tezos_protocol_plugin_008_PtEdo2Zk_registerer)
- (public_name tezos-protocol-plugin-008-PtEdo2Zk-registerer)
+ (public_name
+  octez-protocol-008-PtEdo2Zk-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-008-PtEdo2Zk
-  tezos-protocol-plugin-008-PtEdo2Zk
+  octez-protocol-008-PtEdo2Zk-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_008_PtEdo2Zk/lib_plugin/index.mld b/src/proto_008_PtEdo2Zk/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..a51ddbcf60ede88b617a71a760f8eab8342f6894
--- /dev/null
+++ b/src/proto_008_PtEdo2Zk/lib_plugin/index.mld
@@ -0,0 +1,11 @@
+{0 Octez-protocol-008-PtEdo2Zk-libs: octez protocol 008-PtEdo2Zk libraries}
+
+This is a package containing some libraries related to the Tezos 008-PtEdo2Zk protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_008_PtEdo2Zk}Tezos_client_008_PtEdo2Zk}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_008_PtEdo2Zk_commands}Tezos_client_008_PtEdo2Zk_commands}
+- {{!module-Tezos_client_008_PtEdo2Zk_commands_registration}Tezos_client_008_PtEdo2Zk_commands_registration}
+- {{!module-Tezos_protocol_plugin_008_PtEdo2Zk}Tezos_protocol_plugin_008_PtEdo2Zk}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_008_PtEdo2Zk_registerer}Tezos_protocol_plugin_008_PtEdo2Zk_registerer}: Protocol plugin registerer
diff --git a/src/proto_008_PtEdoTez/lib_plugin/index.mld b/src/proto_008_PtEdoTez/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..71d23c1e4cf385a7bfeb74a3c3023e7b76e50787
--- /dev/null
+++ b/src/proto_008_PtEdoTez/lib_plugin/index.mld
@@ -0,0 +1,6 @@
+{0 Octez-protocol-008-PtEdoTez-libs: octez protocol 008-PtEdoTez libraries}
+
+This is a package containing some libraries related to the Tezos 008-PtEdoTez protocol.
+
+It contains the following libraries:
+
diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune
index 8a500d0171a5aa38f063235c514010533993285d..466e2ab08ccb7a371f7e417aaf4e2bb06f33eb4b 100644
--- a/src/proto_009_PsFLoren/lib_client/dune
+++ b/src/proto_009_PsFLoren/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_009_PsFLoren)
- (public_name tezos-client-009-PsFLoren)
+ (public_name octez-protocol-009-PsFLoren-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -13,7 +13,7 @@
   tezos-protocol-009-PsFLoren
   tezos-protocol-009-PsFLoren.lifted
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-009-PsFLoren
+  octez-protocol-009-PsFLoren-libs.tezos-protocol-plugin
   octez-libs.tezos-rpc
   uri)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune
index 76137d40bf3fc49c1f76299e87f5aa8cb255cf13..e910e67109302bc385b4076529f95f536f245d68 100644
--- a/src/proto_009_PsFLoren/lib_client_commands/dune
+++ b/src/proto_009_PsFLoren/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_009_PsFLoren_commands)
- (public_name tezos-client-009-PsFLoren.commands)
+ (public_name octez-protocol-009-PsFLoren-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -13,11 +13,11 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-009-PsFLoren
+  octez-protocol-009-PsFLoren-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-009-PsFLoren)
+  octez-protocol-009-PsFLoren-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -35,7 +35,8 @@
 
 (library
  (name tezos_client_009_PsFLoren_commands_registration)
- (public_name tezos-client-009-PsFLoren.commands-registration)
+ (public_name
+  octez-protocol-009-PsFLoren-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -44,11 +45,11 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-009-PsFLoren
+  octez-protocol-009-PsFLoren-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-009-PsFLoren.commands
+  octez-protocol-009-PsFLoren-libs.tezos-client.commands
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-009-PsFLoren)
+  octez-protocol-009-PsFLoren-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_009_PsFLoren/lib_plugin/dune b/src/proto_009_PsFLoren/lib_plugin/dune
index 17f37f0dd2d31368bed9a8ded12e16a73165880c..fc9937133632ba616b5883b9d110b8f922deafcd 100644
--- a/src/proto_009_PsFLoren/lib_plugin/dune
+++ b/src/proto_009_PsFLoren/lib_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_protocol_plugin_009_PsFLoren)
- (public_name tezos-protocol-plugin-009-PsFLoren)
+ (public_name octez-protocol-009-PsFLoren-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,14 +15,17 @@
   -open Tezos_protocol_009_PsFLoren)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-009-PsFLoren-libs))
+
 (library
  (name tezos_protocol_plugin_009_PsFLoren_registerer)
- (public_name tezos-protocol-plugin-009-PsFLoren-registerer)
+ (public_name
+  octez-protocol-009-PsFLoren-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-009-PsFLoren
-  tezos-protocol-plugin-009-PsFLoren
+  octez-protocol-009-PsFLoren-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_009_PsFLoren/lib_plugin/index.mld b/src/proto_009_PsFLoren/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..5ac49fdb9389cb69a02e105ba65f200419b2d93d
--- /dev/null
+++ b/src/proto_009_PsFLoren/lib_plugin/index.mld
@@ -0,0 +1,11 @@
+{0 Octez-protocol-009-PsFLoren-libs: octez protocol 009-PsFLoren libraries}
+
+This is a package containing some libraries related to the Tezos 009-PsFLoren protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_009_PsFLoren}Tezos_client_009_PsFLoren}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_009_PsFLoren_commands}Tezos_client_009_PsFLoren_commands}
+- {{!module-Tezos_client_009_PsFLoren_commands_registration}Tezos_client_009_PsFLoren_commands_registration}
+- {{!module-Tezos_protocol_plugin_009_PsFLoren}Tezos_protocol_plugin_009_PsFLoren}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_009_PsFLoren_registerer}Tezos_protocol_plugin_009_PsFLoren_registerer}: Protocol plugin registerer
diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune
index 13c8d2834060939c86046a4d98b984ded6bbbee4..e82ffa02cd03400a876cbe65481607b94b5c0cc0 100644
--- a/src/proto_010_PtGRANAD/lib_client/dune
+++ b/src/proto_010_PtGRANAD/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_010_PtGRANAD)
- (public_name tezos-client-010-PtGRANAD)
+ (public_name octez-protocol-010-PtGRANAD-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -13,7 +13,7 @@
   tezos-protocol-010-PtGRANAD
   tezos-protocol-010-PtGRANAD.lifted
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-010-PtGRANAD
+  octez-protocol-010-PtGRANAD-libs.tezos-protocol-plugin
   octez-libs.tezos-rpc
   uri)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune
index 84bc8716813c664ad33f1f42f2f4f8c610d39cfe..8b50469c8415b7083a6738e5ac6fb4ef2927784b 100644
--- a/src/proto_010_PtGRANAD/lib_client_commands/dune
+++ b/src/proto_010_PtGRANAD/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_010_PtGRANAD_commands)
- (public_name tezos-client-010-PtGRANAD.commands)
+ (public_name octez-protocol-010-PtGRANAD-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -13,11 +13,11 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-010-PtGRANAD
+  octez-protocol-010-PtGRANAD-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-010-PtGRANAD)
+  octez-protocol-010-PtGRANAD-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -35,7 +35,8 @@
 
 (library
  (name tezos_client_010_PtGRANAD_commands_registration)
- (public_name tezos-client-010-PtGRANAD.commands-registration)
+ (public_name
+  octez-protocol-010-PtGRANAD-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -44,11 +45,11 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-010-PtGRANAD
+  octez-protocol-010-PtGRANAD-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-010-PtGRANAD.commands
+  octez-protocol-010-PtGRANAD-libs.tezos-client.commands
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-010-PtGRANAD)
+  octez-protocol-010-PtGRANAD-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_010_PtGRANAD/lib_plugin/dune b/src/proto_010_PtGRANAD/lib_plugin/dune
index 55ebf7dfdece708db84e8ef8752731b2b6c7a096..80264e8c48af2c1d77b57570f25f4c726616f341 100644
--- a/src/proto_010_PtGRANAD/lib_plugin/dune
+++ b/src/proto_010_PtGRANAD/lib_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_protocol_plugin_010_PtGRANAD)
- (public_name tezos-protocol-plugin-010-PtGRANAD)
+ (public_name octez-protocol-010-PtGRANAD-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,14 +15,17 @@
   -open Tezos_protocol_010_PtGRANAD)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-010-PtGRANAD-libs))
+
 (library
  (name tezos_protocol_plugin_010_PtGRANAD_registerer)
- (public_name tezos-protocol-plugin-010-PtGRANAD-registerer)
+ (public_name
+  octez-protocol-010-PtGRANAD-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-010-PtGRANAD
-  tezos-protocol-plugin-010-PtGRANAD
+  octez-protocol-010-PtGRANAD-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_010_PtGRANAD/lib_plugin/index.mld b/src/proto_010_PtGRANAD/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..74daa4c5cf8cc3791fdb70834db882e0129f2f3d
--- /dev/null
+++ b/src/proto_010_PtGRANAD/lib_plugin/index.mld
@@ -0,0 +1,11 @@
+{0 Octez-protocol-010-PtGRANAD-libs: octez protocol 010-PtGRANAD libraries}
+
+This is a package containing some libraries related to the Tezos 010-PtGRANAD protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_010_PtGRANAD}Tezos_client_010_PtGRANAD}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_010_PtGRANAD_commands}Tezos_client_010_PtGRANAD_commands}
+- {{!module-Tezos_client_010_PtGRANAD_commands_registration}Tezos_client_010_PtGRANAD_commands_registration}
+- {{!module-Tezos_protocol_plugin_010_PtGRANAD}Tezos_protocol_plugin_010_PtGRANAD}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_010_PtGRANAD_registerer}Tezos_protocol_plugin_010_PtGRANAD_registerer}: Protocol plugin registerer
diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune
index e34ba63a965f188c4932b6323bc11269408b1703..f14c530ee0dda98cde729da51bd8ab5edc373cbf 100644
--- a/src/proto_011_PtHangz2/lib_client/dune
+++ b/src/proto_011_PtHangz2/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_011_PtHangz2)
- (public_name tezos-client-011-PtHangz2)
+ (public_name octez-protocol-011-PtHangz2-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,7 +15,7 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-proxy
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-011-PtHangz2
+  octez-protocol-011-PtHangz2-libs.tezos-protocol-plugin
   tezos-protocol-011-PtHangz2.parameters
   octez-libs.tezos-rpc
   uri)
diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune
index 521c2adae23854ef851b5a8a56efbde33813ef3c..3b154ae6767814f8f6ffc75215f48bfb8b50e372 100644
--- a/src/proto_011_PtHangz2/lib_client_commands/dune
+++ b/src/proto_011_PtHangz2/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_011_PtHangz2_commands)
- (public_name tezos-client-011-PtHangz2.commands)
+ (public_name octez-protocol-011-PtHangz2-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -16,11 +16,11 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-mockup-commands
   octez-shell-libs.tezos-client-base
-  tezos-client-011-PtHangz2
+  octez-protocol-011-PtHangz2-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-011-PtHangz2
+  octez-protocol-011-PtHangz2-libs.tezos-protocol-plugin
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -39,7 +39,8 @@
 
 (library
  (name tezos_client_011_PtHangz2_commands_registration)
- (public_name tezos-client-011-PtHangz2.commands-registration)
+ (public_name
+  octez-protocol-011-PtHangz2-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -48,12 +49,12 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-011-PtHangz2
+  octez-protocol-011-PtHangz2-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-011-PtHangz2.commands
-  tezos-client-011-PtHangz2.sapling
+  octez-protocol-011-PtHangz2-libs.tezos-client.commands
+  octez-protocol-011-PtHangz2-libs.tezos-client.sapling
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-011-PtHangz2)
+  octez-protocol-011-PtHangz2-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune
index 3d512e487c294f687b11150807f28624adc6d040..10833e5aed50cb1811421be1776da5584adccf33 100644
--- a/src/proto_011_PtHangz2/lib_client_sapling/dune
+++ b/src/proto_011_PtHangz2/lib_client_sapling/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_sapling_011_PtHangz2)
- (public_name tezos-client-011-PtHangz2.sapling)
+ (public_name octez-protocol-011-PtHangz2-libs.tezos-client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -12,8 +12,8 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-signer-backends
-  tezos-client-011-PtHangz2
-  tezos-client-011-PtHangz2.commands
+  octez-protocol-011-PtHangz2-libs.tezos-client
+  octez-protocol-011-PtHangz2-libs.tezos-client.commands
   tezos-protocol-011-PtHangz2)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_011_PtHangz2/lib_plugin/dune b/src/proto_011_PtHangz2/lib_plugin/dune
index 624996ff19ecba71a8d96440c9b34c2a4537a665..76b742f43d7125f439facbd5a06ba751347401ef 100644
--- a/src/proto_011_PtHangz2/lib_plugin/dune
+++ b/src/proto_011_PtHangz2/lib_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_protocol_plugin_011_PtHangz2)
- (public_name tezos-protocol-plugin-011-PtHangz2)
+ (public_name octez-protocol-011-PtHangz2-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,14 +15,17 @@
   -open Tezos_protocol_011_PtHangz2)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-011-PtHangz2-libs))
+
 (library
  (name tezos_protocol_plugin_011_PtHangz2_registerer)
- (public_name tezos-protocol-plugin-011-PtHangz2-registerer)
+ (public_name
+  octez-protocol-011-PtHangz2-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-011-PtHangz2
-  tezos-protocol-plugin-011-PtHangz2
+  octez-protocol-011-PtHangz2-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_011_PtHangz2/lib_plugin/index.mld b/src/proto_011_PtHangz2/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..5fbbb6c0613a9a21382ea8d263ce0e04fdaf45cb
--- /dev/null
+++ b/src/proto_011_PtHangz2/lib_plugin/index.mld
@@ -0,0 +1,12 @@
+{0 Octez-protocol-011-PtHangz2-libs: octez protocol 011-PtHangz2 libraries}
+
+This is a package containing some libraries related to the Tezos 011-PtHangz2 protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_011_PtHangz2}Tezos_client_011_PtHangz2}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_011_PtHangz2_commands}Tezos_client_011_PtHangz2_commands}
+- {{!module-Tezos_client_011_PtHangz2_commands_registration}Tezos_client_011_PtHangz2_commands_registration}
+- {{!module-Tezos_client_sapling_011_PtHangz2}Tezos_client_sapling_011_PtHangz2}
+- {{!module-Tezos_protocol_plugin_011_PtHangz2}Tezos_protocol_plugin_011_PtHangz2}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_011_PtHangz2_registerer}Tezos_protocol_plugin_011_PtHangz2_registerer}: Protocol plugin registerer
diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune
index e59ab264156b8daa136c7ba9d2729b0ab5c3cf86..e81302123996cd24eaeb74b34c085b4d77e8f280 100644
--- a/src/proto_012_Psithaca/lib_client/dune
+++ b/src/proto_012_Psithaca/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_012_Psithaca)
- (public_name tezos-client-012-Psithaca)
+ (public_name octez-protocol-012-Psithaca-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,7 +15,7 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-proxy
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-012-Psithaca
+  octez-protocol-012-Psithaca-libs.tezos-protocol-plugin
   tezos-protocol-012-Psithaca.parameters
   octez-libs.tezos-rpc
   uri)
diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune
index e665f15f706ec0128124c708b4b3b8bbb575c2ed..69fbc55e48525895ff3d38b23d040128f7fbb97a 100644
--- a/src/proto_012_Psithaca/lib_client_commands/dune
+++ b/src/proto_012_Psithaca/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_012_Psithaca_commands)
- (public_name tezos-client-012-Psithaca.commands)
+ (public_name octez-protocol-012-Psithaca-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -16,11 +16,11 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-mockup-commands
   octez-shell-libs.tezos-client-base
-  tezos-client-012-Psithaca
+  octez-protocol-012-Psithaca-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-012-Psithaca
+  octez-protocol-012-Psithaca-libs.tezos-protocol-plugin
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -39,7 +39,8 @@
 
 (library
  (name tezos_client_012_Psithaca_commands_registration)
- (public_name tezos-client-012-Psithaca.commands-registration)
+ (public_name
+  octez-protocol-012-Psithaca-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -48,12 +49,12 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-012-Psithaca
+  octez-protocol-012-Psithaca-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-012-Psithaca.commands
-  tezos-client-012-Psithaca.sapling
+  octez-protocol-012-Psithaca-libs.tezos-client.commands
+  octez-protocol-012-Psithaca-libs.tezos-client.sapling
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-012-Psithaca)
+  octez-protocol-012-Psithaca-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune
index b14b7b9e826d048771641184837aa16eb2c8dfb0..be1d3cac9fcf4909a2a2ad6c086d2e58646a51f4 100644
--- a/src/proto_012_Psithaca/lib_client_sapling/dune
+++ b/src/proto_012_Psithaca/lib_client_sapling/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_sapling_012_Psithaca)
- (public_name tezos-client-012-Psithaca.sapling)
+ (public_name octez-protocol-012-Psithaca-libs.tezos-client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -12,8 +12,8 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-signer-backends
-  tezos-client-012-Psithaca
-  tezos-client-012-Psithaca.commands
+  octez-protocol-012-Psithaca-libs.tezos-client
+  octez-protocol-012-Psithaca-libs.tezos-client.commands
   tezos-protocol-012-Psithaca)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_012_Psithaca/lib_plugin/dune b/src/proto_012_Psithaca/lib_plugin/dune
index eefb000a88161405f832a211e140d6b341504f07..73b2e6aecc44741f552d8452d806c130cb3a6d19 100644
--- a/src/proto_012_Psithaca/lib_plugin/dune
+++ b/src/proto_012_Psithaca/lib_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_protocol_plugin_012_Psithaca)
- (public_name tezos-protocol-plugin-012-Psithaca)
+ (public_name octez-protocol-012-Psithaca-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,14 +15,17 @@
   -open Tezos_protocol_012_Psithaca)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-012-Psithaca-libs))
+
 (library
  (name tezos_protocol_plugin_012_Psithaca_registerer)
- (public_name tezos-protocol-plugin-012-Psithaca-registerer)
+ (public_name
+  octez-protocol-012-Psithaca-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-012-Psithaca
-  tezos-protocol-plugin-012-Psithaca
+  octez-protocol-012-Psithaca-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_012_Psithaca/lib_plugin/index.mld b/src/proto_012_Psithaca/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..2029e0c982669805025a7052238048e713c9bce8
--- /dev/null
+++ b/src/proto_012_Psithaca/lib_plugin/index.mld
@@ -0,0 +1,12 @@
+{0 Octez-protocol-012-Psithaca-libs: octez protocol 012-Psithaca libraries}
+
+This is a package containing some libraries related to the Tezos 012-Psithaca protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_012_Psithaca}Tezos_client_012_Psithaca}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_012_Psithaca_commands}Tezos_client_012_Psithaca_commands}
+- {{!module-Tezos_client_012_Psithaca_commands_registration}Tezos_client_012_Psithaca_commands_registration}
+- {{!module-Tezos_client_sapling_012_Psithaca}Tezos_client_sapling_012_Psithaca}
+- {{!module-Tezos_protocol_plugin_012_Psithaca}Tezos_protocol_plugin_012_Psithaca}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_012_Psithaca_registerer}Tezos_protocol_plugin_012_Psithaca_registerer}: Protocol plugin registerer
diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune
index fe4d3b0993244671c4313c24e7469ef2f7f3bee7..a602ed7dafe1b025c5ef57ec3a039e837f60cf86 100644
--- a/src/proto_013_PtJakart/lib_client/dune
+++ b/src/proto_013_PtJakart/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_013_PtJakart)
- (public_name tezos-client-013-PtJakart)
+ (public_name octez-protocol-013-PtJakart-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,7 +15,7 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-proxy
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-013-PtJakart
+  octez-protocol-013-PtJakart-libs.tezos-protocol-plugin
   tezos-protocol-013-PtJakart.parameters
   octez-libs.tezos-rpc
   uri)
diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune
index dc9699af04a5d3ce71d172e82f797d57777ce7f3..a85220f79e8835e3ff48c2e06186a7b1ad08e6f2 100644
--- a/src/proto_013_PtJakart/lib_client_commands/dune
+++ b/src/proto_013_PtJakart/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_013_PtJakart_commands)
- (public_name tezos-client-013-PtJakart.commands)
+ (public_name octez-protocol-013-PtJakart-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -17,11 +17,11 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-mockup-commands
   octez-shell-libs.tezos-client-base
-  tezos-client-013-PtJakart
+  octez-protocol-013-PtJakart-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-013-PtJakart
+  octez-protocol-013-PtJakart-libs.tezos-protocol-plugin
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -41,7 +41,8 @@
 
 (library
  (name tezos_client_013_PtJakart_commands_registration)
- (public_name tezos-client-013-PtJakart.commands-registration)
+ (public_name
+  octez-protocol-013-PtJakart-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -51,12 +52,12 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-013-PtJakart
+  octez-protocol-013-PtJakart-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-013-PtJakart.commands
-  tezos-client-013-PtJakart.sapling
+  octez-protocol-013-PtJakart-libs.tezos-client.commands
+  octez-protocol-013-PtJakart-libs.tezos-client.sapling
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-013-PtJakart)
+  octez-protocol-013-PtJakart-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune
index be94eede52c4d728fd707ad738c6aeba49249d6b..39bc2061e5c9e795027a45ccdac68ad527849807 100644
--- a/src/proto_013_PtJakart/lib_client_sapling/dune
+++ b/src/proto_013_PtJakart/lib_client_sapling/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_sapling_013_PtJakart)
- (public_name tezos-client-013-PtJakart.sapling)
+ (public_name octez-protocol-013-PtJakart-libs.tezos-client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -12,10 +12,10 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-signer-backends
-  tezos-client-013-PtJakart
-  tezos-client-013-PtJakart.commands
+  octez-protocol-013-PtJakart-libs.tezos-client
+  octez-protocol-013-PtJakart-libs.tezos-client.commands
   tezos-protocol-013-PtJakart
-  tezos-protocol-plugin-013-PtJakart)
+  octez-protocol-013-PtJakart-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_013_PtJakart/lib_plugin/dune b/src/proto_013_PtJakart/lib_plugin/dune
index 2d9e07267e67d49617cf211a72189b8cd11dcd10..130e3b92f862113ee536fbadad5d528250c08fc6 100644
--- a/src/proto_013_PtJakart/lib_plugin/dune
+++ b/src/proto_013_PtJakart/lib_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_protocol_plugin_013_PtJakart)
- (public_name tezos-protocol-plugin-013-PtJakart)
+ (public_name octez-protocol-013-PtJakart-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,14 +15,17 @@
   -open Tezos_protocol_013_PtJakart)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-013-PtJakart-libs))
+
 (library
  (name tezos_protocol_plugin_013_PtJakart_registerer)
- (public_name tezos-protocol-plugin-013-PtJakart-registerer)
+ (public_name
+  octez-protocol-013-PtJakart-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-013-PtJakart
-  tezos-protocol-plugin-013-PtJakart
+  octez-protocol-013-PtJakart-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_013_PtJakart/lib_plugin/index.mld b/src/proto_013_PtJakart/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..35bf6cc8659f230ae5be8ab1ecd7d8ba1ed2f175
--- /dev/null
+++ b/src/proto_013_PtJakart/lib_plugin/index.mld
@@ -0,0 +1,12 @@
+{0 Octez-protocol-013-PtJakart-libs: octez protocol 013-PtJakart libraries}
+
+This is a package containing some libraries related to the Tezos 013-PtJakart protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_013_PtJakart}Tezos_client_013_PtJakart}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_013_PtJakart_commands}Tezos_client_013_PtJakart_commands}
+- {{!module-Tezos_client_013_PtJakart_commands_registration}Tezos_client_013_PtJakart_commands_registration}
+- {{!module-Tezos_client_sapling_013_PtJakart}Tezos_client_sapling_013_PtJakart}
+- {{!module-Tezos_protocol_plugin_013_PtJakart}Tezos_protocol_plugin_013_PtJakart}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_013_PtJakart_registerer}Tezos_protocol_plugin_013_PtJakart_registerer}: Protocol plugin registerer
diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune
index f1b4fad218d9f88c1b6534b85f46595a98db0475..f483aeb6c20a1b757e5167bf136ffc3db0460a44 100644
--- a/src/proto_014_PtKathma/lib_client/dune
+++ b/src/proto_014_PtKathma/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_014_PtKathma)
- (public_name tezos-client-014-PtKathma)
+ (public_name octez-protocol-014-PtKathma-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,7 +15,7 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-proxy
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-014-PtKathma
+  octez-protocol-014-PtKathma-libs.tezos-protocol-plugin
   tezos-protocol-014-PtKathma.parameters
   octez-libs.tezos-rpc
   uri)
diff --git a/src/proto_014_PtKathma/lib_client_commands/dune b/src/proto_014_PtKathma/lib_client_commands/dune
index ab549052cc318860fd132e32e23cc5324f5d3d38..3d0bbed5ba8d5e6bc14065f784db5da7ed630dc0 100644
--- a/src/proto_014_PtKathma/lib_client_commands/dune
+++ b/src/proto_014_PtKathma/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_014_PtKathma_commands)
- (public_name tezos-client-014-PtKathma.commands)
+ (public_name octez-protocol-014-PtKathma-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -17,11 +17,11 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-mockup-commands
   octez-shell-libs.tezos-client-base
-  tezos-client-014-PtKathma
+  octez-protocol-014-PtKathma-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-014-PtKathma
+  octez-protocol-014-PtKathma-libs.tezos-protocol-plugin
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -41,7 +41,8 @@
 
 (library
  (name tezos_client_014_PtKathma_commands_registration)
- (public_name tezos-client-014-PtKathma.commands-registration)
+ (public_name
+  octez-protocol-014-PtKathma-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -51,12 +52,12 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-014-PtKathma
+  octez-protocol-014-PtKathma-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-014-PtKathma.commands
-  tezos-client-014-PtKathma.sapling
+  octez-protocol-014-PtKathma-libs.tezos-client.commands
+  octez-protocol-014-PtKathma-libs.tezos-client.sapling
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-014-PtKathma)
+  octez-protocol-014-PtKathma-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_014_PtKathma/lib_client_sapling/dune b/src/proto_014_PtKathma/lib_client_sapling/dune
index 89b90b0bd77aff6c5927701a1f702bbbc2a4a0d7..f6d8d22be1652eac511d2aa24a927287e94ec8e9 100644
--- a/src/proto_014_PtKathma/lib_client_sapling/dune
+++ b/src/proto_014_PtKathma/lib_client_sapling/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_sapling_014_PtKathma)
- (public_name tezos-client-014-PtKathma.sapling)
+ (public_name octez-protocol-014-PtKathma-libs.tezos-client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -12,10 +12,10 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-signer-backends
-  tezos-client-014-PtKathma
-  tezos-client-014-PtKathma.commands
+  octez-protocol-014-PtKathma-libs.tezos-client
+  octez-protocol-014-PtKathma-libs.tezos-client.commands
   tezos-protocol-014-PtKathma
-  tezos-protocol-plugin-014-PtKathma)
+  octez-protocol-014-PtKathma-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_014_PtKathma/lib_plugin/dune b/src/proto_014_PtKathma/lib_plugin/dune
index fbeb8bc8aa15c082fd7b9f98fed55f3bc662bf7f..678f85371bc3d6e92fd20a9078e5c31be7d4126f 100644
--- a/src/proto_014_PtKathma/lib_plugin/dune
+++ b/src/proto_014_PtKathma/lib_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_protocol_plugin_014_PtKathma)
- (public_name tezos-protocol-plugin-014-PtKathma)
+ (public_name octez-protocol-014-PtKathma-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,14 +15,17 @@
   -open Tezos_protocol_014_PtKathma)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-014-PtKathma-libs))
+
 (library
  (name tezos_protocol_plugin_014_PtKathma_registerer)
- (public_name tezos-protocol-plugin-014-PtKathma-registerer)
+ (public_name
+  octez-protocol-014-PtKathma-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-014-PtKathma
-  tezos-protocol-plugin-014-PtKathma
+  octez-protocol-014-PtKathma-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_014_PtKathma/lib_plugin/index.mld b/src/proto_014_PtKathma/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..be654a87a1f7db95a5178aabd025404f96d471ba
--- /dev/null
+++ b/src/proto_014_PtKathma/lib_plugin/index.mld
@@ -0,0 +1,12 @@
+{0 Octez-protocol-014-PtKathma-libs: octez protocol 014-PtKathma libraries}
+
+This is a package containing some libraries related to the Tezos 014-PtKathma protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_014_PtKathma}Tezos_client_014_PtKathma}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_014_PtKathma_commands}Tezos_client_014_PtKathma_commands}
+- {{!module-Tezos_client_014_PtKathma_commands_registration}Tezos_client_014_PtKathma_commands_registration}
+- {{!module-Tezos_client_sapling_014_PtKathma}Tezos_client_sapling_014_PtKathma}
+- {{!module-Tezos_protocol_plugin_014_PtKathma}Tezos_protocol_plugin_014_PtKathma}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_014_PtKathma_registerer}Tezos_protocol_plugin_014_PtKathma_registerer}: Protocol plugin registerer
diff --git a/src/proto_015_PtLimaPt/lib_client/dune b/src/proto_015_PtLimaPt/lib_client/dune
index 2338222d504cafdf787618e339055d8df1c42a53..23b9cf56860bb746da62c57a80d18af214241c84 100644
--- a/src/proto_015_PtLimaPt/lib_client/dune
+++ b/src/proto_015_PtLimaPt/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_015_PtLimaPt)
- (public_name tezos-client-015-PtLimaPt)
+ (public_name octez-protocol-015-PtLimaPt-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,7 +15,7 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-proxy
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-015-PtLimaPt
+  octez-protocol-015-PtLimaPt-libs.tezos-protocol-plugin
   tezos-protocol-015-PtLimaPt.parameters
   octez-libs.tezos-rpc
   uri)
diff --git a/src/proto_015_PtLimaPt/lib_client_commands/dune b/src/proto_015_PtLimaPt/lib_client_commands/dune
index b8fcf38eccfa273607446d689af4d6632b067631..4147626f86425fba0e8f0f1867bcc90f3dae4af8 100644
--- a/src/proto_015_PtLimaPt/lib_client_commands/dune
+++ b/src/proto_015_PtLimaPt/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_015_PtLimaPt_commands)
- (public_name tezos-client-015-PtLimaPt.commands)
+ (public_name octez-protocol-015-PtLimaPt-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -17,11 +17,11 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-mockup-commands
   octez-shell-libs.tezos-client-base
-  tezos-client-015-PtLimaPt
+  octez-protocol-015-PtLimaPt-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-015-PtLimaPt
+  octez-protocol-015-PtLimaPt-libs.tezos-protocol-plugin
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -40,7 +40,8 @@
 
 (library
  (name tezos_client_015_PtLimaPt_commands_registration)
- (public_name tezos-client-015-PtLimaPt.commands-registration)
+ (public_name
+  octez-protocol-015-PtLimaPt-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -50,12 +51,12 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-015-PtLimaPt
+  octez-protocol-015-PtLimaPt-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-015-PtLimaPt.commands
-  tezos-client-015-PtLimaPt.sapling
+  octez-protocol-015-PtLimaPt-libs.tezos-client.commands
+  octez-protocol-015-PtLimaPt-libs.tezos-client.sapling
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-015-PtLimaPt)
+  octez-protocol-015-PtLimaPt-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_015_PtLimaPt/lib_client_sapling/dune b/src/proto_015_PtLimaPt/lib_client_sapling/dune
index c831e8a55974db2bc5bff25ecdc61a0c4d6d323d..cc635b408d240459fdde8aaf14312dcf3d23d908 100644
--- a/src/proto_015_PtLimaPt/lib_client_sapling/dune
+++ b/src/proto_015_PtLimaPt/lib_client_sapling/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_sapling_015_PtLimaPt)
- (public_name tezos-client-015-PtLimaPt.sapling)
+ (public_name octez-protocol-015-PtLimaPt-libs.tezos-client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -12,10 +12,10 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-signer-backends
-  tezos-client-015-PtLimaPt
-  tezos-client-015-PtLimaPt.commands
+  octez-protocol-015-PtLimaPt-libs.tezos-client
+  octez-protocol-015-PtLimaPt-libs.tezos-client.commands
   tezos-protocol-015-PtLimaPt
-  tezos-protocol-plugin-015-PtLimaPt)
+  octez-protocol-015-PtLimaPt-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_015_PtLimaPt/lib_plugin/dune b/src/proto_015_PtLimaPt/lib_plugin/dune
index a37e67e963fd5068e7d61b402b9d036979ee0610..e0f61776f645e0ae869825aff623376f1c91b9e9 100644
--- a/src/proto_015_PtLimaPt/lib_plugin/dune
+++ b/src/proto_015_PtLimaPt/lib_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_protocol_plugin_015_PtLimaPt)
- (public_name tezos-protocol-plugin-015-PtLimaPt)
+ (public_name octez-protocol-015-PtLimaPt-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,14 +15,17 @@
   -open Tezos_protocol_015_PtLimaPt)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-015-PtLimaPt-libs))
+
 (library
  (name tezos_protocol_plugin_015_PtLimaPt_registerer)
- (public_name tezos-protocol-plugin-015-PtLimaPt-registerer)
+ (public_name
+  octez-protocol-015-PtLimaPt-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-015-PtLimaPt
-  tezos-protocol-plugin-015-PtLimaPt
+  octez-protocol-015-PtLimaPt-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_015_PtLimaPt/lib_plugin/index.mld b/src/proto_015_PtLimaPt/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..5192caf132e91c15eeec4a56ce974d827d43799e
--- /dev/null
+++ b/src/proto_015_PtLimaPt/lib_plugin/index.mld
@@ -0,0 +1,12 @@
+{0 Octez-protocol-015-PtLimaPt-libs: octez protocol 015-PtLimaPt libraries}
+
+This is a package containing some libraries related to the Tezos 015-PtLimaPt protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_015_PtLimaPt}Tezos_client_015_PtLimaPt}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_015_PtLimaPt_commands}Tezos_client_015_PtLimaPt_commands}
+- {{!module-Tezos_client_015_PtLimaPt_commands_registration}Tezos_client_015_PtLimaPt_commands_registration}
+- {{!module-Tezos_client_sapling_015_PtLimaPt}Tezos_client_sapling_015_PtLimaPt}
+- {{!module-Tezos_protocol_plugin_015_PtLimaPt}Tezos_protocol_plugin_015_PtLimaPt}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_015_PtLimaPt_registerer}Tezos_protocol_plugin_015_PtLimaPt_registerer}: Protocol plugin registerer
diff --git a/src/proto_016_PtMumbai/lib_client/dune b/src/proto_016_PtMumbai/lib_client/dune
index 2f0f1b0bc06e38e11b3ae26e66f6fc69ceb9929d..815ba011c1df67ab5cbb0a61883fc025f2b6935f 100644
--- a/src/proto_016_PtMumbai/lib_client/dune
+++ b/src/proto_016_PtMumbai/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_016_PtMumbai)
- (public_name tezos-client-016-PtMumbai)
+ (public_name octez-protocol-016-PtMumbai-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,10 +15,10 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-proxy
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-016-PtMumbai
+  octez-protocol-016-PtMumbai-libs.tezos-protocol-plugin
   tezos-protocol-016-PtMumbai.parameters
   octez-libs.tezos-rpc
-  tezos-smart-rollup-016-PtMumbai
+  octez-protocol-016-PtMumbai-libs.tezos-smart-rollup
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_016_PtMumbai/lib_client_commands/dune b/src/proto_016_PtMumbai/lib_client_commands/dune
index 20b13f7980551838adff47c890d423f8eb3eda18..8f379fa2d15f1f3eb3e2c8d791f4dc07a50d3b41 100644
--- a/src/proto_016_PtMumbai/lib_client_commands/dune
+++ b/src/proto_016_PtMumbai/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_016_PtMumbai_commands)
- (public_name tezos-client-016-PtMumbai.commands)
+ (public_name octez-protocol-016-PtMumbai-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -17,11 +17,11 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-mockup-commands
   octez-shell-libs.tezos-client-base
-  tezos-client-016-PtMumbai
+  octez-protocol-016-PtMumbai-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-016-PtMumbai
+  octez-protocol-016-PtMumbai-libs.tezos-protocol-plugin
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -40,7 +40,8 @@
 
 (library
  (name tezos_client_016_PtMumbai_commands_registration)
- (public_name tezos-client-016-PtMumbai.commands-registration)
+ (public_name
+  octez-protocol-016-PtMumbai-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -50,12 +51,12 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-016-PtMumbai
+  octez-protocol-016-PtMumbai-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-016-PtMumbai.commands
-  tezos-client-016-PtMumbai.sapling
+  octez-protocol-016-PtMumbai-libs.tezos-client.commands
+  octez-protocol-016-PtMumbai-libs.tezos-client.sapling
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-016-PtMumbai)
+  octez-protocol-016-PtMumbai-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_016_PtMumbai/lib_client_sapling/dune b/src/proto_016_PtMumbai/lib_client_sapling/dune
index 214228ce4ba46c4250449503692483ae6f594f37..b5f7bf5344556389f5b70c447f296f9e402a1503 100644
--- a/src/proto_016_PtMumbai/lib_client_sapling/dune
+++ b/src/proto_016_PtMumbai/lib_client_sapling/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_sapling_016_PtMumbai)
- (public_name tezos-client-016-PtMumbai.sapling)
+ (public_name octez-protocol-016-PtMumbai-libs.tezos-client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -12,10 +12,10 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-signer-backends
-  tezos-client-016-PtMumbai
-  tezos-client-016-PtMumbai.commands
+  octez-protocol-016-PtMumbai-libs.tezos-client
+  octez-protocol-016-PtMumbai-libs.tezos-client.commands
   tezos-protocol-016-PtMumbai
-  tezos-protocol-plugin-016-PtMumbai)
+  octez-protocol-016-PtMumbai-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_016_PtMumbai/lib_layer2_utils/dune b/src/proto_016_PtMumbai/lib_layer2_utils/dune
index c42bd05364be829e6fab1a38c47496664a5d5788..3b73ad5a4cc2c70868810813fced40d58e9576e5 100644
--- a/src/proto_016_PtMumbai/lib_layer2_utils/dune
+++ b/src/proto_016_PtMumbai/lib_layer2_utils/dune
@@ -3,12 +3,12 @@
 
 (library
  (name tezos_layer2_utils_016_PtMumbai)
- (public_name tezos-layer2-utils-016-PtMumbai)
+ (public_name octez-protocol-016-PtMumbai-libs.tezos-layer2-utils)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-protocol-016-PtMumbai
-  tezos-client-016-PtMumbai)
+  octez-protocol-016-PtMumbai-libs.tezos-client)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
  (library_flags (:standard -linkall))
diff --git a/src/proto_016_PtMumbai/lib_plugin/dune b/src/proto_016_PtMumbai/lib_plugin/dune
index 811909d227fd3ae793e7de09e68b4881c2e4607c..f2b347be58945263517025b72b05a6649017adb6 100644
--- a/src/proto_016_PtMumbai/lib_plugin/dune
+++ b/src/proto_016_PtMumbai/lib_plugin/dune
@@ -3,12 +3,12 @@
 
 (library
  (name tezos_protocol_plugin_016_PtMumbai)
- (public_name tezos-protocol-plugin-016-PtMumbai)
+ (public_name octez-protocol-016-PtMumbai-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-protocol-016-PtMumbai
-  tezos-smart-rollup-016-PtMumbai)
+  octez-protocol-016-PtMumbai-libs.tezos-smart-rollup)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
@@ -17,14 +17,17 @@
   -open Tezos_smart_rollup_016_PtMumbai)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-016-PtMumbai-libs))
+
 (library
  (name tezos_protocol_plugin_016_PtMumbai_registerer)
- (public_name tezos-protocol-plugin-016-PtMumbai-registerer)
+ (public_name
+  octez-protocol-016-PtMumbai-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-016-PtMumbai
-  tezos-protocol-plugin-016-PtMumbai
+  octez-protocol-016-PtMumbai-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_016_PtMumbai/lib_plugin/index.mld b/src/proto_016_PtMumbai/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..81f99cf99bde6782422df35ba2bbcab04d76d3a6
--- /dev/null
+++ b/src/proto_016_PtMumbai/lib_plugin/index.mld
@@ -0,0 +1,15 @@
+{0 Octez-protocol-016-PtMumbai-libs: octez protocol 016-PtMumbai libraries}
+
+This is a package containing some libraries related to the Tezos 016-PtMumbai protocol.
+
+It contains the following libraries:
+
+- {{!module-Tezos_client_016_PtMumbai}Tezos_client_016_PtMumbai}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_016_PtMumbai_commands}Tezos_client_016_PtMumbai_commands}
+- {{!module-Tezos_client_016_PtMumbai_commands_registration}Tezos_client_016_PtMumbai_commands_registration}
+- {{!module-Tezos_client_sapling_016_PtMumbai}Tezos_client_sapling_016_PtMumbai}
+- {{!module-Tezos_layer2_utils_016_PtMumbai}Tezos_layer2_utils_016_PtMumbai}: Protocol specific library for Layer 2 utils
+- {{!module-Tezos_protocol_plugin_016_PtMumbai}Tezos_protocol_plugin_016_PtMumbai}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_016_PtMumbai_registerer}Tezos_protocol_plugin_016_PtMumbai_registerer}: Protocol plugin registerer
+- {{!module-Tezos_smart_rollup_016_PtMumbai}Tezos_smart_rollup_016_PtMumbai}: Protocol specific library of helpers for `tezos-smart-rollup`
+- {{!module-Tezos_smart_rollup_layer2_016_PtMumbai}Tezos_smart_rollup_layer2_016_PtMumbai}: Protocol specific library for `tezos-smart-rollup`
diff --git a/src/proto_016_PtMumbai/lib_sc_rollup/dune b/src/proto_016_PtMumbai/lib_sc_rollup/dune
index 84ed4fdac3afa00daa68d703f25c0559ce7fde96..16d4104f742df7dc8839b9a8bf1beb49ff41e48d 100644
--- a/src/proto_016_PtMumbai/lib_sc_rollup/dune
+++ b/src/proto_016_PtMumbai/lib_sc_rollup/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_smart_rollup_016_PtMumbai)
- (public_name tezos-smart-rollup-016-PtMumbai)
+ (public_name octez-protocol-016-PtMumbai-libs.tezos-smart-rollup)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune
index df9674cc9c56b9119844804cf5a5cb87d674fc30..527be9f0bcbbf875c709450bde2737f9910f1179 100644
--- a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune
+++ b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_smart_rollup_layer2_016_PtMumbai)
- (public_name tezos-smart-rollup-layer2-016-PtMumbai)
+ (public_name octez-protocol-016-PtMumbai-libs.tezos-smart-rollup-layer2)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
diff --git a/src/proto_017_PtNairob/bin_accuser/dune b/src/proto_017_PtNairob/bin_accuser/dune
index e8607a44ed9ccdb35f32f513e8f372d29c1c8163..2b4a6a46a56d9d708e4df0b3b3909cfd1890ec49 100644
--- a/src/proto_017_PtNairob/bin_accuser/dune
+++ b/src/proto_017_PtNairob/bin_accuser/dune
@@ -10,9 +10,9 @@
   octez-libs.tezos-base
   octez-libs.tezos-clic
   tezos-protocol-017-PtNairob
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-017-PtNairob-commands
+  octez-protocol-017-PtNairob-libs.tezos-baking-commands
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base-unix)
  (link_flags
diff --git a/src/proto_017_PtNairob/bin_baker/dune b/src/proto_017_PtNairob/bin_baker/dune
index 226c71e211706071998651832eae989ae362063f..fc7d1a833166805deb88e6243a5f303fea504c43 100644
--- a/src/proto_017_PtNairob/bin_baker/dune
+++ b/src/proto_017_PtNairob/bin_baker/dune
@@ -10,9 +10,9 @@
   octez-libs.tezos-base
   octez-libs.tezos-clic
   tezos-protocol-017-PtNairob
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-017-PtNairob-commands
+  octez-protocol-017-PtNairob-libs.tezos-baking-commands
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base-unix)
  (link_flags
diff --git a/src/proto_017_PtNairob/bin_sc_rollup_node/dune b/src/proto_017_PtNairob/bin_sc_rollup_node/dune
index ae61acd9e0be7c138faa065a8ec57320a52f3066..05f8e9b05a82dae24af7ba928fcf8560517b8d66 100644
--- a/src/proto_017_PtNairob/bin_sc_rollup_node/dune
+++ b/src/proto_017_PtNairob/bin_sc_rollup_node/dune
@@ -14,7 +14,7 @@
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-client-base-unix
   octez-shell-libs.tezos-client-commands
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-smart-rollup-node-lib
   octez_smart_rollup_node_PtNairob)
  (link_flags
diff --git a/src/proto_017_PtNairob/lib_benchmark/dune b/src/proto_017_PtNairob/lib_benchmark/dune
index a5e1af9187c947a4f703c507d0a679988027e402..3d92fb8b4f011bacd94c737497b03d46742d3281 100644
--- a/src/proto_017_PtNairob/lib_benchmark/dune
+++ b/src/proto_017_PtNairob/lib_benchmark/dune
@@ -16,7 +16,7 @@
   octez-libs.tezos-crypto
   tezos-protocol-017-PtNairob.parameters
   hashcons
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   prbnmcn-stats)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune
index d74f0a89d2fee3fadf9d5f6a41bede660ac8e403..f68759ec71c7c2675e66567bf5b6dec78b741346 100644
--- a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune
+++ b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune
@@ -9,7 +9,7 @@
   tezos-benchmark-type-inference-017-PtNairob
   tezos-protocol-017-PtNairob
   octez-libs.tezos-error-monad
-  tezos-client-017-PtNairob)
+  octez-protocol-017-PtNairob-libs.tezos-client)
  (link_flags
   (:standard)
   (:include %{workspace_root}/macos-link-flags.sexp))
diff --git a/src/proto_017_PtNairob/lib_benchmark/test/dune b/src/proto_017_PtNairob/lib_benchmark/test/dune
index 1da6a85b43c4ed8fb44acec97959ad421749a68b..60b27f5ac8faeb54da2bb188aac74fe600a7d5f4 100644
--- a/src/proto_017_PtNairob/lib_benchmark/test/dune
+++ b/src/proto_017_PtNairob/lib_benchmark/test/dune
@@ -15,7 +15,7 @@
   tezos-benchmark
   tezos-benchmark-type-inference-017-PtNairob
   tezos-benchmark-017-PtNairob
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-libs.tezos-error-monad
   prbnmcn-stats)
  (link_flags
diff --git a/src/proto_017_PtNairob/lib_benchmarks_proto/dune b/src/proto_017_PtNairob/lib_benchmarks_proto/dune
index 165abfc0fb28060f0e212c5cf1d705039ea56566..5e21f7e23006c3a9fecc67fceba72136f477ae11 100644
--- a/src/proto_017_PtNairob/lib_benchmarks_proto/dune
+++ b/src/proto_017_PtNairob/lib_benchmarks_proto/dune
@@ -19,10 +19,10 @@
   octez-libs.tezos-crypto
   octez-shell-libs.tezos-shell-benchmarks
   octez-libs.tezos-micheline
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-libs.tezos-sapling
-  tezos-client-017-PtNairob
-  tezos-protocol-plugin-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
   octez-proto-libs.tezos-protocol-environment)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_017_PtNairob/lib_client/dune b/src/proto_017_PtNairob/lib_client/dune
index 4dc05bc19f7f65b33402bc35b739cf9bf48512e0..dc5d1dc65fd42e5959f460d2d62651cd95ab7804 100644
--- a/src/proto_017_PtNairob/lib_client/dune
+++ b/src/proto_017_PtNairob/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_017_PtNairob)
- (public_name tezos-client-017-PtNairob)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,10 +15,10 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-proxy
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
   tezos-protocol-017-PtNairob.parameters
   octez-libs.tezos-rpc
-  tezos-smart-rollup-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-smart-rollup
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_017_PtNairob/lib_client/test/dune b/src/proto_017_PtNairob/lib_client/test/dune
index 01690a4a58f89c815a2c4433a34abde2c7fdf707..a6d0fea49fda61c814f6aaa807c3aa6fcf90d275 100644
--- a/src/proto_017_PtNairob/lib_client/test/dune
+++ b/src/proto_017_PtNairob/lib_client/test/dune
@@ -8,7 +8,7 @@
   tezt.core
   octez-libs.tezos-base
   octez-libs.tezos-micheline
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   tezos-protocol-017-PtNairob
   octez-libs.tezos-base-test-helpers
   octez-libs.tezos-test-helpers
@@ -46,7 +46,7 @@
 
 (rule
  (alias runtest)
- (package tezos-client-017-PtNairob)
+ (package octez-protocol-017-PtNairob-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_017_PtNairob/lib_client_commands/dune b/src/proto_017_PtNairob/lib_client_commands/dune
index c180b07ccb39e52004589ae20a8e981d20855e94..e5d6dde5881014aa320afe76fe108dcc732f2841 100644
--- a/src/proto_017_PtNairob/lib_client_commands/dune
+++ b/src/proto_017_PtNairob/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_017_PtNairob_commands)
- (public_name tezos-client-017-PtNairob.commands)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -17,11 +17,11 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-mockup-commands
   octez-shell-libs.tezos-client-base
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -40,7 +40,8 @@
 
 (library
  (name tezos_client_017_PtNairob_commands_registration)
- (public_name tezos-client-017-PtNairob.commands-registration)
+ (public_name
+  octez-protocol-017-PtNairob-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -50,12 +51,12 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-017-PtNairob.commands
-  tezos-client-017-PtNairob.sapling
+  octez-protocol-017-PtNairob-libs.tezos-client.commands
+  octez-protocol-017-PtNairob-libs.tezos-client.sapling
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-017-PtNairob)
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_017_PtNairob/lib_client_sapling/dune b/src/proto_017_PtNairob/lib_client_sapling/dune
index 0a4c530d8fb374b96d49be80487aabfa42f1cbce..3dd55916fd0c1b17ec021dddacde8fabc9915867 100644
--- a/src/proto_017_PtNairob/lib_client_sapling/dune
+++ b/src/proto_017_PtNairob/lib_client_sapling/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_sapling_017_PtNairob)
- (public_name tezos-client-017-PtNairob.sapling)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -12,10 +12,10 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-signer-backends
-  tezos-client-017-PtNairob
-  tezos-client-017-PtNairob.commands
+  octez-protocol-017-PtNairob-libs.tezos-client
+  octez-protocol-017-PtNairob-libs.tezos-client.commands
   tezos-protocol-017-PtNairob
-  tezos-protocol-plugin-017-PtNairob)
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_017_PtNairob/lib_dac_plugin/dune b/src/proto_017_PtNairob/lib_dac_plugin/dune
index ba5652cf46ea910217f25c0261f6b669a69fc7d3..38525963122e2daed003c2212197077629e500f0 100644
--- a/src/proto_017_PtNairob/lib_dac_plugin/dune
+++ b/src/proto_017_PtNairob/lib_dac_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_dac_017_PtNairob)
- (public_name tezos-dac-017-PtNairob)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-dac)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -11,7 +11,7 @@
   octez-libs.tezos-stdlib-unix
   tezos-dac-lib
   tezos-dac-client-lib
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   tezos-embedded-protocol-017-PtNairob
   tezos-protocol-017-PtNairob)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_017_PtNairob/lib_dac_plugin/test/dune b/src/proto_017_PtNairob/lib_dac_plugin/test/dune
index 99ac737fa20cc3b0d1cc0a12feea9466c4cde925..272c9c78e1846b9203194e71ddcb1ff0449d49e0 100644
--- a/src/proto_017_PtNairob/lib_dac_plugin/test/dune
+++ b/src/proto_017_PtNairob/lib_dac_plugin/test/dune
@@ -7,10 +7,10 @@
  (libraries
   tezt.core
   octez-libs.tezos-base
-  tezos-dac-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-dac
   tezos-protocol-017-PtNairob
   octez-libs.tezos-base-test-helpers
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   tezos-dac-lib
   tezos_dac_node_lib
   octez-alcotezt)
@@ -43,7 +43,7 @@
 
 (rule
  (alias runtest)
- (package tezos-dac-017-PtNairob)
+ (package octez-protocol-017-PtNairob-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_017_PtNairob/lib_dal/dune b/src/proto_017_PtNairob/lib_dal/dune
index c9f0144bc64e4976fcc549039870ec704024266e..393b969b56e407be7cd5bec5141766b5759fded0 100644
--- a/src/proto_017_PtNairob/lib_dal/dune
+++ b/src/proto_017_PtNairob/lib_dal/dune
@@ -3,17 +3,17 @@
 
 (library
  (name tezos_dal_017_PtNairob)
- (public_name tezos-dal-017-PtNairob)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-dal)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   octez-protocol-compiler.registerer
   octez-libs.tezos-stdlib-unix
   tezos-dal-node-lib
-  tezos-client-017-PtNairob
-  tezos-protocol-plugin-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
   tezos-embedded-protocol-017-PtNairob
-  tezos-layer2-utils-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-layer2-utils
   tezos-protocol-017-PtNairob)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_017_PtNairob/lib_dal/test/dune b/src/proto_017_PtNairob/lib_dal/test/dune
index 44d3750f814cd056dc9b30c86340ab3ce90223e4..01d949a2258d227d576cffa667986ef511080ecf 100644
--- a/src/proto_017_PtNairob/lib_dal/test/dune
+++ b/src/proto_017_PtNairob/lib_dal/test/dune
@@ -7,10 +7,10 @@
  (libraries
   tezt.core
   octez-libs.tezos-base
-  tezos-dal-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-dal
   tezos-protocol-017-PtNairob
   octez-libs.tezos-base-test-helpers
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-alcotezt)
  (library_flags (:standard -linkall))
  (flags
@@ -39,7 +39,7 @@
 
 (rule
  (alias runtest)
- (package tezos-dal-017-PtNairob)
+ (package octez-protocol-017-PtNairob-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_017_PtNairob/lib_delegate/dune b/src/proto_017_PtNairob/lib_delegate/dune
index 815bae76079a81d7a86b79cdf93f360823bb3fde..7fe116c625d1cad28bea1b137b68d8dd39aad559 100644
--- a/src/proto_017_PtNairob/lib_delegate/dune
+++ b/src/proto_017_PtNairob/lib_delegate/dune
@@ -3,18 +3,18 @@
 
 (library
  (name tezos_baking_017_PtNairob)
- (public_name tezos-baking-017-PtNairob)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-baking)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   octez-libs.tezos-clic
   tezos-version.value
   tezos-protocol-017-PtNairob
-  tezos-protocol-plugin-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-stdlib
   octez-libs.tezos-stdlib-unix
@@ -50,7 +50,7 @@
 
 (library
  (name tezos_baking_017_PtNairob_commands)
- (public_name tezos-baking-017-PtNairob-commands)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-baking-commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -59,9 +59,9 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-baking
   octez-libs.tezos-rpc
   uri)
  (library_flags (:standard -linkall))
@@ -80,7 +80,8 @@
 
 (library
  (name tezos_baking_017_PtNairob_commands_registration)
- (public_name tezos-baking-017-PtNairob-commands.registration)
+ (public_name
+  octez-protocol-017-PtNairob-libs.tezos-baking-commands.registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -88,10 +89,10 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-017-PtNairob
-  tezos-baking-017-PtNairob-commands
+  octez-protocol-017-PtNairob-libs.tezos-baking
+  octez-protocol-017-PtNairob-libs.tezos-baking-commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_017_PtNairob/lib_delegate/test/dune b/src/proto_017_PtNairob/lib_delegate/test/dune
index 9dc9f52ba254ddbc3800487a913061c7c6fe9255..a36df5f9f0a0e2a261d74bcf352706bd9aa37285 100644
--- a/src/proto_017_PtNairob/lib_delegate/test/dune
+++ b/src/proto_017_PtNairob/lib_delegate/test/dune
@@ -8,11 +8,11 @@
   tezt.core
   octez-libs.tezos-base
   octez-libs.tezos-micheline
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   tezos-protocol-017-PtNairob
   octez-libs.tezos-base-test-helpers
-  tezos-baking-017-PtNairob.mockup-simulator
-  tezos-baking-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-bakings.mockup-simulator
+  octez-protocol-017-PtNairob-libs.tezos-baking
   tezos-protocol-017-PtNairob.parameters
   octez-libs.tezos-crypto
   octez-alcotezt
@@ -46,7 +46,7 @@
 
 (rule
  (alias runtest)
- (package tezos-baking-017-PtNairob)
+ (package octez-protocol-017-PtNairob-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune b/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune
index 18efa4dcc847479388feb4a19eaa9fe1802569d6..3433f8b2190d388dd234a2b0c6e1517b6e7c1eb8 100644
--- a/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune
@@ -3,20 +3,20 @@
 
 (library
  (name tezos_017_PtNairob_mockup_simulator)
- (public_name tezos-baking-017-PtNairob.mockup-simulator)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-bakings.mockup-simulator)
  (libraries
   octez-libs.tezos-base
   tezos-protocol-017-PtNairob
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-baking
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base-unix
   tezos-protocol-017-PtNairob.parameters
   octez-shell-libs.tezos-mockup
   octez-shell-libs.tezos-mockup-proxy
   octez-shell-libs.tezos-mockup-commands
-  tezos-baking-017-PtNairob.tenderbrute)
+  octez-protocol-017-PtNairob-libs.tezos-baking.tenderbrute)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune
index d276d1ebbf822f6476e198fe0f12250f24c2b22c..faa6848b679ca1335ad7a1b5b62391cf56003e7c 100644
--- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune
+++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune
@@ -6,9 +6,9 @@
  (libraries
   octez-libs.tezos-base
   octez-shell-libs.tezos-client-base
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   tezos-protocol-017-PtNairob
-  tezos-baking-017-PtNairob.tenderbrute)
+  octez-protocol-017-PtNairob-libs.tezos-baking.tenderbrute)
  (link_flags
   (:standard)
   (:include %{workspace_root}/macos-link-flags.sexp)
diff --git a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune
index 98f3afed4d73fab076c6a24d70963144d1ec91fb..80f234553799746cd90789d22e1675ec6d63e3bd 100644
--- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune
+++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune
@@ -3,14 +3,14 @@
 
 (library
  (name tenderbrute_017_PtNairob)
- (public_name tezos-baking-017-PtNairob.tenderbrute)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-baking.tenderbrute)
  (libraries
   data-encoding
   octez-libs.tezos-base
   octez-libs.tezos-base.unix
   tezos-protocol-017-PtNairob
   octez-shell-libs.tezos-client-base
-  tezos-client-017-PtNairob)
+  octez-protocol-017-PtNairob-libs.tezos-client)
  (flags
   (:standard)
   -open Data_encoding
diff --git a/src/proto_017_PtNairob/lib_layer2_utils/dune b/src/proto_017_PtNairob/lib_layer2_utils/dune
index bde5ef90e832e6c530f18635e3e370e6de943235..eaf9ebad48377a75040c86f234648011b80d4131 100644
--- a/src/proto_017_PtNairob/lib_layer2_utils/dune
+++ b/src/proto_017_PtNairob/lib_layer2_utils/dune
@@ -3,12 +3,12 @@
 
 (library
  (name tezos_layer2_utils_017_PtNairob)
- (public_name tezos-layer2-utils-017-PtNairob)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-layer2-utils)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-protocol-017-PtNairob
-  tezos-client-017-PtNairob)
+  octez-protocol-017-PtNairob-libs.tezos-client)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
  (library_flags (:standard -linkall))
diff --git a/src/proto_017_PtNairob/lib_plugin/dune b/src/proto_017_PtNairob/lib_plugin/dune
index e76a6acbd53436eb3dd0a54861ac1e3cd40bdd56..b6616e77147c945215ba23a081e27fc14a47d78e 100644
--- a/src/proto_017_PtNairob/lib_plugin/dune
+++ b/src/proto_017_PtNairob/lib_plugin/dune
@@ -3,12 +3,12 @@
 
 (library
  (name tezos_protocol_plugin_017_PtNairob)
- (public_name tezos-protocol-plugin-017-PtNairob)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-protocol-017-PtNairob
-  tezos-smart-rollup-017-PtNairob)
+  octez-protocol-017-PtNairob-libs.tezos-smart-rollup)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
@@ -17,14 +17,17 @@
   -open Tezos_smart_rollup_017_PtNairob)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-017-PtNairob-libs))
+
 (library
  (name tezos_protocol_plugin_017_PtNairob_registerer)
- (public_name tezos-protocol-plugin-017-PtNairob-registerer)
+ (public_name
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-017-PtNairob
-  tezos-protocol-plugin-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_017_PtNairob/lib_plugin/index.mld b/src/proto_017_PtNairob/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..57bd28e1f3ceaa637ce057d85221575768e772b6
--- /dev/null
+++ b/src/proto_017_PtNairob/lib_plugin/index.mld
@@ -0,0 +1,23 @@
+{0 Octez-protocol-017-PtNairob-libs: octez protocol 017-PtNairob libraries}
+
+This is a package containing some libraries related to the Tezos 017-PtNairob protocol.
+
+It contains the following libraries:
+
+- {{!module-Tenderbrute_017_PtNairob}Tenderbrute_017_PtNairob}
+- {{!module-Tezos_017_PtNairob_mockup_simulator}Tezos_017_PtNairob_mockup_simulator}
+- {{!module-Tezos_017_PtNairob_test_helpers}Tezos_017_PtNairob_test_helpers}: Protocol testing framework
+- {{!module-Tezos_baking_017_PtNairob}Tezos_baking_017_PtNairob}: Base library for `tezos-baker/accuser`
+- {{!module-Tezos_baking_017_PtNairob_commands}Tezos_baking_017_PtNairob_commands}: Protocol-specific commands for baking
+- {{!module-Tezos_baking_017_PtNairob_commands_registration}Tezos_baking_017_PtNairob_commands_registration}
+- {{!module-Tezos_client_017_PtNairob}Tezos_client_017_PtNairob}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_017_PtNairob_commands}Tezos_client_017_PtNairob_commands}
+- {{!module-Tezos_client_017_PtNairob_commands_registration}Tezos_client_017_PtNairob_commands_registration}
+- {{!module-Tezos_client_sapling_017_PtNairob}Tezos_client_sapling_017_PtNairob}
+- {{!module-Tezos_dac_017_PtNairob}Tezos_dac_017_PtNairob}: Protocol specific library for the Data availability Committee
+- {{!module-Tezos_dal_017_PtNairob}Tezos_dal_017_PtNairob}: Protocol specific library for the Data availability Layer
+- {{!module-Tezos_layer2_utils_017_PtNairob}Tezos_layer2_utils_017_PtNairob}: Protocol specific library for Layer 2 utils
+- {{!module-Tezos_protocol_plugin_017_PtNairob}Tezos_protocol_plugin_017_PtNairob}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_017_PtNairob_registerer}Tezos_protocol_plugin_017_PtNairob_registerer}: Protocol plugin registerer
+- {{!module-Tezos_smart_rollup_017_PtNairob}Tezos_smart_rollup_017_PtNairob}: Protocol specific library of helpers for `tezos-smart-rollup`
+- {{!module-Tezos_smart_rollup_layer2_017_PtNairob}Tezos_smart_rollup_layer2_017_PtNairob}: Protocol specific library for `tezos-smart-rollup`
diff --git a/src/proto_017_PtNairob/lib_plugin/test/dune b/src/proto_017_PtNairob/lib_plugin/test/dune
index 2f35c57011d27a3e46a99d595aaaa7925d490b7b..346bb66dd232972bff93b56751d22a1aca909cb9 100644
--- a/src/proto_017_PtNairob/lib_plugin/test/dune
+++ b/src/proto_017_PtNairob/lib_plugin/test/dune
@@ -14,10 +14,10 @@
   qcheck-alcotest
   octez-libs.tezos-stdlib-unix
   octez-libs.tezos-micheline
-  tezos-protocol-plugin-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
   tezos-protocol-017-PtNairob
   tezos-protocol-017-PtNairob.parameters
-  tezos-017-PtNairob-test-helpers)
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -54,7 +54,7 @@
 
 (rule
  (alias runtest)
- (package tezos-protocol-plugin-017-PtNairob-tests)
+ (package octez-protocol-017-PtNairob-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune
index 819c724803be625b1b8bb6d4bbc1e8f207a15483..23c26674b8ea54e140d8e5974ab9b23c65749209 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_017_PtNairob_test_helpers)
- (public_name tezos-017-PtNairob-test-helpers)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-test-helpers)
  (instrumentation (backend bisect_ppx))
  (libraries
   qcheck-alcotest
@@ -12,10 +12,10 @@
   octez-libs.tezos-micheline
   octez-libs.tezos-stdlib-unix
   tezos-protocol-017-PtNairob
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   tezos-protocol-017-PtNairob.parameters
   octez-proto-libs.tezos-protocol-environment
-  tezos-protocol-plugin-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-shell-services
   octez-libs.octez-plompiler
   octez-libs.tezos-crypto-dal)
diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune
index 287db929d79c3f17db6cac12c962fe87985f1bc4..4ac41113e9b2c163ea97636f3bd25bca2245ff26 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune
@@ -10,10 +10,10 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-017-PtNairob
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
   tezos-protocol-017-PtNairob.parameters
-  tezos-protocol-plugin-017-PtNairob)
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/dune
index 1c83d9543f3cda8c84c091127f91626a65f8c8f2..76c1fcb214ece065f185b2534b5cf8dc77f58eb4 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/dune
@@ -10,10 +10,10 @@
   octez-libs.tezos-context
   octez-alcotezt
   octez-libs.tezos-base
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   tezos-protocol-017-PtNairob
   tezos-protocol-017-PtNairob.parameters
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune
index 8034665903fd9625c62a8dba8dfb42f1928c3b32..6e0324028af005cfd3cbf827652f9eb3ee9f2b37 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune
@@ -9,7 +9,7 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-017-PtNairob
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune
index e6d3fc74a6cf2003353ba3f9c4a73db3b93ec69e..57a7868e8f20cef295a8f4f6769d6ae0493a68e8 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune
@@ -10,14 +10,14 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-017-PtNairob
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   tezos-benchmark
   octez-libs.tezos-micheline
   tezos-benchmark-017-PtNairob
   tezos-benchmark-type-inference-017-PtNairob
-  tezos-protocol-plugin-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
   tezos-protocol-017-PtNairob.parameters)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune
index 82cc972964366a6df9b9d777e1de5d07b19f99a8..425ba5b936684a8712ebe06a131000cd6a890ea3 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune
@@ -10,10 +10,10 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-017-PtNairob
-  tezos-client-017-PtNairob
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-client
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
-  tezos-protocol-plugin-017-PtNairob)
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune
index d8ccbf7c96ccea7029202b6de0a76a7e2b894eb0..362412064f4e11eb0368cd97cd23ac39b4f3bb6d 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune
@@ -10,11 +10,11 @@
   octez-libs.tezos-base
   tezos-protocol-017-PtNairob
   qcheck-alcotest
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-libs.tezos-test-helpers
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
-  tezos-protocol-plugin-017-PtNairob)
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune
index f6696e6ac7feae8c6d9e24f6b31d2f1bfa52d9ed..f982de7149076b98061c90901dcf243d12d47e07 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune
@@ -8,17 +8,17 @@
   tezt.core
   octez-libs.tezos-base
   octez-libs.tezos-micheline
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   tezos-protocol-017-PtNairob
   octez-libs.tezos-context.merkle_proof_encoding
   octez-libs.tezos-test-helpers
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-alcotezt
   qcheck-alcotest
   tezos-benchmark
   tezos-benchmark-017-PtNairob
   tezos-benchmark-type-inference-017-PtNairob
-  tezos-smart-rollup-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-smart-rollup
   octez-libs.tezos-crypto-dal
   octez-libs.tezos-base-test-helpers
   tezos-protocol-017-PtNairob.parameters)
diff --git a/src/proto_017_PtNairob/lib_protocol/test/regression/dune b/src/proto_017_PtNairob/lib_protocol/test/regression/dune
index f0fee8ae0d69c3653615c7669a53b885057f8fe7..87f64b87dd337b13ecd051cb27b0ee0e952bf2e9 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/regression/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/regression/dune
@@ -9,9 +9,9 @@
   octez-libs.tezos-base
   tezt-tezos
   tezos-protocol-017-PtNairob
-  tezos-client-017-PtNairob
-  tezos-protocol-plugin-017-PtNairob
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-client
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-libs.tezos-micheline)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_017_PtNairob/lib_protocol/test/unit/dune b/src/proto_017_PtNairob/lib_protocol/test/unit/dune
index ce351a0bb733db64320b0e31bac2d36c22fefdc0..c81c463dc80716d246a6442b2d8ba13e18329479 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/unit/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/unit/dune
@@ -9,14 +9,14 @@
   octez-libs.tezos-base
   octez-libs.tezos-base-test-helpers
   octez-libs.tezos-micheline
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-shell-libs.tezos-client-base
   tezos-protocol-017-PtNairob.parameters
   octez-proto-libs.tezos-protocol-environment
   octez-libs.tezos-stdlib-unix
   tezos-protocol-017-PtNairob
   octez-libs.tezos-test-helpers
-  tezos-017-PtNairob-test-helpers
+  octez-protocol-017-PtNairob-libs.tezos-test-helpers
   octez-alcotezt
   octez-l2-libs.tezos-scoru-wasm-helpers
   octez-libs.tezos-stdlib
diff --git a/src/proto_017_PtNairob/lib_sc_rollup/dune b/src/proto_017_PtNairob/lib_sc_rollup/dune
index 99c64d8a6940c4113c7f4f4674f9067cef4a7c9c..4073eff0652c416689d458c4b6e065f2f07aa0f4 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_smart_rollup_017_PtNairob)
- (public_name tezos-smart-rollup-017-PtNairob)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-smart-rollup)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
diff --git a/src/proto_017_PtNairob/lib_sc_rollup_client/dune b/src/proto_017_PtNairob/lib_sc_rollup_client/dune
index 3e4d8be00aedec7c40e963d149e61d94f27765e8..3a2aa33687267a37d52d31c3563cc49654532c1b 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup_client/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup_client/dune
@@ -11,10 +11,10 @@
   octez-shell-libs.tezos-client-commands
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-client-base-unix
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-l2-libs.octez-smart-rollup
-  tezos-smart-rollup-017-PtNairob
-  tezos-smart-rollup-layer2-017-PtNairob)
+  octez-protocol-017-PtNairob-libs.tezos-smart-rollup
+  octez-protocol-017-PtNairob-libs.tezos-smart-rollup-layer2)
  (flags
   (:standard)
   -open Tezos_base
diff --git a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune
index e9beac4bda1815a75e7b6449f5b60908452301b2..96ffe4464c37fab5b2ef8477abe805cd1bf4c9d2 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_smart_rollup_layer2_017_PtNairob)
- (public_name tezos-smart-rollup-layer2-017-PtNairob)
+ (public_name octez-protocol-017-PtNairob-libs.tezos-smart-rollup-layer2)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/dune
index cb3f37b2d77942e9681d32f700b8a7643405c48d..a163eaeb933e70d980c24e55e40ca9a8019b9205 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup_node/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dune
@@ -10,11 +10,11 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-client-base-unix
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-libs.tezos-context.encoding
   octez-libs.tezos-context.helpers
   tezos-protocol-017-PtNairob
-  tezos-protocol-plugin-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-protocol-plugin
   tezos-protocol-017-PtNairob.parameters
   octez-libs.tezos-rpc
   octez-libs.tezos-rpc-http
@@ -25,9 +25,9 @@
   tezos-dac-lib
   octez-shell-libs.tezos-shell-services
   octez-l2-libs.octez-smart-rollup
-  tezos-smart-rollup-017-PtNairob
-  tezos-smart-rollup-layer2-017-PtNairob
-  tezos-layer2-utils-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-smart-rollup
+  octez-protocol-017-PtNairob-libs.tezos-smart-rollup-layer2
+  octez-protocol-017-PtNairob-libs.tezos-layer2-utils
   octez-l2-libs.tezos_layer2_store
   octez-crawler
   octez-libs.tezos-tree-encoding
diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune
index a30db7c448664b12d1d479e54985f72916578b68..28bcda8ba8207d8952565cc824e7b75733f2c64d 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune
@@ -9,7 +9,7 @@
   octez-libs.tezos-base
   tezos-protocol-017-PtNairob
   octez-libs.tezos-test-helpers
-  tezos-smart-rollup-layer2-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-smart-rollup-layer2
   octez_smart_rollup_node_PtNairob
   octez-alcotezt
   octez_smart_rollup_node_PtNairob_test_helpers)
diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune
index a7893edb76a0bc8ccf5f73bd0ee3cd7a4285995a..a02ee5c07f4a7d170b5c90fedde809a5b212db66 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune
@@ -9,12 +9,12 @@
   octez-libs.tezos-base
   tezos-protocol-017-PtNairob
   tezos-protocol-017-PtNairob.parameters
-  tezos-client-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-client
   octez-libs.tezos-test-helpers
   qcheck-alcotest
   qcheck-core
   logs.lwt
-  tezos-smart-rollup-layer2-017-PtNairob
+  octez-protocol-017-PtNairob-libs.tezos-smart-rollup-layer2
   octez_smart_rollup_node_PtNairob
   octez-alcotezt)
  (flags
diff --git a/src/proto_018_Proxford/bin_accuser/dune b/src/proto_018_Proxford/bin_accuser/dune
index 31fb64128443441269ef92207c51f23d99ce97c9..653e76514609a67934f4849e32edb1b03e836662 100644
--- a/src/proto_018_Proxford/bin_accuser/dune
+++ b/src/proto_018_Proxford/bin_accuser/dune
@@ -10,9 +10,9 @@
   octez-libs.tezos-base
   octez-libs.tezos-clic
   tezos-protocol-018-Proxford
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-018-Proxford-commands
+  octez-protocol-018-Proxford-libs.tezos-baking-commands
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base-unix)
  (link_flags
diff --git a/src/proto_018_Proxford/bin_baker/dune b/src/proto_018_Proxford/bin_baker/dune
index 07fa75445586b0aad9dab83bbe657e6f2cb47712..0296501dca676ac454b0e8fe4abda1428af4581a 100644
--- a/src/proto_018_Proxford/bin_baker/dune
+++ b/src/proto_018_Proxford/bin_baker/dune
@@ -10,9 +10,9 @@
   octez-libs.tezos-base
   octez-libs.tezos-clic
   tezos-protocol-018-Proxford
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-018-Proxford-commands
+  octez-protocol-018-Proxford-libs.tezos-baking-commands
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base-unix)
  (link_flags
diff --git a/src/proto_018_Proxford/bin_sc_rollup_node/dune b/src/proto_018_Proxford/bin_sc_rollup_node/dune
index 2c32e311bf41b46d1aa2c45208a22a5772e613e0..779b3b3126547126c0d764f193eab721b8b59331 100644
--- a/src/proto_018_Proxford/bin_sc_rollup_node/dune
+++ b/src/proto_018_Proxford/bin_sc_rollup_node/dune
@@ -14,7 +14,7 @@
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-client-base-unix
   octez-shell-libs.tezos-client-commands
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-smart-rollup-node-lib
   octez_smart_rollup_node_Proxford)
  (link_flags
diff --git a/src/proto_018_Proxford/lib_benchmark/dune b/src/proto_018_Proxford/lib_benchmark/dune
index 312cc0b40f27d1165bdb05dcfb22c1e7dd4bb57e..47b01947ec39b2057b54d8a87396e50dd220f64d 100644
--- a/src/proto_018_Proxford/lib_benchmark/dune
+++ b/src/proto_018_Proxford/lib_benchmark/dune
@@ -16,7 +16,7 @@
   octez-libs.tezos-crypto
   tezos-protocol-018-Proxford.parameters
   hashcons
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   prbnmcn-stats)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune
index b0ff55b7d6d2a46c3d80b29e2cb88620a8748bb9..84392c0e5035d430b1d7140be3474f0ad8c077af 100644
--- a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune
+++ b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune
@@ -9,7 +9,7 @@
   tezos-benchmark-type-inference-018-Proxford
   tezos-protocol-018-Proxford
   octez-libs.tezos-error-monad
-  tezos-client-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-client)
  (link_flags
   (:standard)
   (:include %{workspace_root}/macos-link-flags.sexp))
diff --git a/src/proto_018_Proxford/lib_benchmark/test/dune b/src/proto_018_Proxford/lib_benchmark/test/dune
index c638edbcbf7242adabd747a172036003538e6b1d..ccd3017661f8a66415e5f853593bdbf02b34c7e2 100644
--- a/src/proto_018_Proxford/lib_benchmark/test/dune
+++ b/src/proto_018_Proxford/lib_benchmark/test/dune
@@ -15,7 +15,7 @@
   tezos-benchmark
   tezos-benchmark-type-inference-018-Proxford
   tezos-benchmark-018-Proxford
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-libs.tezos-error-monad
   prbnmcn-stats)
  (link_flags
diff --git a/src/proto_018_Proxford/lib_benchmarks_proto/dune b/src/proto_018_Proxford/lib_benchmarks_proto/dune
index 200328e3b934b54ae67cd294b0031fcc316bd3fa..11adaaccc10d8e15d2f02a6ff7694a0eb7a1c7fe 100644
--- a/src/proto_018_Proxford/lib_benchmarks_proto/dune
+++ b/src/proto_018_Proxford/lib_benchmarks_proto/dune
@@ -19,10 +19,10 @@
   octez-libs.tezos-crypto
   octez-shell-libs.tezos-shell-benchmarks
   octez-libs.tezos-micheline
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-libs.tezos-sapling
-  tezos-client-018-Proxford
-  tezos-protocol-plugin-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
   octez-proto-libs.tezos-protocol-environment)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_018_Proxford/lib_client/dune b/src/proto_018_Proxford/lib_client/dune
index 951f1b12dbf41a70683fc0dca2645adfc57292c6..97d9e582c61b92323bd465c18578b84ed365dfee 100644
--- a/src/proto_018_Proxford/lib_client/dune
+++ b/src/proto_018_Proxford/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_018_Proxford)
- (public_name tezos-client-018-Proxford)
+ (public_name octez-protocol-018-Proxford-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,10 +15,10 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-proxy
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
   tezos-protocol-018-Proxford.parameters
   octez-libs.tezos-rpc
-  tezos-smart-rollup-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-smart-rollup
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_018_Proxford/lib_client/test/dune b/src/proto_018_Proxford/lib_client/test/dune
index 3f3e276d10533d437fa419e0c465e541082e0fdc..675208fc25914a9951971d1067e9f697afc3fe48 100644
--- a/src/proto_018_Proxford/lib_client/test/dune
+++ b/src/proto_018_Proxford/lib_client/test/dune
@@ -8,7 +8,7 @@
   tezt.core
   octez-libs.tezos-base
   octez-libs.tezos-micheline
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   tezos-protocol-018-Proxford
   octez-libs.tezos-base-test-helpers
   octez-libs.tezos-test-helpers
@@ -46,7 +46,7 @@
 
 (rule
  (alias runtest)
- (package tezos-client-018-Proxford)
+ (package octez-protocol-018-Proxford-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_018_Proxford/lib_client_commands/dune b/src/proto_018_Proxford/lib_client_commands/dune
index 6d36d8359145ab5c72c4ce7b973898445b1873d0..05f19e3d542a98177fabe2acf138116ba6307674 100644
--- a/src/proto_018_Proxford/lib_client_commands/dune
+++ b/src/proto_018_Proxford/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_018_Proxford_commands)
- (public_name tezos-client-018-Proxford.commands)
+ (public_name octez-protocol-018-Proxford-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -17,11 +17,11 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-mockup-commands
   octez-shell-libs.tezos-client-base
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -40,7 +40,8 @@
 
 (library
  (name tezos_client_018_Proxford_commands_registration)
- (public_name tezos-client-018-Proxford.commands-registration)
+ (public_name
+  octez-protocol-018-Proxford-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -50,12 +51,12 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-018-Proxford.commands
-  tezos-client-018-Proxford.sapling
+  octez-protocol-018-Proxford-libs.tezos-client.commands
+  octez-protocol-018-Proxford-libs.tezos-client.sapling
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_018_Proxford/lib_client_sapling/dune b/src/proto_018_Proxford/lib_client_sapling/dune
index 27cdc3ab74f39908fb6c9bc8cfe73fa99bb4f017..607955aed34f8c4f67f591762e52e5fd4a582b31 100644
--- a/src/proto_018_Proxford/lib_client_sapling/dune
+++ b/src/proto_018_Proxford/lib_client_sapling/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_sapling_018_Proxford)
- (public_name tezos-client-018-Proxford.sapling)
+ (public_name octez-protocol-018-Proxford-libs.tezos-client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -12,10 +12,10 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-signer-backends
-  tezos-client-018-Proxford
-  tezos-client-018-Proxford.commands
+  octez-protocol-018-Proxford-libs.tezos-client
+  octez-protocol-018-Proxford-libs.tezos-client.commands
   tezos-protocol-018-Proxford
-  tezos-protocol-plugin-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_018_Proxford/lib_dac_plugin/dune b/src/proto_018_Proxford/lib_dac_plugin/dune
index 05c3500c4f8e34b52de2f616ee45fa32ea76e7e5..bf0faec05307d9a257e18e718ea2c18f1d52fb44 100644
--- a/src/proto_018_Proxford/lib_dac_plugin/dune
+++ b/src/proto_018_Proxford/lib_dac_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_dac_018_Proxford)
- (public_name tezos-dac-018-Proxford)
+ (public_name octez-protocol-018-Proxford-libs.tezos-dac)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -11,7 +11,7 @@
   octez-libs.tezos-stdlib-unix
   tezos-dac-lib
   tezos-dac-client-lib
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   tezos-embedded-protocol-018-Proxford
   tezos-protocol-018-Proxford)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_018_Proxford/lib_dac_plugin/test/dune b/src/proto_018_Proxford/lib_dac_plugin/test/dune
index 9dc2f4065ed82cf52e7435c0c0f1ff4e649b02ee..39a8f60e8cf57b7c74928f84e776f75860293504 100644
--- a/src/proto_018_Proxford/lib_dac_plugin/test/dune
+++ b/src/proto_018_Proxford/lib_dac_plugin/test/dune
@@ -7,10 +7,10 @@
  (libraries
   tezt.core
   octez-libs.tezos-base
-  tezos-dac-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-dac
   tezos-protocol-018-Proxford
   octez-libs.tezos-base-test-helpers
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   tezos-dac-lib
   tezos_dac_node_lib
   octez-alcotezt)
@@ -43,7 +43,7 @@
 
 (rule
  (alias runtest)
- (package tezos-dac-018-Proxford)
+ (package octez-protocol-018-Proxford-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_018_Proxford/lib_dal/dune b/src/proto_018_Proxford/lib_dal/dune
index a0807bb38471cdf42fb5cb9e862ab711d6c2bafa..c356cc389498a9f44d3f9251635df03260e52e6f 100644
--- a/src/proto_018_Proxford/lib_dal/dune
+++ b/src/proto_018_Proxford/lib_dal/dune
@@ -3,17 +3,17 @@
 
 (library
  (name tezos_dal_018_Proxford)
- (public_name tezos-dal-018-Proxford)
+ (public_name octez-protocol-018-Proxford-libs.tezos-dal)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   octez-protocol-compiler.registerer
   octez-libs.tezos-stdlib-unix
   tezos-dal-node-lib
-  tezos-client-018-Proxford
-  tezos-protocol-plugin-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
   tezos-embedded-protocol-018-Proxford
-  tezos-layer2-utils-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-layer2-utils
   tezos-protocol-018-Proxford)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_018_Proxford/lib_dal/test/dune b/src/proto_018_Proxford/lib_dal/test/dune
index af55d70898515f25b3563917eb633f198f38a7a8..34c011f4fb54980bff93535c2c61eeaf8df828a4 100644
--- a/src/proto_018_Proxford/lib_dal/test/dune
+++ b/src/proto_018_Proxford/lib_dal/test/dune
@@ -7,10 +7,10 @@
  (libraries
   tezt.core
   octez-libs.tezos-base
-  tezos-dal-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-dal
   tezos-protocol-018-Proxford
   octez-libs.tezos-base-test-helpers
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-alcotezt)
  (library_flags (:standard -linkall))
  (flags
@@ -39,7 +39,7 @@
 
 (rule
  (alias runtest)
- (package tezos-dal-018-Proxford)
+ (package octez-protocol-018-Proxford-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_018_Proxford/lib_delegate/dune b/src/proto_018_Proxford/lib_delegate/dune
index 9758f854351e3e5e2d30fcc42cf67c53138df74a..d2972213601e870fb9484537bd4cf661fe6e7f81 100644
--- a/src/proto_018_Proxford/lib_delegate/dune
+++ b/src/proto_018_Proxford/lib_delegate/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_baking_018_Proxford)
- (public_name tezos-baking-018-Proxford)
+ (public_name octez-protocol-018-Proxford-libs.tezos-baking)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -11,11 +11,11 @@
   tezos-version.value
   tezos-protocol-018-Proxford
   tezos-protocol-018-Proxford.lifted
-  tezos-protocol-plugin-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-stdlib
   octez-libs.tezos-stdlib-unix
@@ -52,7 +52,7 @@
 
 (library
  (name tezos_baking_018_Proxford_commands)
- (public_name tezos-baking-018-Proxford-commands)
+ (public_name octez-protocol-018-Proxford-libs.tezos-baking-commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -62,9 +62,9 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-baking
   octez-libs.tezos-rpc
   uri)
  (library_flags (:standard -linkall))
@@ -84,7 +84,8 @@
 
 (library
  (name tezos_baking_018_Proxford_commands_registration)
- (public_name tezos-baking-018-Proxford-commands.registration)
+ (public_name
+  octez-protocol-018-Proxford-libs.tezos-baking-commands.registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -92,10 +93,10 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-018-Proxford
-  tezos-baking-018-Proxford-commands
+  octez-protocol-018-Proxford-libs.tezos-baking
+  octez-protocol-018-Proxford-libs.tezos-baking-commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_018_Proxford/lib_delegate/test/dune b/src/proto_018_Proxford/lib_delegate/test/dune
index a4f148550672a2567759896aa524f0ee756e8233..100a15a98a4c0b33841d704a951df3b6bfd1c7b2 100644
--- a/src/proto_018_Proxford/lib_delegate/test/dune
+++ b/src/proto_018_Proxford/lib_delegate/test/dune
@@ -8,11 +8,11 @@
   tezt.core
   octez-libs.tezos-base
   octez-libs.tezos-micheline
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   tezos-protocol-018-Proxford
   octez-libs.tezos-base-test-helpers
-  tezos-baking-018-Proxford.mockup-simulator
-  tezos-baking-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-bakings.mockup-simulator
+  octez-protocol-018-Proxford-libs.tezos-baking
   tezos-protocol-018-Proxford.parameters
   octez-libs.tezos-crypto
   octez-alcotezt
@@ -46,7 +46,7 @@
 
 (rule
  (alias runtest)
- (package tezos-baking-018-Proxford)
+ (package octez-protocol-018-Proxford-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune b/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune
index a0ae63f100443dac0282e2c7c8fab2ad5c656ddc..a1e1c37eb5e794207264819ae961d2582bb0dae1 100644
--- a/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune
@@ -3,20 +3,20 @@
 
 (library
  (name tezos_018_Proxford_mockup_simulator)
- (public_name tezos-baking-018-Proxford.mockup-simulator)
+ (public_name octez-protocol-018-Proxford-libs.tezos-bakings.mockup-simulator)
  (libraries
   octez-libs.tezos-base
   tezos-protocol-018-Proxford
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-baking
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base-unix
   tezos-protocol-018-Proxford.parameters
   octez-shell-libs.tezos-mockup
   octez-shell-libs.tezos-mockup-proxy
   octez-shell-libs.tezos-mockup-commands
-  tezos-baking-018-Proxford.tenderbrute)
+  octez-protocol-018-Proxford-libs.tezos-baking.tenderbrute)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune
index 6d38d37d65cff72e92ed0b019319652a3c541973..7cf3218d8bcb506a5c5052b40feaece3a28a7fa4 100644
--- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune
+++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune
@@ -6,9 +6,9 @@
  (libraries
   octez-libs.tezos-base
   octez-shell-libs.tezos-client-base
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   tezos-protocol-018-Proxford
-  tezos-baking-018-Proxford.tenderbrute)
+  octez-protocol-018-Proxford-libs.tezos-baking.tenderbrute)
  (link_flags
   (:standard)
   (:include %{workspace_root}/macos-link-flags.sexp)
diff --git a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune
index b274c96c2ab2ab996297a1ac6ce69252767c512c..1a454a10c9fe78ca59e455f8a2b702d607ef4044 100644
--- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune
+++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune
@@ -3,14 +3,14 @@
 
 (library
  (name tenderbrute_018_Proxford)
- (public_name tezos-baking-018-Proxford.tenderbrute)
+ (public_name octez-protocol-018-Proxford-libs.tezos-baking.tenderbrute)
  (libraries
   data-encoding
   octez-libs.tezos-base
   octez-libs.tezos-base.unix
   tezos-protocol-018-Proxford
   octez-shell-libs.tezos-client-base
-  tezos-client-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-client)
  (flags
   (:standard)
   -open Data_encoding
diff --git a/src/proto_018_Proxford/lib_layer2_utils/dune b/src/proto_018_Proxford/lib_layer2_utils/dune
index e91984f61bd978a5256c9574c3fa2d977e078b6d..6355294db0787dd21e605e07e72ae7a2cfc9848c 100644
--- a/src/proto_018_Proxford/lib_layer2_utils/dune
+++ b/src/proto_018_Proxford/lib_layer2_utils/dune
@@ -3,12 +3,12 @@
 
 (library
  (name tezos_layer2_utils_018_Proxford)
- (public_name tezos-layer2-utils-018-Proxford)
+ (public_name octez-protocol-018-Proxford-libs.tezos-layer2-utils)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-protocol-018-Proxford
-  tezos-client-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-client)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
  (library_flags (:standard -linkall))
diff --git a/src/proto_018_Proxford/lib_plugin/dune b/src/proto_018_Proxford/lib_plugin/dune
index 92efc10f00fad20704c82c1bca6043e3045f047e..bc49c7a0c36e6d801c2973b5b52825ede2268978 100644
--- a/src/proto_018_Proxford/lib_plugin/dune
+++ b/src/proto_018_Proxford/lib_plugin/dune
@@ -3,12 +3,12 @@
 
 (library
  (name tezos_protocol_plugin_018_Proxford)
- (public_name tezos-protocol-plugin-018-Proxford)
+ (public_name octez-protocol-018-Proxford-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-protocol-018-Proxford
-  tezos-smart-rollup-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-smart-rollup)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
@@ -17,14 +17,17 @@
   -open Tezos_smart_rollup_018_Proxford)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-018-Proxford-libs))
+
 (library
  (name tezos_protocol_plugin_018_Proxford_registerer)
- (public_name tezos-protocol-plugin-018-Proxford-registerer)
+ (public_name
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-018-Proxford
-  tezos-protocol-plugin-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_018_Proxford/lib_plugin/index.mld b/src/proto_018_Proxford/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..a98771a5c8ba5a89b2c9fe7b77bc76367eb262e3
--- /dev/null
+++ b/src/proto_018_Proxford/lib_plugin/index.mld
@@ -0,0 +1,23 @@
+{0 Octez-protocol-018-Proxford-libs: octez protocol 018-Proxford libraries}
+
+This is a package containing some libraries related to the Tezos 018-Proxford protocol.
+
+It contains the following libraries:
+
+- {{!module-Tenderbrute_018_Proxford}Tenderbrute_018_Proxford}
+- {{!module-Tezos_018_Proxford_mockup_simulator}Tezos_018_Proxford_mockup_simulator}
+- {{!module-Tezos_018_Proxford_test_helpers}Tezos_018_Proxford_test_helpers}: Protocol testing framework
+- {{!module-Tezos_baking_018_Proxford}Tezos_baking_018_Proxford}: Base library for `tezos-baker/accuser`
+- {{!module-Tezos_baking_018_Proxford_commands}Tezos_baking_018_Proxford_commands}: Protocol-specific commands for baking
+- {{!module-Tezos_baking_018_Proxford_commands_registration}Tezos_baking_018_Proxford_commands_registration}
+- {{!module-Tezos_client_018_Proxford}Tezos_client_018_Proxford}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_018_Proxford_commands}Tezos_client_018_Proxford_commands}
+- {{!module-Tezos_client_018_Proxford_commands_registration}Tezos_client_018_Proxford_commands_registration}
+- {{!module-Tezos_client_sapling_018_Proxford}Tezos_client_sapling_018_Proxford}
+- {{!module-Tezos_dac_018_Proxford}Tezos_dac_018_Proxford}: Protocol specific library for the Data availability Committee
+- {{!module-Tezos_dal_018_Proxford}Tezos_dal_018_Proxford}: Protocol specific library for the Data availability Layer
+- {{!module-Tezos_layer2_utils_018_Proxford}Tezos_layer2_utils_018_Proxford}: Protocol specific library for Layer 2 utils
+- {{!module-Tezos_protocol_plugin_018_Proxford}Tezos_protocol_plugin_018_Proxford}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_018_Proxford_registerer}Tezos_protocol_plugin_018_Proxford_registerer}: Protocol plugin registerer
+- {{!module-Tezos_smart_rollup_018_Proxford}Tezos_smart_rollup_018_Proxford}: Protocol specific library of helpers for `tezos-smart-rollup`
+- {{!module-Tezos_smart_rollup_layer2_018_Proxford}Tezos_smart_rollup_layer2_018_Proxford}: Protocol specific library for `tezos-smart-rollup`
diff --git a/src/proto_018_Proxford/lib_plugin/test/dune b/src/proto_018_Proxford/lib_plugin/test/dune
index 34c1c262feb2bd35eca2cefa7606636d0ba49023..190c043935963542baed172136db1f7893d8ada1 100644
--- a/src/proto_018_Proxford/lib_plugin/test/dune
+++ b/src/proto_018_Proxford/lib_plugin/test/dune
@@ -14,10 +14,10 @@
   qcheck-alcotest
   octez-libs.tezos-stdlib-unix
   octez-libs.tezos-micheline
-  tezos-protocol-plugin-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
   tezos-protocol-018-Proxford
   tezos-protocol-018-Proxford.parameters
-  tezos-018-Proxford-test-helpers)
+  octez-protocol-018-Proxford-libs.tezos-test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -54,7 +54,7 @@
 
 (rule
  (alias runtest)
- (package tezos-protocol-plugin-018-Proxford-tests)
+ (package octez-protocol-018-Proxford-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_018_Proxford/lib_protocol/test/helpers/dune b/src/proto_018_Proxford/lib_protocol/test/helpers/dune
index 2ffd631e71f544f4544aa697d624ed8494181dab..918b6015b731c7844fd5dd88925fec6af4c1a2cf 100644
--- a/src/proto_018_Proxford/lib_protocol/test/helpers/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/helpers/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_018_Proxford_test_helpers)
- (public_name tezos-018-Proxford-test-helpers)
+ (public_name octez-protocol-018-Proxford-libs.tezos-test-helpers)
  (instrumentation (backend bisect_ppx))
  (libraries
   qcheck-alcotest
@@ -12,14 +12,14 @@
   octez-libs.tezos-micheline
   octez-libs.tezos-stdlib-unix
   tezos-protocol-018-Proxford
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   tezos-protocol-018-Proxford.parameters
   octez-proto-libs.tezos-protocol-environment
-  tezos-protocol-plugin-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-shell-services
   octez-libs.octez-plompiler
   octez-libs.tezos-crypto-dal
-  tezos-smart-rollup-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-smart-rollup)
  (flags
   (:standard)
   -open Tezos_test_helpers
diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune b/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune
index 9c4c3d73b21ddfff6cd40676ac038166554e2183..1ad91441a9d747c0f755f5bc37dc5061356cf72b 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune
@@ -10,10 +10,10 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-018-Proxford
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
   tezos-protocol-018-Proxford.parameters
-  tezos-protocol-plugin-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/dune b/src/proto_018_Proxford/lib_protocol/test/integration/dune
index 888f731fba804896a38fd2d0552833b213cf1c78..5f340fb8015c470836048dc662c15a6aa1ffc389 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/dune
@@ -10,10 +10,10 @@
   octez-libs.tezos-context
   octez-alcotezt
   octez-libs.tezos-base
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   tezos-protocol-018-Proxford
   tezos-protocol-018-Proxford.parameters
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune b/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune
index cff250ea56c0a60047e176ce5d07f5ea4710385f..c48e93e2d951bc971bb99de922ac6984df322009 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune
@@ -9,7 +9,7 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-018-Proxford
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune b/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune
index 1ea2061bb7b6ff8d102813ff6f654e9dde390aab..441388e2b59ed845816f58cfa67362684cf25aff 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune
@@ -10,14 +10,14 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-018-Proxford
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   tezos-benchmark
   octez-libs.tezos-micheline
   tezos-benchmark-018-Proxford
   tezos-benchmark-type-inference-018-Proxford
-  tezos-protocol-plugin-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
   tezos-protocol-018-Proxford.parameters)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune b/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune
index 7eacd37ae802e6e173c0b6172f19062936b73e09..10ac29faf2e99af3fdc393c5eb18ed538dc38d5c 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune
@@ -10,10 +10,10 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-018-Proxford
-  tezos-client-018-Proxford
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-client
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
-  tezos-protocol-plugin-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune b/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune
index 16d52da1bfa18c7f309ad6facf34b5fd1ccf355d..6770706a2b46b99176fcf10f7503f8702684941f 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune
@@ -10,11 +10,11 @@
   octez-libs.tezos-base
   tezos-protocol-018-Proxford
   qcheck-alcotest
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-libs.tezos-test-helpers
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
-  tezos-protocol-plugin-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_018_Proxford/lib_protocol/test/pbt/dune b/src/proto_018_Proxford/lib_protocol/test/pbt/dune
index 3d061148bd06640dd08917cfbdba80c56d480117..a5f28b6886cb42e5ba119569540ab8c06f0262bf 100644
--- a/src/proto_018_Proxford/lib_protocol/test/pbt/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/pbt/dune
@@ -8,17 +8,17 @@
   tezt.core
   octez-libs.tezos-base
   octez-libs.tezos-micheline
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   tezos-protocol-018-Proxford
   octez-libs.tezos-context.merkle_proof_encoding
   octez-libs.tezos-test-helpers
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-alcotezt
   qcheck-alcotest
   tezos-benchmark
   tezos-benchmark-018-Proxford
   tezos-benchmark-type-inference-018-Proxford
-  tezos-smart-rollup-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-smart-rollup
   octez-libs.tezos-crypto-dal
   octez-libs.tezos-base-test-helpers
   tezos-protocol-018-Proxford.parameters)
diff --git a/src/proto_018_Proxford/lib_protocol/test/regression/dune b/src/proto_018_Proxford/lib_protocol/test/regression/dune
index b317785353be15739fc013ccd95dfa825631455f..da056ab7d1c16f0228c145c6b3afa5eca66c8445 100644
--- a/src/proto_018_Proxford/lib_protocol/test/regression/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/regression/dune
@@ -9,9 +9,9 @@
   octez-libs.tezos-base
   tezt-tezos
   tezos-protocol-018-Proxford
-  tezos-client-018-Proxford
-  tezos-protocol-plugin-018-Proxford
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-client
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-libs.tezos-micheline)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_018_Proxford/lib_protocol/test/unit/dune b/src/proto_018_Proxford/lib_protocol/test/unit/dune
index e36b5ddf011fe8374664ecf3fc541970520ce159..dfd333c13b4dcf35f10dbec266887924dc6673c1 100644
--- a/src/proto_018_Proxford/lib_protocol/test/unit/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/unit/dune
@@ -9,14 +9,14 @@
   octez-libs.tezos-base
   octez-libs.tezos-base-test-helpers
   octez-libs.tezos-micheline
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-shell-libs.tezos-client-base
   tezos-protocol-018-Proxford.parameters
   octez-proto-libs.tezos-protocol-environment
   octez-libs.tezos-stdlib-unix
   tezos-protocol-018-Proxford
   octez-libs.tezos-test-helpers
-  tezos-018-Proxford-test-helpers
+  octez-protocol-018-Proxford-libs.tezos-test-helpers
   octez-alcotezt
   octez-l2-libs.tezos-scoru-wasm-helpers
   octez-libs.tezos-stdlib
diff --git a/src/proto_018_Proxford/lib_sc_rollup/dune b/src/proto_018_Proxford/lib_sc_rollup/dune
index 20f643e9af3927dae5536d24dc33f0489a4d579b..81b88cbfdc16ab463534a150dfbd7d798367d344 100644
--- a/src/proto_018_Proxford/lib_sc_rollup/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_smart_rollup_018_Proxford)
- (public_name tezos-smart-rollup-018-Proxford)
+ (public_name octez-protocol-018-Proxford-libs.tezos-smart-rollup)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
diff --git a/src/proto_018_Proxford/lib_sc_rollup_client/dune b/src/proto_018_Proxford/lib_sc_rollup_client/dune
index 4568d24484658ef312e6944ffcd0456483dfe9f1..1737d6e3c44d0666761bf938e7d308f0fa4bba3e 100644
--- a/src/proto_018_Proxford/lib_sc_rollup_client/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup_client/dune
@@ -11,10 +11,10 @@
   octez-shell-libs.tezos-client-commands
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-client-base-unix
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-l2-libs.octez-smart-rollup
-  tezos-smart-rollup-018-Proxford
-  tezos-smart-rollup-layer2-018-Proxford)
+  octez-protocol-018-Proxford-libs.tezos-smart-rollup
+  octez-protocol-018-Proxford-libs.tezos-smart-rollup-layer2)
  (flags
   (:standard)
   -open Tezos_base
diff --git a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune
index 633cca408229688850caa0881fb1bc0533a8eb31..0af12402a12110f7c25ac20545d58e4fb4584604 100644
--- a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_smart_rollup_layer2_018_Proxford)
- (public_name tezos-smart-rollup-layer2-018-Proxford)
+ (public_name octez-protocol-018-Proxford-libs.tezos-smart-rollup-layer2)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/dune b/src/proto_018_Proxford/lib_sc_rollup_node/dune
index ef5b51e5c48a845e4fe2c1a3369e94ec7e0c406f..0e5545bfcfc6b2b35f45e2c921eb0d57e3a83f85 100644
--- a/src/proto_018_Proxford/lib_sc_rollup_node/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup_node/dune
@@ -10,11 +10,11 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-client-base-unix
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-libs.tezos-context.encoding
   octez-libs.tezos-context.helpers
   tezos-protocol-018-Proxford
-  tezos-protocol-plugin-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-protocol-plugin
   tezos-protocol-018-Proxford.parameters
   octez-libs.tezos-rpc
   octez-libs.tezos-rpc-http
@@ -22,14 +22,14 @@
   octez-libs.tezos-workers
   tezos-dal-node-services
   tezos-dal-node-lib
-  tezos-dac-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-dac
   tezos-dac-lib
   tezos-dac-client-lib
   octez-shell-libs.tezos-shell-services
   octez-l2-libs.octez-smart-rollup
-  tezos-smart-rollup-018-Proxford
-  tezos-smart-rollup-layer2-018-Proxford
-  tezos-layer2-utils-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-smart-rollup
+  octez-protocol-018-Proxford-libs.tezos-smart-rollup-layer2
+  octez-protocol-018-Proxford-libs.tezos-layer2-utils
   octez-l2-libs.tezos_layer2_store
   octez-crawler
   octez-libs.tezos-tree-encoding
diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/test/dune b/src/proto_018_Proxford/lib_sc_rollup_node/test/dune
index dcb557568d954432e6fc1fea119ce69d8fb88da3..de49aa53d5cb2c99c5126cbfc9d148e56a1ed81c 100644
--- a/src/proto_018_Proxford/lib_sc_rollup_node/test/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup_node/test/dune
@@ -9,7 +9,7 @@
   octez-libs.tezos-base
   tezos-protocol-018-Proxford
   octez-libs.tezos-test-helpers
-  tezos-smart-rollup-layer2-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-smart-rollup-layer2
   octez_smart_rollup_node_Proxford
   octez-alcotezt
   octez_smart_rollup_node_Proxford_test_helpers)
diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune b/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune
index 3430b477b79a12aa60a26903d870488718bd0d05..f2435574609579e82c9ff9f5141fc06a05105c73 100644
--- a/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune
@@ -9,12 +9,12 @@
   octez-libs.tezos-base
   tezos-protocol-018-Proxford
   tezos-protocol-018-Proxford.parameters
-  tezos-client-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-client
   octez-libs.tezos-test-helpers
   qcheck-alcotest
   qcheck-core
   logs.lwt
-  tezos-smart-rollup-layer2-018-Proxford
+  octez-protocol-018-Proxford-libs.tezos-smart-rollup-layer2
   octez_smart_rollup_node_Proxford
   octez-alcotezt)
  (flags
diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune
index 642fcd2b898e2e535a0e07b12bd2e5aa62b2fc2c..8abfb21e162661597ce6cbb5e57bf492c843d0c7 100644
--- a/src/proto_alpha/bin_accuser/dune
+++ b/src/proto_alpha/bin_accuser/dune
@@ -10,9 +10,9 @@
   octez-libs.tezos-base
   octez-libs.tezos-clic
   tezos-protocol-alpha
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-alpha-commands
+  octez-protocol-alpha-libs.tezos-baking-commands
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base-unix)
  (link_flags
diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune
index 489c98254af266b13cb314eaf9f81e2f2a3d745b..134679aa6eb5428de59c93e3d026fae514bb5602 100644
--- a/src/proto_alpha/bin_baker/dune
+++ b/src/proto_alpha/bin_baker/dune
@@ -10,9 +10,9 @@
   octez-libs.tezos-base
   octez-libs.tezos-clic
   tezos-protocol-alpha
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-alpha-commands
+  octez-protocol-alpha-libs.tezos-baking-commands
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base-unix)
  (link_flags
diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune
index 3baeeea0ec852d8661e5bb6577c596c47ed8bad1..bbc6305d3f1a989980acaac21edd7e9581493f43 100644
--- a/src/proto_alpha/bin_sc_rollup_node/dune
+++ b/src/proto_alpha/bin_sc_rollup_node/dune
@@ -14,7 +14,7 @@
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-client-base-unix
   octez-shell-libs.tezos-client-commands
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-smart-rollup-node-lib
   octez_smart_rollup_node_alpha)
  (link_flags
diff --git a/src/proto_alpha/lib_benchmark/dune b/src/proto_alpha/lib_benchmark/dune
index bf09bc6501c9a7d0d7a0051bad830da52f8255aa..44c8f2fc92ee61b64cc40ca96dda1b8211fcec2c 100644
--- a/src/proto_alpha/lib_benchmark/dune
+++ b/src/proto_alpha/lib_benchmark/dune
@@ -16,7 +16,7 @@
   octez-libs.tezos-crypto
   tezos-protocol-alpha.parameters
   hashcons
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   prbnmcn-stats)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune
index cd92d4fda3ba7343ab0eb7dcf0428ceb94c7e09d..3b8888cb87f5e6b6a50456b8f4219a28a157f9a5 100644
--- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune
+++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune
@@ -9,7 +9,7 @@
   tezos-benchmark-type-inference-alpha
   tezos-protocol-alpha
   octez-libs.tezos-error-monad
-  tezos-client-alpha)
+  octez-protocol-alpha-libs.tezos-client)
  (link_flags
   (:standard)
   (:include %{workspace_root}/macos-link-flags.sexp))
diff --git a/src/proto_alpha/lib_benchmark/test/dune b/src/proto_alpha/lib_benchmark/test/dune
index 45d57cf34fc89a975a0c33f6c0b0ab11d10f20e3..b1de6cd7a0a1e87c781ce48b622d2a2f7a4edac8 100644
--- a/src/proto_alpha/lib_benchmark/test/dune
+++ b/src/proto_alpha/lib_benchmark/test/dune
@@ -15,7 +15,7 @@
   tezos-benchmark
   tezos-benchmark-type-inference-alpha
   tezos-benchmark-alpha
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-libs.tezos-error-monad
   prbnmcn-stats)
  (link_flags
diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune
index 64e99fa8e915c1e97721cd7fe55fcfa8fe99b4d6..3d22ff523455b39300a44360b7d0768f009cd91b 100644
--- a/src/proto_alpha/lib_benchmarks_proto/dune
+++ b/src/proto_alpha/lib_benchmarks_proto/dune
@@ -19,10 +19,10 @@
   octez-libs.tezos-crypto
   octez-shell-libs.tezos-shell-benchmarks
   octez-libs.tezos-micheline
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-libs.tezos-sapling
-  tezos-client-alpha
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-client
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   octez-proto-libs.tezos-protocol-environment)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune
index cc9a6445d7fb038447702355816e747740020f17..f5c93accbd423f9ca7e0c1dfa5724150a1eafcbd 100644
--- a/src/proto_alpha/lib_client/dune
+++ b/src/proto_alpha/lib_client/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_alpha)
- (public_name tezos-client-alpha)
+ (public_name octez-protocol-alpha-libs.tezos-client)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -15,10 +15,10 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-proxy
   octez-shell-libs.tezos-signer-backends
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   tezos-protocol-alpha.parameters
   octez-libs.tezos-rpc
-  tezos-smart-rollup-alpha
+  octez-protocol-alpha-libs.tezos-smart-rollup
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_alpha/lib_client/test/dune b/src/proto_alpha/lib_client/test/dune
index 744e848730880edb918745303da5c9f314d3446f..b22aab3b14b0a97dcd51abe8d89b413a5d922a20 100644
--- a/src/proto_alpha/lib_client/test/dune
+++ b/src/proto_alpha/lib_client/test/dune
@@ -8,7 +8,7 @@
   tezt.core
   octez-libs.tezos-base
   octez-libs.tezos-micheline
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   tezos-protocol-alpha
   octez-libs.tezos-base-test-helpers
   octez-libs.tezos-test-helpers
@@ -46,7 +46,7 @@
 
 (rule
  (alias runtest)
- (package tezos-client-alpha)
+ (package octez-protocol-alpha-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune
index 3c6ff7e599312d495867bfbc19f1e6e35ef6bf75..e5803453adcc8f14a749c1f7930f2162bccde2ef 100644
--- a/src/proto_alpha/lib_client_commands/dune
+++ b/src/proto_alpha/lib_client_commands/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_alpha_commands)
- (public_name tezos-client-alpha.commands)
+ (public_name octez-protocol-alpha-libs.tezos-client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -17,11 +17,11 @@
   octez-shell-libs.tezos-mockup-registration
   octez-shell-libs.tezos-mockup-commands
   octez-shell-libs.tezos-client-base
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-rpc
   octez-shell-libs.tezos-client-base-unix
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -40,7 +40,7 @@
 
 (library
  (name tezos_client_alpha_commands_registration)
- (public_name tezos-client-alpha.commands-registration)
+ (public_name octez-protocol-alpha-libs.tezos-client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -50,12 +50,12 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-client-alpha.commands
-  tezos-client-alpha.sapling
+  octez-protocol-alpha-libs.tezos-client.commands
+  octez-protocol-alpha-libs.tezos-client.sapling
   octez-libs.tezos-rpc
-  tezos-protocol-plugin-alpha)
+  octez-protocol-alpha-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune
index 6451985346bc71c36879f9def60e144723c3393b..a57afa9999229ea39e3caf9ced750c8862f947ca 100644
--- a/src/proto_alpha/lib_client_sapling/dune
+++ b/src/proto_alpha/lib_client_sapling/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_client_sapling_alpha)
- (public_name tezos-client-alpha.sapling)
+ (public_name octez-protocol-alpha-libs.tezos-client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -12,10 +12,10 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-signer-backends
-  tezos-client-alpha
-  tezos-client-alpha.commands
+  octez-protocol-alpha-libs.tezos-client
+  octez-protocol-alpha-libs.tezos-client.commands
   tezos-protocol-alpha
-  tezos-protocol-plugin-alpha)
+  octez-protocol-alpha-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_dac_plugin/dune b/src/proto_alpha/lib_dac_plugin/dune
index 7637aa825a88f89119394361fe48ebf6d4ad0fde..a1d344c6130da593cb4f801f92dba55d49d3d732 100644
--- a/src/proto_alpha/lib_dac_plugin/dune
+++ b/src/proto_alpha/lib_dac_plugin/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_dac_alpha)
- (public_name tezos-dac-alpha)
+ (public_name octez-protocol-alpha-libs.tezos-dac)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -11,7 +11,7 @@
   octez-libs.tezos-stdlib-unix
   tezos-dac-lib
   tezos-dac-client-lib
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   tezos-embedded-protocol-alpha
   tezos-protocol-alpha)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_alpha/lib_dac_plugin/test/dune b/src/proto_alpha/lib_dac_plugin/test/dune
index 1d061f61315858cf78ebfc131c7c86ce04fa143b..375bd4188fe8275070c763eade44d23779397fe3 100644
--- a/src/proto_alpha/lib_dac_plugin/test/dune
+++ b/src/proto_alpha/lib_dac_plugin/test/dune
@@ -7,10 +7,10 @@
  (libraries
   tezt.core
   octez-libs.tezos-base
-  tezos-dac-alpha
+  octez-protocol-alpha-libs.tezos-dac
   tezos-protocol-alpha
   octez-libs.tezos-base-test-helpers
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   tezos-dac-lib
   tezos_dac_node_lib
   octez-alcotezt)
@@ -43,7 +43,7 @@
 
 (rule
  (alias runtest)
- (package tezos-dac-alpha)
+ (package octez-protocol-alpha-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_alpha/lib_dal/dune b/src/proto_alpha/lib_dal/dune
index 6eaec2697e4a951c9a3f256e4c55d25590352feb..a725a2491f2c2c8690812a7c60c04bbd2e3a857b 100644
--- a/src/proto_alpha/lib_dal/dune
+++ b/src/proto_alpha/lib_dal/dune
@@ -3,17 +3,17 @@
 
 (library
  (name tezos_dal_alpha)
- (public_name tezos-dal-alpha)
+ (public_name octez-protocol-alpha-libs.tezos-dal)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   octez-protocol-compiler.registerer
   octez-libs.tezos-stdlib-unix
   tezos-dal-node-lib
-  tezos-client-alpha
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-client
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   tezos-embedded-protocol-alpha
-  tezos-layer2-utils-alpha
+  octez-protocol-alpha-libs.tezos-layer2-utils
   tezos-protocol-alpha)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_alpha/lib_dal/test/dune b/src/proto_alpha/lib_dal/test/dune
index f0b8638a1797e8c275aaaf1405294e7fc7932381..cd495248cf3da2bbbfcf92749ac59d7501de9185 100644
--- a/src/proto_alpha/lib_dal/test/dune
+++ b/src/proto_alpha/lib_dal/test/dune
@@ -7,10 +7,10 @@
  (libraries
   tezt.core
   octez-libs.tezos-base
-  tezos-dal-alpha
+  octez-protocol-alpha-libs.tezos-dal
   tezos-protocol-alpha
   octez-libs.tezos-base-test-helpers
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-alcotezt)
  (library_flags (:standard -linkall))
  (flags
@@ -39,7 +39,7 @@
 
 (rule
  (alias runtest)
- (package tezos-dal-alpha)
+ (package octez-protocol-alpha-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune
index a98c5bd6a84195bc7fff79a51303ea0f8ffc1f8f..b36d8e73077f64bf10a179b73e8a82971ec5e30c 100644
--- a/src/proto_alpha/lib_delegate/dune
+++ b/src/proto_alpha/lib_delegate/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_baking_alpha)
- (public_name tezos-baking-alpha)
+ (public_name octez-protocol-alpha-libs.tezos-baking)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -11,11 +11,11 @@
   tezos-version.value
   tezos-protocol-alpha
   tezos-protocol-alpha.lifted
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-shell-libs.tezos-client-commands
   octez-libs.tezos-stdlib
   octez-libs.tezos-stdlib-unix
@@ -52,7 +52,7 @@
 
 (library
  (name tezos_baking_alpha_commands)
- (public_name tezos-baking-alpha-commands)
+ (public_name octez-protocol-alpha-libs.tezos-baking-commands)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -62,9 +62,9 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-alpha
+  octez-protocol-alpha-libs.tezos-baking
   octez-libs.tezos-rpc
   uri)
  (library_flags (:standard -linkall))
@@ -84,7 +84,7 @@
 
 (library
  (name tezos_baking_alpha_commands_registration)
- (public_name tezos-baking-alpha-commands.registration)
+ (public_name octez-protocol-alpha-libs.tezos-baking-commands.registration)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
@@ -92,10 +92,10 @@
   octez-proto-libs.tezos-protocol-environment
   octez-shell-libs.tezos-shell-services
   octez-shell-libs.tezos-client-base
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-alpha
-  tezos-baking-alpha-commands
+  octez-protocol-alpha-libs.tezos-baking
+  octez-protocol-alpha-libs.tezos-baking-commands
   octez-libs.tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune
index e3e433983f62f144d17d8b9f383c89085d73d8ac..c8332b0e27bc4f8ea7491c9c8b38662afc420d13 100644
--- a/src/proto_alpha/lib_delegate/test/dune
+++ b/src/proto_alpha/lib_delegate/test/dune
@@ -8,11 +8,11 @@
   tezt.core
   octez-libs.tezos-base
   octez-libs.tezos-micheline
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   tezos-protocol-alpha
   octez-libs.tezos-base-test-helpers
-  tezos-baking-alpha.mockup-simulator
-  tezos-baking-alpha
+  octez-protocol-alpha-libs.tezos-bakings.mockup-simulator
+  octez-protocol-alpha-libs.tezos-baking
   tezos-protocol-alpha.parameters
   octez-libs.tezos-crypto
   octez-alcotezt
@@ -46,7 +46,7 @@
 
 (rule
  (alias runtest)
- (package tezos-baking-alpha)
+ (package octez-protocol-alpha-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
index 7d1e5d0fd582185b57dbb6181b848da646993743..1e9fcc2fcf4c3a608223be5333e25f950767c7b3 100644
--- a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
@@ -3,20 +3,20 @@
 
 (library
  (name tezos_alpha_mockup_simulator)
- (public_name tezos-baking-alpha.mockup-simulator)
+ (public_name octez-protocol-alpha-libs.tezos-bakings.mockup-simulator)
  (libraries
   octez-libs.tezos-base
   tezos-protocol-alpha
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-shell-libs.tezos-client-commands
-  tezos-baking-alpha
+  octez-protocol-alpha-libs.tezos-baking
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base-unix
   tezos-protocol-alpha.parameters
   octez-shell-libs.tezos-mockup
   octez-shell-libs.tezos-mockup-proxy
   octez-shell-libs.tezos-mockup-commands
-  tezos-baking-alpha.tenderbrute)
+  octez-protocol-alpha-libs.tezos-baking.tenderbrute)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune
index 5e79a992f70fad838e4fcf1c23d8380178907ea0..0ecb585582a300381d5ac5e391da5f1a0bcb16a6 100644
--- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune
+++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune
@@ -6,9 +6,9 @@
  (libraries
   octez-libs.tezos-base
   octez-shell-libs.tezos-client-base
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   tezos-protocol-alpha
-  tezos-baking-alpha.tenderbrute)
+  octez-protocol-alpha-libs.tezos-baking.tenderbrute)
  (link_flags
   (:standard)
   (:include %{workspace_root}/macos-link-flags.sexp)
diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune
index 375cd3bbe22629e1ecdb9ca8f30542823ff80d01..7ad1f0572166695193a347fffc735488e1f74146 100644
--- a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune
+++ b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune
@@ -3,14 +3,14 @@
 
 (library
  (name tenderbrute_alpha)
- (public_name tezos-baking-alpha.tenderbrute)
+ (public_name octez-protocol-alpha-libs.tezos-baking.tenderbrute)
  (libraries
   data-encoding
   octez-libs.tezos-base
   octez-libs.tezos-base.unix
   tezos-protocol-alpha
   octez-shell-libs.tezos-client-base
-  tezos-client-alpha)
+  octez-protocol-alpha-libs.tezos-client)
  (flags
   (:standard)
   -open Data_encoding
diff --git a/src/proto_alpha/lib_layer2_utils/dune b/src/proto_alpha/lib_layer2_utils/dune
index cb846cac4d8472f6670430e1cbd748ff5d022f67..c84c657f6105437ce0d2686e273653e0766d3be6 100644
--- a/src/proto_alpha/lib_layer2_utils/dune
+++ b/src/proto_alpha/lib_layer2_utils/dune
@@ -3,12 +3,12 @@
 
 (library
  (name tezos_layer2_utils_alpha)
- (public_name tezos-layer2-utils-alpha)
+ (public_name octez-protocol-alpha-libs.tezos-layer2-utils)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-protocol-alpha
-  tezos-client-alpha)
+  octez-protocol-alpha-libs.tezos-client)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
  (library_flags (:standard -linkall))
diff --git a/src/proto_alpha/lib_plugin/dune b/src/proto_alpha/lib_plugin/dune
index de780c0a1f3d7de942c750e1519895f22effac3f..0a06a2431ffd935dc96c2d5908cbbea389329aaf 100644
--- a/src/proto_alpha/lib_plugin/dune
+++ b/src/proto_alpha/lib_plugin/dune
@@ -3,12 +3,12 @@
 
 (library
  (name tezos_protocol_plugin_alpha)
- (public_name tezos-protocol-plugin-alpha)
+ (public_name octez-protocol-alpha-libs.tezos-protocol-plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-protocol-alpha
-  tezos-smart-rollup-alpha)
+  octez-protocol-alpha-libs.tezos-smart-rollup)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
@@ -17,14 +17,16 @@
   -open Tezos_smart_rollup_alpha)
  (modules (:standard \ Plugin_registerer)))
 
+(documentation (package octez-protocol-alpha-libs))
+
 (library
  (name tezos_protocol_plugin_alpha_registerer)
- (public_name tezos-protocol-plugin-alpha-registerer)
+ (public_name octez-protocol-alpha-libs.tezos-protocol-plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
   tezos-embedded-protocol-alpha
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-validation)
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_plugin/index.mld b/src/proto_alpha/lib_plugin/index.mld
new file mode 100644
index 0000000000000000000000000000000000000000..bff8ecc47fca0f370cae485a3a0e05c193cf9536
--- /dev/null
+++ b/src/proto_alpha/lib_plugin/index.mld
@@ -0,0 +1,23 @@
+{0 Octez-protocol-alpha-libs: octez protocol alpha libraries}
+
+This is a package containing some libraries related to the Tezos alpha protocol.
+
+It contains the following libraries:
+
+- {{!module-Tenderbrute_alpha}Tenderbrute_alpha}
+- {{!module-Tezos_alpha_mockup_simulator}Tezos_alpha_mockup_simulator}
+- {{!module-Tezos_alpha_test_helpers}Tezos_alpha_test_helpers}: Protocol testing framework
+- {{!module-Tezos_baking_alpha}Tezos_baking_alpha}: Base library for `tezos-baker/accuser`
+- {{!module-Tezos_baking_alpha_commands}Tezos_baking_alpha_commands}: Protocol-specific commands for baking
+- {{!module-Tezos_baking_alpha_commands_registration}Tezos_baking_alpha_commands_registration}
+- {{!module-Tezos_client_alpha}Tezos_client_alpha}: Protocol specific library for `tezos-client`
+- {{!module-Tezos_client_alpha_commands}Tezos_client_alpha_commands}
+- {{!module-Tezos_client_alpha_commands_registration}Tezos_client_alpha_commands_registration}
+- {{!module-Tezos_client_sapling_alpha}Tezos_client_sapling_alpha}
+- {{!module-Tezos_dac_alpha}Tezos_dac_alpha}: Protocol specific library for the Data availability Committee
+- {{!module-Tezos_dal_alpha}Tezos_dal_alpha}: Protocol specific library for the Data availability Layer
+- {{!module-Tezos_layer2_utils_alpha}Tezos_layer2_utils_alpha}: Protocol specific library for Layer 2 utils
+- {{!module-Tezos_protocol_plugin_alpha}Tezos_protocol_plugin_alpha}: Protocol plugin
+- {{!module-Tezos_protocol_plugin_alpha_registerer}Tezos_protocol_plugin_alpha_registerer}: Protocol plugin registerer
+- {{!module-Tezos_smart_rollup_alpha}Tezos_smart_rollup_alpha}: Protocol specific library of helpers for `tezos-smart-rollup`
+- {{!module-Tezos_smart_rollup_layer2_alpha}Tezos_smart_rollup_layer2_alpha}: Protocol specific library for `tezos-smart-rollup`
diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune
index 8e5c3ae0ad73456223e690cb98f2580e58f25127..8aff3fecb16c87df78407d9249967d325ac17637 100644
--- a/src/proto_alpha/lib_plugin/test/dune
+++ b/src/proto_alpha/lib_plugin/test/dune
@@ -14,10 +14,10 @@
   qcheck-alcotest
   octez-libs.tezos-stdlib-unix
   octez-libs.tezos-micheline
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   tezos-protocol-alpha
   tezos-protocol-alpha.parameters
-  tezos-alpha-test-helpers)
+  octez-protocol-alpha-libs.tezos-test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -54,7 +54,7 @@
 
 (rule
  (alias runtest)
- (package tezos-protocol-plugin-alpha-tests)
+ (package octez-protocol-alpha-libs)
  (enabled_if (<> false %{env:RUNTEZTALIAS=true}))
  (action (run %{dep:./main.exe})))
 
diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune
index 362798adf06b215aac2bbc1820be5fa9683b842d..5cba5a3a9beb1a838446f807f1ea573e44ae0498 100644
--- a/src/proto_alpha/lib_protocol/test/helpers/dune
+++ b/src/proto_alpha/lib_protocol/test/helpers/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_alpha_test_helpers)
- (public_name tezos-alpha-test-helpers)
+ (public_name octez-protocol-alpha-libs.tezos-test-helpers)
  (instrumentation (backend bisect_ppx))
  (libraries
   qcheck-alcotest
@@ -12,14 +12,14 @@
   octez-libs.tezos-micheline
   octez-libs.tezos-stdlib-unix
   tezos-protocol-alpha
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   tezos-protocol-alpha.parameters
   octez-proto-libs.tezos-protocol-environment
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   octez-shell-libs.tezos-shell-services
   octez-libs.octez-plompiler
   octez-libs.tezos-crypto-dal
-  tezos-smart-rollup-alpha)
+  octez-protocol-alpha-libs.tezos-smart-rollup)
  (flags
   (:standard)
   -open Tezos_test_helpers
diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/dune b/src/proto_alpha/lib_protocol/test/integration/consensus/dune
index e493e5174b01d0eaf4731fcb13f7001d84999de1..682571635be4a52e3833cef7ea977736f2826137 100644
--- a/src/proto_alpha/lib_protocol/test/integration/consensus/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/consensus/dune
@@ -9,10 +9,10 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-alpha
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
   tezos-protocol-alpha.parameters
-  tezos-protocol-plugin-alpha)
+  octez-protocol-alpha-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_protocol/test/integration/dune b/src/proto_alpha/lib_protocol/test/integration/dune
index ffc52cbab92f1070ed35eb0c0119cd3bb36f93ac..e8f11da50393df9509e3ab34123fe534e3b6db46 100644
--- a/src/proto_alpha/lib_protocol/test/integration/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/dune
@@ -10,10 +10,10 @@
   octez-libs.tezos-context
   octez-alcotezt
   octez-libs.tezos-base
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   tezos-protocol-alpha
   tezos-protocol-alpha.parameters
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_protocol/test/integration/gas/dune b/src/proto_alpha/lib_protocol/test/integration/gas/dune
index 1fed143d4c78f1faeab232554a4794f57197da8f..f5d69625123806852e46c680b558318949479d0c 100644
--- a/src/proto_alpha/lib_protocol/test/integration/gas/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/gas/dune
@@ -9,7 +9,7 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-alpha
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/dune b/src/proto_alpha/lib_protocol/test/integration/michelson/dune
index 24d5d56ccec900b956e21e59a6776607f742472e..90d568f4905487f9c61813c5867e06b0761aa75e 100644
--- a/src/proto_alpha/lib_protocol/test/integration/michelson/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/michelson/dune
@@ -9,14 +9,14 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-alpha
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   tezos-benchmark
   octez-libs.tezos-micheline
   tezos-benchmark-alpha
   tezos-benchmark-type-inference-alpha
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   tezos-protocol-alpha.parameters)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/dune b/src/proto_alpha/lib_protocol/test/integration/operations/dune
index a9c19bfc3b2035c2b9ca91277137fbc9e8b356ed..4e863f24d1929dd5e009b4d959db7f39edafa41e 100644
--- a/src/proto_alpha/lib_protocol/test/integration/operations/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/operations/dune
@@ -9,10 +9,10 @@
   octez-alcotezt
   octez-libs.tezos-base
   tezos-protocol-alpha
-  tezos-client-alpha
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-client
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
-  tezos-protocol-plugin-alpha)
+  octez-protocol-alpha-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/dune b/src/proto_alpha/lib_protocol/test/integration/validate/dune
index 1ec2c29d79fe3f7931f6cacb433b7943bee10f55..b513ad71756018dbc12585ad03770296956aea0b 100644
--- a/src/proto_alpha/lib_protocol/test/integration/validate/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/validate/dune
@@ -10,11 +10,11 @@
   octez-libs.tezos-base
   tezos-protocol-alpha
   qcheck-alcotest
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-libs.tezos-test-helpers
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-libs.tezos-base-test-helpers
-  tezos-protocol-plugin-alpha)
+  octez-protocol-alpha-libs.tezos-protocol-plugin)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune
index 83dc727abfe40653732dfb70ba36ae681fc67bbc..f1a30e2f4d5f040ef5a1d0d3deeb8d6253f741d2 100644
--- a/src/proto_alpha/lib_protocol/test/pbt/dune
+++ b/src/proto_alpha/lib_protocol/test/pbt/dune
@@ -8,17 +8,17 @@
   tezt.core
   octez-libs.tezos-base
   octez-libs.tezos-micheline
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   tezos-protocol-alpha
   octez-libs.tezos-context.merkle_proof_encoding
   octez-libs.tezos-test-helpers
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-alcotezt
   qcheck-alcotest
   tezos-benchmark
   tezos-benchmark-alpha
   tezos-benchmark-type-inference-alpha
-  tezos-smart-rollup-alpha
+  octez-protocol-alpha-libs.tezos-smart-rollup
   octez-libs.tezos-crypto-dal
   octez-libs.tezos-base-test-helpers
   tezos-protocol-alpha.parameters)
diff --git a/src/proto_alpha/lib_protocol/test/regression/dune b/src/proto_alpha/lib_protocol/test/regression/dune
index 308866588f54477f98b4afb4e6d0144c1b8fc2d7..e57b58747c26ef2fbb9583b60db3db9a9d2d1b35 100644
--- a/src/proto_alpha/lib_protocol/test/regression/dune
+++ b/src/proto_alpha/lib_protocol/test/regression/dune
@@ -9,9 +9,9 @@
   octez-libs.tezos-base
   tezt-tezos
   tezos-protocol-alpha
-  tezos-client-alpha
-  tezos-protocol-plugin-alpha
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-client
+  octez-protocol-alpha-libs.tezos-protocol-plugin
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-libs.tezos-micheline)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune
index a901c13cb0a8c6c99b6e8a385d0911d91cfd917c..7732558db72970207d8af4251ce4e11a51252edf 100644
--- a/src/proto_alpha/lib_protocol/test/unit/dune
+++ b/src/proto_alpha/lib_protocol/test/unit/dune
@@ -9,14 +9,14 @@
   octez-libs.tezos-base
   octez-libs.tezos-base-test-helpers
   octez-libs.tezos-micheline
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-shell-libs.tezos-client-base
   tezos-protocol-alpha.parameters
   octez-proto-libs.tezos-protocol-environment
   octez-libs.tezos-stdlib-unix
   tezos-protocol-alpha
   octez-libs.tezos-test-helpers
-  tezos-alpha-test-helpers
+  octez-protocol-alpha-libs.tezos-test-helpers
   octez-alcotezt
   octez-l2-libs.tezos-scoru-wasm-helpers
   octez-libs.tezos-stdlib
diff --git a/src/proto_alpha/lib_sc_rollup/dune b/src/proto_alpha/lib_sc_rollup/dune
index 10ce85b06f39089721e3051b56381a71b235e8f8..60f7c52d8558491c3327a512a2e54541b54163e9 100644
--- a/src/proto_alpha/lib_sc_rollup/dune
+++ b/src/proto_alpha/lib_sc_rollup/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_smart_rollup_alpha)
- (public_name tezos-smart-rollup-alpha)
+ (public_name octez-protocol-alpha-libs.tezos-smart-rollup)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
diff --git a/src/proto_alpha/lib_sc_rollup_client/dune b/src/proto_alpha/lib_sc_rollup_client/dune
index 880c6b25eabaa6f432c18fa14121f9b4122dc8c6..b6f57d734d9711975e6e3594301404c91ea1f5b1 100644
--- a/src/proto_alpha/lib_sc_rollup_client/dune
+++ b/src/proto_alpha/lib_sc_rollup_client/dune
@@ -11,10 +11,10 @@
   octez-shell-libs.tezos-client-commands
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-client-base-unix
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-l2-libs.octez-smart-rollup
-  tezos-smart-rollup-alpha
-  tezos-smart-rollup-layer2-alpha)
+  octez-protocol-alpha-libs.tezos-smart-rollup
+  octez-protocol-alpha-libs.tezos-smart-rollup-layer2)
  (flags
   (:standard)
   -open Tezos_base
diff --git a/src/proto_alpha/lib_sc_rollup_layer2/dune b/src/proto_alpha/lib_sc_rollup_layer2/dune
index a5cb13ec097c117ac88de0b9ef1999e4fc580d71..9c1364da292ee138bdd32b68a4d771e9cd281e38 100644
--- a/src/proto_alpha/lib_sc_rollup_layer2/dune
+++ b/src/proto_alpha/lib_sc_rollup_layer2/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_smart_rollup_layer2_alpha)
- (public_name tezos-smart-rollup-layer2-alpha)
+ (public_name octez-protocol-alpha-libs.tezos-smart-rollup-layer2)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-libs.tezos-base
diff --git a/src/proto_alpha/lib_sc_rollup_node/dune b/src/proto_alpha/lib_sc_rollup_node/dune
index 228c5a00d342ce84e9550f2c600d83f68f2c076b..e489be46b4e75f84a6a65c656483701d4e4dd3d6 100644
--- a/src/proto_alpha/lib_sc_rollup_node/dune
+++ b/src/proto_alpha/lib_sc_rollup_node/dune
@@ -10,11 +10,11 @@
   octez-libs.tezos-stdlib-unix
   octez-shell-libs.tezos-client-base
   octez-shell-libs.tezos-client-base-unix
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-libs.tezos-context.encoding
   octez-libs.tezos-context.helpers
   tezos-protocol-alpha
-  tezos-protocol-plugin-alpha
+  octez-protocol-alpha-libs.tezos-protocol-plugin
   tezos-protocol-alpha.parameters
   octez-libs.tezos-rpc
   octez-libs.tezos-rpc-http
@@ -22,14 +22,14 @@
   octez-libs.tezos-workers
   tezos-dal-node-services
   tezos-dal-node-lib
-  tezos-dac-alpha
+  octez-protocol-alpha-libs.tezos-dac
   tezos-dac-lib
   tezos-dac-client-lib
   octez-shell-libs.tezos-shell-services
   octez-l2-libs.octez-smart-rollup
-  tezos-smart-rollup-alpha
-  tezos-smart-rollup-layer2-alpha
-  tezos-layer2-utils-alpha
+  octez-protocol-alpha-libs.tezos-smart-rollup
+  octez-protocol-alpha-libs.tezos-smart-rollup-layer2
+  octez-protocol-alpha-libs.tezos-layer2-utils
   octez-l2-libs.tezos_layer2_store
   octez-crawler
   octez-libs.tezos-tree-encoding
diff --git a/src/proto_alpha/lib_sc_rollup_node/test/dune b/src/proto_alpha/lib_sc_rollup_node/test/dune
index 639d139e5d0931ce3c1e137048d4a7f294ecc172..d6431f008b4f61d06e9ff309a5d5a8dbfd003fe1 100644
--- a/src/proto_alpha/lib_sc_rollup_node/test/dune
+++ b/src/proto_alpha/lib_sc_rollup_node/test/dune
@@ -9,7 +9,7 @@
   octez-libs.tezos-base
   tezos-protocol-alpha
   octez-libs.tezos-test-helpers
-  tezos-smart-rollup-layer2-alpha
+  octez-protocol-alpha-libs.tezos-smart-rollup-layer2
   octez_smart_rollup_node_alpha
   octez-alcotezt
   octez_smart_rollup_node_alpha_test_helpers)
diff --git a/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune b/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune
index a243a0d27124773be90f6679fc398ab7b16db008..3732e07b7b886bdad22ca5ca5e5fe47ec1f34280 100644
--- a/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune
+++ b/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune
@@ -9,12 +9,12 @@
   octez-libs.tezos-base
   tezos-protocol-alpha
   tezos-protocol-alpha.parameters
-  tezos-client-alpha
+  octez-protocol-alpha-libs.tezos-client
   octez-libs.tezos-test-helpers
   qcheck-alcotest
   qcheck-core
   logs.lwt
-  tezos-smart-rollup-layer2-alpha
+  octez-protocol-alpha-libs.tezos-smart-rollup-layer2
   octez_smart_rollup_node_alpha
   octez-alcotezt)
  (flags
diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune
index 2c0242ecf5f61c3ba96bec8ae6d8f4104d24d515..4d5d2c8c71f0b0b5947cd7081a92a9189fbdb241 100644
--- a/tezt/long_tests/dune
+++ b/tezt/long_tests/dune
@@ -4,7 +4,7 @@
             tezt-tezos
             tezt-tezos.tezt-performance-regression
             octez-libs.tezos-lwt-result-stdlib
-            tezos-alpha-test-helpers
+            octez-protocol-alpha-libs.tezos-test-helpers
             octez-libs.tezos-micheline
             tezos-openapi
             tezos-protocol-alpha
diff --git a/tezt/vesting_contract_test/dune b/tezt/vesting_contract_test/dune
index 3b68a42e2e3832b9182b5b749cf36f5b2e65bddc..3e3bd1f8c1bfb8ff675ac1971d41e50fef5cf87b 100644
--- a/tezt/vesting_contract_test/dune
+++ b/tezt/vesting_contract_test/dune
@@ -1,7 +1,7 @@
 (executable
  (name main)
  (libraries octez-libs.tezos-stdlib
-            tezos-alpha-test-helpers
+            octez-protocol-alpha-libs.tezos-test-helpers
             octez-libs.tezos-micheline
             tezos-protocol-alpha
             tezt-tezos