diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml
index 2c37c38e51ca8af28ea45b18c8edfdaf38f84468..61ab74da809ff11c3813bf331c57117d8435b468 100644
--- a/.gitlab/ci/jobs/packaging/opam_package.yml
+++ b/.gitlab/ci/jobs/packaging/opam_package.yml
@@ -784,6 +784,13 @@ opam:octez-smart-rollup-wasm-debugger:
 
 # Ignoring unreleased package octez-testnet-scenarios.
 
+opam:octez-version:
+  extends:
+    - .opam_template
+    - .rules_template__trigger_exec_opam_batch_6
+  variables:
+    package: octez-version
+
 # Ignoring unreleased package scoru-sequencer-test.
 
 opam:tezos-benchmark:
@@ -1058,7 +1065,7 @@ opam:tezos-protocol-genesis:
 opam:tezos-proxy-server-config:
   extends:
     - .opam_template
-    - .rules_template__trigger_all_opam_batch_6
+    - .rules_template__trigger_all_opam_batch_7
   variables:
     package: tezos-proxy-server-config
 
@@ -1072,13 +1079,6 @@ opam:tezos-proxy-server-config:
 
 # Ignoring unreleased package tezos-tree-encoding-test.
 
-opam:tezos-version:
-  extends:
-    - .opam_template
-    - .rules_template__trigger_exec_opam_batch_7
-  variables:
-    package: tezos-version
-
 # Ignoring unreleased package tezt-ethereum.
 
 opam:tezt-tezos:
diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune
index 1b49517a375c075f94822c848d290ab3118623b9..889fcbdd171e991b0c6c25099c20904433214f6c 100644
--- a/devtools/get_contracts/dune
+++ b/devtools/get_contracts/dune
@@ -4,8 +4,8 @@
 (library
  (name get_contracts_lib)
  (libraries
-  octez-libs.tezos-micheline
-  octez-libs.tezos-base
+  octez-libs.micheline
+  octez-libs.base
   octez-shell-libs.store
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.client
@@ -23,8 +23,8 @@
 (executable
  (name get_contracts)
  (libraries
-  octez-libs.tezos-micheline
-  octez-libs.tezos-base
+  octez-libs.micheline
+  octez-libs.base
   get_contracts_lib)
  (link_flags
   (:standard)
diff --git a/devtools/testnet_experiment_tools/dune b/devtools/testnet_experiment_tools/dune
index 2a8986900e7d10b3e4519dc4fd8570c8524887d2..e9252b9ebf77098a61c515c883cc647286500586 100644
--- a/devtools/testnet_experiment_tools/dune
+++ b/devtools/testnet_experiment_tools/dune
@@ -7,9 +7,9 @@
   tezt
   tezt-tezos
   octez-shell-libs.client-base-unix
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
   octez-protocol-alpha-libs.client
   tezos-protocol-alpha.protocol)
  (link_flags
diff --git a/devtools/tztop/dune b/devtools/tztop/dune
index 640b96032f49b8834b42b2ad31f3e2a4ad23ea90..9b02f54dda406d9eaf2702d1a769b1de31ef3710 100644
--- a/devtools/tztop/dune
+++ b/devtools/tztop/dune
@@ -8,6 +8,6 @@
  (modes byte)
  (libraries
   octez-protocol-compiler
-  octez-libs.tezos-base
+  octez-libs.base
   compiler-libs.toplevel
   (select tztop.ml from (utop -> tztop.utop.ml) (-> tztop.vanilla.ml))))
diff --git a/devtools/yes_wallet/dune b/devtools/yes_wallet/dune
index a929cf4814be7043b99eeaec15b29aa0103198b6..a73bafa74d354315791d656b5a4a12dd13258095 100644
--- a/devtools/yes_wallet/dune
+++ b/devtools/yes_wallet/dune
@@ -4,8 +4,8 @@
 (library
  (name yes_wallet_lib)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   lwt.unix
   ezjsonm
   octez-shell-libs.store
diff --git a/devtools/yes_wallet/test/dune b/devtools/yes_wallet/test/dune
index 8f2efda82bb84d6e84b0801bf671e6c6dddd0277..7117c49a4c9ea192606c3efef56a6307f77aab52 100644
--- a/devtools/yes_wallet/test/dune
+++ b/devtools/yes_wallet/test/dune
@@ -4,8 +4,8 @@
 (executable
  (name bench_signature_perf)
  (libraries
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-crypto
+  octez-libs.error-monad
+  octez-libs.crypto
   zarith
   zarith_stubs_js
   data-encoding
diff --git a/docs/developer/event_logging_framework.rst b/docs/developer/event_logging_framework.rst
index a660afacbb90139cf987043bb203783480d84ebc..7b83b02dc9c47fa4f10049e89f35db71f2a64bbb 100644
--- a/docs/developer/event_logging_framework.rst
+++ b/docs/developer/event_logging_framework.rst
@@ -34,7 +34,7 @@ See for instance
    ``val Simple.emit: 'a Simple.t -> 'a -> (unit, trace) result Lwt.t``.
 
 Please read the guidelines that are documented in
-`the Internal_event.Simple module. <../api/odoc/_html/tezos-event-logging/Tezos_event_logging/Internal_event/Simple/index.html>`__
+`the Internal_event.Simple module. <../api/odoc/_html/octez-libs/Event_logging/Internal_event/Simple/index.html>`__
 
 
 “Heavy” Events
diff --git a/docs/developer/testing.rst b/docs/developer/testing.rst
index 11aec8ba488e7f025b693c101d5487380c1ffd79..145ce73e64c44ca2c39c595f1cbb6b92456a48a9 100644
--- a/docs/developer/testing.rst
+++ b/docs/developer/testing.rst
@@ -199,7 +199,7 @@ Typical use cases:
 
 Example tests:
  - Unit tests for :package-api:`tezos-clic <octez-libs/Tezos_clic/index.html>`. To execute them locally, run ``dune build @src/lib_clic/runtest``.
- - Unit tests for :package:`tezos-version`. To execute them locally, run ``dune build @src/lib_version/runtest``.
+ - Unit tests for :package:`octez-version`. To execute them locally, run ``dune build @src/lib_version/runtest``.
 
 See :doc:`alcotezt` for more information on how to convert tests to
 Alcotezt, and how to execute them.
diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune
index 8d2fc7798be286ebf9e99ce020a3c34f8eb457fb..1ec2d2bd28698bf31e6be42d1e202b5bbb5081bf 100644
--- a/docs/doc_gen/dune
+++ b/docs/doc_gen/dune
@@ -1,11 +1,11 @@
 (executables
  (names rpc_doc
         p2p_doc)
- (libraries octez-libs.tezos-base
-            octez-libs.tezos-rpc
-            octez-libs.tezos-stdlib-unix
+ (libraries octez-libs.base
+            octez-libs.rpc
+            octez-libs.stdlib-unix
             octez-shell-libs.shell
-            octez-libs.tezos-rpc-http-server
+            octez-libs.rpc-http-server
             octez-shell-libs.protocol-updater
             ; TODO tezos/tezos#2170: adapt next line(s)
             tezos-protocol-genesis.embedded-protocol
diff --git a/dune-project b/dune-project
index 7a5ec942459479e75178912cfaf719b079c186da..19f596bb123e09a0d415bb18c6442e7799a9a755 100644
--- a/dune-project
+++ b/dune-project
@@ -68,6 +68,7 @@
 (package (name octez-snoop))
 (package (name octez-store-tests)(allow_empty))
 (package (name octez-testnet-scenarios))
+(package (name octez-version))
 (package (name scoru-sequencer-test)(allow_empty))
 (package (name tezos-benchmark))
 (package (name tezos-benchmark-017-PtNairob))
@@ -127,7 +128,6 @@
 (package (name tezos-tooling))
 (package (name tezos-tps-evaluation))
 (package (name tezos-tree-encoding-test)(allow_empty))
-(package (name tezos-version))
 (package (name tezt-ethereum)(allow_empty))
 (package (name tezt-tezos))
 ; This file was automatically generated, do not edit.
diff --git a/manifest/main.ml b/manifest/main.ml
index f5baa36af1044906b4be6c9ec8632d91b4725ec2..bea45651b482875d5f4d3b5677bd26086f64a2ac 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -500,7 +500,7 @@ let octez_l2_lib : Sub_lib.maker =
 
 let octez_test_helpers =
   octez_lib
-    "tezos-test-helpers"
+    "test-helpers"
     ~path:"src/lib_test"
     ~internal_name:"tezos_test_helpers"
     ~deps:[uri; fmt; qcheck_alcotest; lwt; pure_splitmix; data_encoding]
@@ -516,7 +516,10 @@ let octez_test_helpers =
         ]
 
 let octez_expect_helper =
-  octez_lib "tezos-expect-helper" ~path:"src/lib_expect_helper"
+  octez_lib
+    "expect-helper"
+    ~internal_name:"tezos_expect_helper"
+    ~path:"src/lib_expect_helper"
 
 let _octez_expect_helper_test =
   private_lib
@@ -528,7 +531,8 @@ let _octez_expect_helper_test =
 
 let octez_stdlib =
   octez_lib
-    "tezos-stdlib"
+    "stdlib"
+    ~internal_name:"tezos_stdlib"
     ~path:"src/lib_stdlib"
     ~synopsis:"Yet-another local-extension of the OCaml standard library"
     ~deps:[hex; zarith; zarith_stubs_js; lwt; aches]
@@ -588,7 +592,7 @@ let _octez_stdlib_test_unix =
 
 let octez_lwt_result_stdlib_bare_functor_outputs =
   octez_lib
-    "tezos-lwt-result-stdlib.bare.functor-outputs"
+    "lwt-result-stdlib.bare.functor-outputs"
     ~path:"src/lib_lwt_result_stdlib/bare/functor_outputs"
     ~internal_name:"bare_functor_outputs"
     ~js_compatible:true
@@ -596,7 +600,7 @@ let octez_lwt_result_stdlib_bare_functor_outputs =
 
 let octez_lwt_result_stdlib_bare_sigs =
   octez_lib
-    "tezos-lwt-result-stdlib.bare.sigs"
+    "lwt-result-stdlib.bare.sigs"
     ~path:"src/lib_lwt_result_stdlib/bare/sigs"
     ~internal_name:"bare_sigs"
     ~js_compatible:true
@@ -604,7 +608,7 @@ let octez_lwt_result_stdlib_bare_sigs =
 
 let octez_lwt_result_stdlib_bare_structs =
   octez_lib
-    "tezos-lwt-result-stdlib.bare.structs"
+    "lwt-result-stdlib.bare.structs"
     ~path:"src/lib_lwt_result_stdlib/bare/structs"
     ~internal_name:"bare_structs"
     ~js_compatible:true
@@ -612,7 +616,7 @@ let octez_lwt_result_stdlib_bare_structs =
 
 let octez_lwt_result_stdlib_traced_functor_outputs =
   octez_lib
-    "tezos-lwt-result-stdlib.traced.functor-outputs"
+    "lwt-result-stdlib.traced.functor-outputs"
     ~path:"src/lib_lwt_result_stdlib/traced/functor_outputs"
     ~internal_name:"traced_functor_outputs"
     ~js_compatible:true
@@ -620,7 +624,7 @@ let octez_lwt_result_stdlib_traced_functor_outputs =
 
 let octez_lwt_result_stdlib_traced_sigs =
   octez_lib
-    "tezos-lwt-result-stdlib.traced.sigs"
+    "lwt-result-stdlib.traced.sigs"
     ~path:"src/lib_lwt_result_stdlib/traced/sigs"
     ~internal_name:"traced_sigs"
     ~js_compatible:true
@@ -634,7 +638,7 @@ let octez_lwt_result_stdlib_traced_sigs =
 
 let octez_lwt_result_stdlib_traced_structs =
   octez_lib
-    "tezos-lwt-result-stdlib.traced.structs"
+    "lwt-result-stdlib.traced.structs"
     ~path:"src/lib_lwt_result_stdlib/traced/structs"
     ~internal_name:"traced_structs"
     ~js_compatible:true
@@ -647,8 +651,9 @@ let octez_lwt_result_stdlib_traced_structs =
 
 let octez_lwt_result_stdlib =
   octez_lib
-    "tezos-lwt-result-stdlib"
+    "lwt-result-stdlib"
     ~path:"src/lib_lwt_result_stdlib"
+    ~internal_name:"tezos_lwt_result_stdlib"
     ~synopsis:"error-aware stdlib replacement"
     ~js_compatible:true
     ~documentation:
@@ -668,7 +673,7 @@ let octez_lwt_result_stdlib =
 
 let octez_lwt_result_stdlib_examples_traces =
   octez_lib
-    "tezos-lwt-result-stdlib.examples.traces"
+    "lwt-result-stdlib.examples.traces"
     ~path:"src/lib_lwt_result_stdlib/examples/traces"
     ~internal_name:"traces"
     ~deps:
@@ -708,7 +713,8 @@ let _octez_lwt_result_stdlib_tests =
 
 let octez_error_monad =
   octez_lib
-    "tezos-error-monad"
+    "error-monad"
+    ~internal_name:"tezos_error_monad"
     ~path:"src/lib_error_monad"
     ~synopsis:"Error monad"
     ~deps:
@@ -727,7 +733,8 @@ let octez_hacl =
   let js_generated = "runtime-generated.js" in
   let js_helper = "helper.js" in
   octez_lib
-    "tezos-hacl"
+    "hacl"
+    ~internal_name:"tezos_hacl"
     ~path:"src/lib_hacl"
     ~synopsis:"Thin layer around hacl-star"
     ~deps:[hacl_star; hacl_star_raw; ctypes_stubs_js]
@@ -863,7 +870,8 @@ let _octez_error_monad_tests =
 
 let octez_rpc =
   octez_lib
-    "tezos-rpc"
+    "rpc"
+    ~internal_name:"tezos_rpc"
     ~path:"src/lib_rpc"
     ~synopsis:
       "Library of auto-documented RPCs (service and hierarchy descriptions)"
@@ -1100,7 +1108,7 @@ let _octez_bls12_381_utils =
 
 let octez_bls12_381_signature =
   octez_lib
-    "octez-bls12-381-signature"
+    "bls12-381-signature"
     ~path:"src/lib_bls12_381_signature"
     ~internal_name:"bls12_381_signature"
     ~deps:[bls12_381]
@@ -1155,7 +1163,8 @@ let _octez_bls12_381_signature_gen_wasm_needed_names =
 
 let octez_crypto =
   octez_lib
-    "tezos-crypto"
+    "crypto"
+    ~internal_name:"tezos_crypto"
     ~path:"src/lib_crypto"
     ~synopsis:"Library with all the cryptographic primitives used by Tezos"
     ~deps:
@@ -1235,7 +1244,7 @@ let _octez_crypto_tests_unix =
 
 let octez_bls12_381_hash =
   octez_lib
-    "octez-bls12-381-hash"
+    "bls12-381-hash"
     ~path:"src/lib_bls12_381_hash"
     ~internal_name:"bls12_381_hash"
     ~c_library_flags:["-Wall"; "-Wextra"; ":standard"; "-lpthread"]
@@ -1269,7 +1278,7 @@ let _octez_bls12_381_hash_tests =
 
 let octez_mec =
   octez_lib
-    "octez-mec"
+    "mec"
     ~path:"src/lib_mec"
     ~internal_name:"mec"
     ~deps:[alcotest; bls12_381; bigarray_compat; eqaf]
@@ -1341,7 +1350,7 @@ let _octez_mec_tests =
 
 let octez_polynomial =
   octez_lib
-    "octez-polynomial"
+    "polynomial"
     ~path:"src/lib_polynomial"
     ~internal_name:"polynomial"
     ~synopsis:"Polynomials over finite fields"
@@ -1356,7 +1365,8 @@ let _octez_polynomial_tests =
 
 let octez_bls12_381_polynomial =
   octez_lib
-    "octez-bls12-381-polynomial"
+    "bls12-381-polynomial"
+    ~internal_name:"octez_bls12_381_polynomial"
     ~path:"src/lib_bls12_381_polynomial"
     ~synopsis:
       "Polynomials over BLS12-381 finite field - Temporary vendored version of \
@@ -1406,7 +1416,8 @@ let _octez_bls12_381_polynomial_tests =
 
 let octez_srs_extraction =
   octez_lib
-    "octez-srs-extraction"
+    "srs-extraction"
+    ~internal_name:"octez_srs_extraction"
     ~path:"src/lib_srs_extraction"
     ~modules:["libsrs"]
     ~bisect_ppx:No
@@ -1486,7 +1497,7 @@ let _octez_srs_extraction_tests =
 
 let octez_plompiler =
   octez_lib
-    "octez-plompiler"
+    "plompiler"
     ~internal_name:"plompiler"
     ~path:"src/lib_plompiler"
     ~deps:
@@ -1549,7 +1560,7 @@ let make_plonk_runtest_invocation ~package =
 
 let octez_plonk =
   octez_lib
-    "octez-plonk"
+    "plonk"
     ~internal_name:"plonk"
     ~path:"src/lib_plonk"
     ~deps:
@@ -1565,7 +1576,7 @@ let octez_plonk =
 
 let octez_plonk_aggregation =
   octez_lib
-    "octez-plonk.aggregation"
+    "plonk.aggregation"
     ~path:"src/lib_aplonk/plonk-aggregation"
     ~internal_name:"aggregation"
     ~preprocess:[pps ppx_repr]
@@ -1573,7 +1584,7 @@ let octez_plonk_aggregation =
 
 let octez_aplonk =
   octez_lib
-    "octez-aplonk"
+    "aplonk"
     ~internal_name:"aplonk"
     ~path:"src/lib_aplonk"
     ~preprocess:[pps ppx_repr]
@@ -1581,7 +1592,7 @@ let octez_aplonk =
 
 let octez_plonk_distribution =
   octez_lib
-    "octez-plonk.distribution"
+    "plonk.distribution"
     ~internal_name:"distribution"
     ~path:"src/lib_distributed_plonk/distribution"
     ~deps:[octez_plonk; octez_plonk_aggregation]
@@ -1589,7 +1600,7 @@ let octez_plonk_distribution =
 
 let octez_plonk_communication =
   octez_lib
-    "octez-plonk.communication"
+    "plonk.communication"
     ~internal_name:"communication"
     ~path:"src/lib_distributed_plonk/communication"
     ~deps:[logs; distributed_internal_lwt; octez_plonk_distribution |> open_]
@@ -1597,7 +1608,7 @@ let octez_plonk_communication =
 
 let octez_plonk_test_helpers =
   octez_lib
-    "octez-plonk.plonk-test"
+    "plonk.plonk-test"
     ~path:"src/lib_plonk/test"
     ~internal_name:"plonk_test"
     ~deps:[octez_plonk; octez_plonk_aggregation; octez_plonk_distribution]
@@ -1699,7 +1710,7 @@ let _octez_plonk_test_plompiler_main =
 
 let octez_distributed_plonk =
   octez_lib
-    "octez-distributed-plonk"
+    "distributed-plonk"
     ~internal_name:"distributed_plonk"
     ~path:"src/lib_distributed_plonk"
     ~deps:
@@ -1784,7 +1795,7 @@ let _octez_aplonk_test_helpers_bench =
 
 let octez_epoxy_tx =
   octez_lib
-    "octez-epoxy-tx"
+    "epoxy-tx"
     ~path:"src/lib_epoxy_tx"
     ~internal_name:"epoxy_tx"
     ~deps:[octez_plompiler; hex; stdint; octez_plonk; octez_mec]
@@ -1799,14 +1810,16 @@ let _octez_epoxy_tx_tests =
 
 let octez_dal_config =
   octez_lib
-    "tezos-crypto-dal.octez-dal-config"
+    "crypto-dal.dal-config"
+    ~internal_name:"tezos_crypto_dal_octez_dal_config"
     ~path:"src/lib_crypto_dal/dal_config"
     ~deps:[data_encoding |> open_]
     ~js_compatible:true
 
 let octez_crypto_dal =
   octez_lib
-    "tezos-crypto-dal"
+    "crypto-dal"
+    ~internal_name:"tezos_crypto_dal"
     ~path:"src/lib_crypto_dal"
     ~synopsis:"DAL cryptographic primitives"
     ~deps:
@@ -1841,7 +1854,8 @@ let _octez_crypto_dal_tests =
 
 let octez_event_logging =
   octez_lib
-    "tezos-event-logging"
+    "event-logging"
+    ~internal_name:"tezos_event_logging"
     ~path:"src/lib_event_logging"
     ~synopsis:"Octez event logging library"
     ~deps:
@@ -1856,7 +1870,8 @@ let octez_event_logging =
 
 let octez_event_logging_test_helpers =
   octez_lib
-    "tezos-event-logging-test-helpers"
+    "event-logging-test-helpers"
+    ~internal_name:"tezos_event_logging_test_helpers"
     ~path:"src/lib_event_logging/test_helpers"
     ~synopsis:"Test helpers for the event logging library"
     ~deps:
@@ -1875,7 +1890,8 @@ let octez_event_logging_test_helpers =
 
 let octez_stdlib_unix =
   octez_lib
-    "tezos-stdlib-unix"
+    "stdlib-unix"
+    ~internal_name:"tezos_stdlib_unix"
     ~path:"src/lib_stdlib_unix"
     ~synopsis:
       "Yet-another local-extension of the OCaml standard library \
@@ -1918,7 +1934,8 @@ let _octez_stdlib_unix_test =
 
 let octez_clic =
   octez_lib
-    "tezos-clic"
+    "clic"
+    ~internal_name:"tezos_clic"
     ~path:"src/lib_clic"
     ~deps:
       [
@@ -1932,7 +1949,8 @@ let octez_clic =
 
 let octez_clic_unix =
   octez_lib
-    "tezos-clic.unix"
+    "clic.unix"
+    ~internal_name:"tezos_clic_unix"
     ~path:"src/lib_clic/unix"
     ~deps:
       [
@@ -1961,7 +1979,8 @@ let _octez_clic_example =
 
 let octez_micheline =
   octez_lib
-    "tezos-micheline"
+    "micheline"
+    ~internal_name:"tezos_micheline"
     ~path:"src/lib_micheline"
     ~synopsis:"Internal AST and parser for the Michelson language"
     ~deps:
@@ -1998,7 +2017,8 @@ let _octez_micheline_tests =
 
 let octez_base =
   octez_lib
-    "tezos-base"
+    "base"
+    ~internal_name:"tezos_base"
     ~path:"src/lib_base"
     ~synopsis:"Meta-package and pervasive type definitions for Tezos"
     ~deps:
@@ -2029,7 +2049,8 @@ let octez_base =
 
 let octez_base_unix =
   octez_lib
-    "tezos-base.unix"
+    "base.unix"
+    ~internal_name:"tezos_base_unix"
     ~path:"src/lib_base/unix"
     ~deps:
       [
@@ -2047,7 +2068,8 @@ let octez_base_unix =
 
 let octez_base_p2p_identity_file =
   octez_lib
-    "tezos-base.p2p-identity-file"
+    "base.p2p-identity-file"
+    ~internal_name:"tezos_base_p2p_identity_file"
     ~path:"src/lib_base/p2p_identity_file"
     ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_stdlib_unix |> open_]
 
@@ -2103,7 +2125,8 @@ let _octez_base_unix_tests =
 
 let octez_base_test_helpers =
   octez_lib
-    "tezos-base-test-helpers"
+    "base-test-helpers"
+    ~internal_name:"tezos_base_test_helpers"
     ~path:"src/lib_base/test_helpers"
     ~synopsis:"Octez base test helpers"
     ~deps:
@@ -2122,14 +2145,16 @@ let octez_base_test_helpers =
 
 let octez_context_sigs =
   octez_lib
-    "tezos-context.sigs"
+    "context.sigs"
+    ~internal_name:"tezos_context_sigs"
     ~path:"src/lib_context/sigs"
     ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_stdlib |> open_]
     ~js_compatible:true
 
 let tree_encoding =
   octez_lib
-    "tezos-tree-encoding"
+    "tree-encoding"
+    ~internal_name:"tezos_tree_encoding"
     ~path:"src/lib_tree_encoding"
     ~synopsis:
       "A general-purpose library to encode arbitrary data in Merkle trees"
@@ -2143,7 +2168,8 @@ let tree_encoding =
 
 let lazy_containers =
   octez_lib
-    "tezos-lazy-containers"
+    "lazy-containers"
+    ~internal_name:"tezos_lazy_containers"
     ~path:"src/lib_lazy_containers"
     ~synopsis:
       "A collection of lazy containers whose contents is fetched from \
@@ -2223,7 +2249,8 @@ let _octez_webassembly_test =
 
 let octez_version_parser =
   octez_lib
-    "tezos-version.parser"
+    "version.parser"
+    ~internal_name:"tezos_version_parser"
     ~path:"src/lib_version/parser"
     ~dune:Dune.[ocamllex "tezos_version_parser"]
     ~js_compatible:true
@@ -2231,7 +2258,8 @@ let octez_version_parser =
 
 let octez_version =
   octez_lib
-    "tezos-version"
+    "version"
+    ~internal_name:"tezos_version"
     ~path:"src/lib_version"
     ~synopsis:"Version information generated from Git"
     ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_version_parser]
@@ -2239,7 +2267,8 @@ let octez_version =
 
 let octez_version_value =
   public_lib
-    "tezos-version.value"
+    "octez-version.value"
+    ~internal_name:"tezos_version_value"
     ~path:"src/lib_version/value/"
     ~synopsis:"Tezos: version value generated from Git"
     ~deps:
@@ -2267,17 +2296,17 @@ let _octez_version_get_git_info =
   private_exe
     "get_git_info"
     ~path:"src/lib_version/exe"
-    ~opam:"tezos-version"
+    ~opam:"octez-version"
     ~deps:[dune_configurator; octez_version_parser]
     ~modules:["get_git_info"]
     ~bisect_ppx:No
 
 let _octez_print_version_exe =
   public_exe
-    "tezos-version"
+    "octez-version"
     ~internal_name:"tezos_print_version"
     ~path:"src/lib_version/exe"
-    ~opam:"tezos-version"
+    ~opam:"octez-version"
     ~deps:
       [octez_version_value |> open_; octez_version |> open_; octez_base_unix]
     ~modules:["tezos_print_version"]
@@ -3382,7 +3411,8 @@ let _octez_store_mocked =
 
 let octez_requester =
   octez_lib
-    "tezos-requester"
+    "requester"
+    ~internal_name:"tezos_requester"
     ~path:"src/lib_requester"
     ~deps:
       [
@@ -3449,7 +3479,8 @@ let octez_shell =
 
 let octez_rpc_http =
   octez_lib
-    "tezos-rpc-http"
+    "rpc-http"
+    ~internal_name:"tezos-rpc-http"
     ~path:"src/lib_rpc_http"
     ~synopsis:"Library of auto-documented RPCs (http server and client)"
     ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_rpc; resto_cohttp; uri]
@@ -3457,7 +3488,8 @@ let octez_rpc_http =
 
 let octez_rpc_http_client =
   octez_lib
-    "tezos-rpc-http-client"
+    "rpc-http-client"
+    ~internal_name:"tezos-rpc-http-client"
     ~path:"src/lib_rpc_http"
     ~synopsis:"Library of auto-documented RPCs (http client)"
     ~deps:
@@ -3471,7 +3503,8 @@ let octez_rpc_http_client =
 
 let octez_rpc_http_client_unix =
   octez_lib
-    "tezos-rpc-http-client-unix"
+    "rpc-http-client-unix"
+    ~internal_name:"tezos_rpc_http_client_unix"
     ~path:"src/lib_rpc_http"
     ~synopsis:"Unix implementation of the RPC client"
     ~deps:
@@ -3487,7 +3520,8 @@ let octez_rpc_http_client_unix =
 
 let octez_rpc_http_server =
   octez_lib
-    "tezos-rpc-http-server"
+    "rpc-http-server"
+    ~internal_name:"tezos_rpc_http_server"
     ~path:"src/lib_rpc_http"
     ~synopsis:"Library of auto-documented RPCs (http server)"
     ~deps:
diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam
index d24cde83aab965dd01b53f5656b35ed3e6cbb4e6..53408e0a7dc05124b9fa90d5516ca160932ca80e 100644
--- a/opam/octez-codec.opam
+++ b/opam/octez-codec.opam
@@ -13,7 +13,7 @@ depends: [
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
   "octez-libs"
   "octez-shell-libs"
-  "tezos-version"
+  "octez-version"
 ]
 depopts: [
   "octez-protocol-005-PsBabyM1-libs"
diff --git a/opam/octez-evm-proxy-lib.opam b/opam/octez-evm-proxy-lib.opam
index 7e3488607f223a64fc9b3ba92228d6e1c743de05..15a33a04095294278b4b17776b9a8adee7330b97 100644
--- a/opam/octez-evm-proxy-lib.opam
+++ b/opam/octez-evm-proxy-lib.opam
@@ -11,7 +11,7 @@ depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
   "octez-libs"
-  "tezos-version"
+  "octez-version"
   "lwt-exit"
   "rlp" { >= "0.1" }
   "rope" { >= "0.6.2" }
diff --git a/opam/octez-evm-proxy.opam b/opam/octez-evm-proxy.opam
index 54bec7a26b4ec1950a22a4b156779cc3f4e436e0..70dbc9b4486a04c9933c5544bd920bf6d08344da 100644
--- a/opam/octez-evm-proxy.opam
+++ b/opam/octez-evm-proxy.opam
@@ -11,7 +11,7 @@ depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
   "octez-libs"
-  "tezos-version"
+  "octez-version"
   "octez-evm-proxy-lib"
 ]
 build: [
diff --git a/opam/octez-node.opam b/opam/octez-node.opam
index 234191d9855ad36c139d64278abc9f726f50ba9f..75fd9f4e37360c1ce65fb1428021e8575263d51b 100644
--- a/opam/octez-node.opam
+++ b/opam/octez-node.opam
@@ -11,7 +11,7 @@ depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
   "octez-libs"
-  "tezos-version"
+  "octez-version"
   "octez-node-config"
   "octez-shell-libs"
   "cmdliner" { >= "1.1.0" }
diff --git a/opam/octez-protocol-017-PtNairob-libs.opam b/opam/octez-protocol-017-PtNairob-libs.opam
index 1a0aee9615093e2c3c477a76267514fb5e4adbb4..85304b92827d35c8af42a9064c9b23e08398016a 100644
--- a/opam/octez-protocol-017-PtNairob-libs.opam
+++ b/opam/octez-protocol-017-PtNairob-libs.opam
@@ -17,7 +17,7 @@ depends: [
   "uri" { >= "3.1.0" }
   "qcheck-alcotest" { >= "0.20" }
   "octez-proto-libs"
-  "tezos-version"
+  "octez-version"
   "tezos-dal-node-services"
   "lwt-canceler" { >= "0.3" & < "0.4" }
   "lwt-exit"
diff --git a/opam/octez-protocol-018-Proxford-libs.opam b/opam/octez-protocol-018-Proxford-libs.opam
index c2bd0cae77427d74a4e085f2f3737a2638179870..141aaf6a8b187a397807e4ba16992feaa227c625 100644
--- a/opam/octez-protocol-018-Proxford-libs.opam
+++ b/opam/octez-protocol-018-Proxford-libs.opam
@@ -17,7 +17,7 @@ depends: [
   "uri" { >= "3.1.0" }
   "qcheck-alcotest" { >= "0.20" }
   "octez-proto-libs"
-  "tezos-version"
+  "octez-version"
   "tezos-dal-node-services"
   "lwt-canceler" { >= "0.3" & < "0.4" }
   "lwt-exit"
diff --git a/opam/octez-protocol-alpha-libs.opam b/opam/octez-protocol-alpha-libs.opam
index 2a4ace9afc76d6bceda91caf6ee3b349a0aabcd3..db00585068bf7667b3baa8575f21cefc358f6a95 100644
--- a/opam/octez-protocol-alpha-libs.opam
+++ b/opam/octez-protocol-alpha-libs.opam
@@ -17,7 +17,7 @@ depends: [
   "uri" { >= "3.1.0" }
   "qcheck-alcotest" { >= "0.20" }
   "octez-proto-libs"
-  "tezos-version"
+  "octez-version"
   "tezos-dal-node-services"
   "lwt-canceler" { >= "0.3" & < "0.4" }
   "lwt-exit"
diff --git a/opam/octez-protocol-compiler.opam b/opam/octez-protocol-compiler.opam
index 985634ebf737c0e162d7fcbbf816764d942f37a5..1a7b00b5efc96be25bade0779c6f1ceeb97d39be 100644
--- a/opam/octez-protocol-compiler.opam
+++ b/opam/octez-protocol-compiler.opam
@@ -15,7 +15,7 @@ depends: [
   "lwt" { >= "5.6.0" }
   "ocp-ocamlres" { >= "0.4" }
   "base-unix"
-  "tezos-version"
+  "octez-version"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-proxy-server.opam b/opam/octez-proxy-server.opam
index 692d08e8e0694ea42ed5ff14f46405d54122b134..e401b745f54e2c7bdef2a74a17ea5460bca5ba1d 100644
--- a/opam/octez-proxy-server.opam
+++ b/opam/octez-proxy-server.opam
@@ -16,7 +16,7 @@ depends: [
   "lwt" { >= "5.6.0" }
   "octez-shell-libs"
   "tezos-proxy-server-config"
-  "tezos-version"
+  "octez-version"
   "uri" { >= "3.1.0" }
 ]
 depopts: [
diff --git a/opam/octez-shell-libs.opam b/opam/octez-shell-libs.opam
index e431a21a079fa2111d077cfaeeddd027e1eae21c..0f62eadd17376aeccfded0b39c5d0595f84dd4f8 100644
--- a/opam/octez-shell-libs.opam
+++ b/opam/octez-shell-libs.opam
@@ -23,7 +23,7 @@ depends: [
   "octez-proto-libs"
   "octez-protocol-compiler"
   "lwt-exit"
-  "tezos-version"
+  "octez-version"
   "aches-lwt" { >= "1.0.0" }
   "index" { >= "1.6.0" & < "1.7.0" }
   "irmin-pack" { >= "3.7.2" & < "3.8.0" }
diff --git a/opam/octez-shell-tests.opam b/opam/octez-shell-tests.opam
index cc7a06bf7f9dfe5a79e58b6ef155d906e4f3f4cc..96481e8ac823d4e4eeb033aba3a092e3b96de2cb 100644
--- a/opam/octez-shell-tests.opam
+++ b/opam/octez-shell-tests.opam
@@ -15,7 +15,7 @@ depends: [
   "octez-shell-libs" {with-test}
   "tezos-protocol-demo-noops" {with-test}
   "octez-alcotezt" {with-test}
-  "tezos-version" {with-test}
+  "octez-version" {with-test}
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-smart-rollup-client-Proxford.opam b/opam/octez-smart-rollup-client-Proxford.opam
index 097722ba7bc864677c79b4befb5a30cbbb624936..ec9edb382d0f732d10244afc4127e1d2f321e261 100644
--- a/opam/octez-smart-rollup-client-Proxford.opam
+++ b/opam/octez-smart-rollup-client-Proxford.opam
@@ -15,7 +15,7 @@ depends: [
   "octez-shell-libs"
   "octez-protocol-018-Proxford-libs"
   "octez-l2-libs"
-  "tezos-version"
+  "octez-version"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-smart-rollup-client-PtNairob.opam b/opam/octez-smart-rollup-client-PtNairob.opam
index c113de173d7ae7b02e802865c09f1b93c6a40a76..3f459b0570e21afe3ce23cc53a6b27f681c24f8f 100644
--- a/opam/octez-smart-rollup-client-PtNairob.opam
+++ b/opam/octez-smart-rollup-client-PtNairob.opam
@@ -15,7 +15,7 @@ depends: [
   "octez-shell-libs"
   "octez-protocol-017-PtNairob-libs"
   "octez-l2-libs"
-  "tezos-version"
+  "octez-version"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam
index 9ec520f246ea88e481b3dd1bd47abfe20489f677..9ba5b4c0b769e4fc309c8e352f8c4adaaf7a93e2 100644
--- a/opam/octez-smart-rollup-client-alpha.opam
+++ b/opam/octez-smart-rollup-client-alpha.opam
@@ -15,7 +15,7 @@ depends: [
   "octez-shell-libs"
   "octez-protocol-alpha-libs"
   "octez-l2-libs"
-  "tezos-version"
+  "octez-version"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-smart-rollup-node-Proxford.opam b/opam/octez-smart-rollup-node-Proxford.opam
index 1f59b4b64d37845455bc76ca8ea1b990e84d0b62..017c312681b06e2514d37d8512decfe3f686a023 100644
--- a/opam/octez-smart-rollup-node-Proxford.opam
+++ b/opam/octez-smart-rollup-node-Proxford.opam
@@ -27,7 +27,7 @@ depends: [
   "aches-lwt" { >= "1.0.0" }
   "octez-injector"
   "octez-smart-rollup-node-lib"
-  "tezos-version"
+  "octez-version"
 ]
 conflicts: [
   "checkseum" { = "0.5.0" }
diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam
index 0f4c469f8deb60aceba3bd4411a84bf22eb3a4ec..587fbd0ea2c77042a726be1ce7bf9b75195d0045 100644
--- a/opam/octez-smart-rollup-node-PtNairob.opam
+++ b/opam/octez-smart-rollup-node-PtNairob.opam
@@ -26,7 +26,7 @@ depends: [
   "aches-lwt" { >= "1.0.0" }
   "octez-injector"
   "octez-smart-rollup-node-lib"
-  "tezos-version"
+  "octez-version"
 ]
 conflicts: [
   "checkseum" { = "0.5.0" }
diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam
index 00026c8fc0ab0431af404fcf8eab0fcb0f3132f5..829f18cbadb15ddca99acf79c400f50026b668be 100644
--- a/opam/octez-smart-rollup-node-alpha.opam
+++ b/opam/octez-smart-rollup-node-alpha.opam
@@ -27,7 +27,7 @@ depends: [
   "aches-lwt" { >= "1.0.0" }
   "octez-injector"
   "octez-smart-rollup-node-lib"
-  "tezos-version"
+  "octez-version"
 ]
 conflicts: [
   "checkseum" { = "0.5.0" }
diff --git a/opam/octez-smart-rollup-node-lib.opam b/opam/octez-smart-rollup-node-lib.opam
index 9a263935f284a25355c89a6ec00b77f606243e75..9b59b4dd37645bdd7f048d2fed6f0d3fcff10045 100644
--- a/opam/octez-smart-rollup-node-lib.opam
+++ b/opam/octez-smart-rollup-node-lib.opam
@@ -19,7 +19,7 @@ depends: [
   "tezos-dac-lib"
   "tezos-dac-client-lib"
   "octez-injector"
-  "tezos-version"
+  "octez-version"
   "octez-l2-libs"
   "octez-crawler"
 ]
diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam
index d6f50a8b9a46a037995e9be626b910143b7661f1..4481e2ef1efd8126b98dd1e2038601fe13f8e224 100644
--- a/opam/octez-smart-rollup-wasm-debugger.opam
+++ b/opam/octez-smart-rollup-wasm-debugger.opam
@@ -14,7 +14,7 @@ depends: [
   "yaml" { >= "3.1.0" }
   "octez-protocol-alpha-libs"
   "octez-l2-libs"
-  "tezos-version"
+  "octez-version"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam
index d6f5e2fba0e68bafd94416a9237fa1dd4529a0ea..97e0b31f50bd31519e5963d86d28f3a1c5ebf00b 100644
--- a/opam/octez-snoop.opam
+++ b/opam/octez-snoop.opam
@@ -17,7 +17,7 @@ depends: [
   "tezos-benchmarks-proto-alpha"
   "pyml"
   "prbnmcn-stats" { = "0.0.6" }
-  "tezos-version"
+  "octez-version"
 ]
 build: [
   ["rm" "-r" "vendors" "contrib"]
diff --git a/opam/tezos-version.opam b/opam/octez-version.opam
similarity index 100%
rename from opam/tezos-version.opam
rename to opam/octez-version.opam
diff --git a/scripts/gen-genesis/dune b/scripts/gen-genesis/dune
index 178d76445f75980df003ba846a89834bb785691e..e1a7241a653086d2a3cb2a12babe3d54b33070f3 100644
--- a/scripts/gen-genesis/dune
+++ b/scripts/gen-genesis/dune
@@ -2,6 +2,6 @@
  (name gen_genesis)
  (libraries
    lwt.unix
-   octez-libs.tezos-base
-   octez-libs.tezos-base.unix
-   octez-libs.tezos-crypto))
+   octez-libs.base
+   octez-libs.base.unix
+   octez-libs.crypto))
diff --git a/scripts/test_release_version.sh b/scripts/test_release_version.sh
index 9f659c18d1a60aecef7b2a935fe351e5669ccca1..29e31b1d05d56cbf030f8fcb64ae8df9e37873dc 100755
--- a/scripts/test_release_version.sh
+++ b/scripts/test_release_version.sh
@@ -13,7 +13,7 @@ CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 
 test_version() {
   rm -f _build/default/src/lib_version/generated_git_info.ml
-  res=$(dune exec tezos-version ||:)
+  res=$(dune exec octez-version ||:)
   if [ "$res" != "$1" ]
   then
     echo "Expected version '$1', got '$res' => FAIL"
diff --git a/src/bin_client/dune b/src/bin_client/dune
index ba59c64cdd4fe76976457fccaa53a3b82f17d8b7..08f4ec5b3dfb90f4bceb38821bb7d1dea1f887c5 100644
--- a/src/bin_client/dune
+++ b/src/bin_client/dune
@@ -7,11 +7,11 @@
  (package octez-client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-clic
-  octez-libs.tezos-rpc-http-client
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.clic
+  octez-libs.rpc-http-client
+  octez-libs.stdlib-unix
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-shell-libs.client-commands
diff --git a/src/bin_codec/dune b/src/bin_codec/dune
index 3f96218b28842b8c143e1e10e331b5dcd5784622..f9b6ceec16138249cf65df2b60c37d67b8da2433 100644
--- a/src/bin_codec/dune
+++ b/src/bin_codec/dune
@@ -8,15 +8,15 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   data-encoding
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   octez-shell-libs.client-base-unix
   octez-shell-libs.client-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-event-logging
+  octez-libs.clic
+  octez-libs.stdlib-unix
+  octez-libs.event-logging
   octez-shell-libs.signer-services
-  tezos-version.value
+  octez-version.value
   (select void_for_linking-octez-protocol-005-PsBabyM1-libs-client from
    (octez-protocol-005-PsBabyM1-libs.client -> void_for_linking-octez-protocol-005-PsBabyM1-libs-client.empty)
    (-> void_for_linking-octez-protocol-005-PsBabyM1-libs-client.empty))
diff --git a/src/bin_dac_client/dune b/src/bin_dac_client/dune
index 250bbac7444a42996f37a3a2ef49533f8729327c..028f2a2d354a77590d4c0eb6ee40c4cc8cf38477 100644
--- a/src/bin_dac_client/dune
+++ b/src/bin_dac_client/dune
@@ -7,14 +7,14 @@
  (package octez-dac-client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.clic
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
   octez-shell-libs.client-commands
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
   tezos-dac-lib
   tezos-dac-client-lib
   octez-protocol-017-PtNairob-libs.dac
diff --git a/src/bin_dac_node/dune b/src/bin_dac_node/dune
index 8ee726dc641ae59f5f7d512701772c804173eede..bf16b138e6288044313a3ac0894b17c4ee1307a9 100644
--- a/src/bin_dac_node/dune
+++ b/src/bin_dac_node/dune
@@ -7,18 +7,18 @@
  (package octez-dac-node)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.clic
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-server
+  octez-libs.rpc-http
+  octez-libs.rpc-http-server
   octez-shell-libs.protocol-updater
-  octez-libs.tezos-rpc-http-client-unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
+  octez-libs.rpc-http-client-unix
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
   tezos-dac-lib
   tezos_dac_node_lib
   octez-l2-libs.layer2_store
diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune
index d59fd17ae246d8c505b102ff0a284b654f10dd30..06f664c455c6aeb2b0b0598985c58f254042c3f4 100644
--- a/src/bin_dal_node/dune
+++ b/src/bin_dal_node/dune
@@ -7,31 +7,31 @@
  (package octez-dal-node)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-version
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.version
   cmdliner
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-server
+  octez-libs.rpc-http
+  octez-libs.rpc-http-server
   octez-shell-libs.protocol-updater
-  octez-libs.tezos-rpc-http-client-unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
+  octez-libs.rpc-http-client-unix
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
   tezos-dal-node-lib
   tezos-dal-node-services
   octez-l2-libs.layer2_store
-  octez-libs.tezos-crypto-dal
+  octez-libs.crypto-dal
   octez-shell-libs.store.unix
   octez-shell-libs.store.shared
   octez-libs.tezos-gossipsub
   tezos-dal-node-lib.gossipsub
   octez-shell-libs.p2p
   octez-libs.tezos-p2p-services
-  octez-libs.tezos-crypto
-  octez-libs.tezos-base.p2p-identity-file
+  octez-libs.crypto
+  octez-libs.base.p2p-identity-file
   octez-shell-libs.shell-services
   irmin-pack
   irmin-pack.unix
diff --git a/src/bin_evm_proxy/chunker/dune b/src/bin_evm_proxy/chunker/dune
index 8bea9ff1a6c83a978a7690903760722185349767..5196781cc6ca739dae31f49888fd2aa19110fc3e 100644
--- a/src/bin_evm_proxy/chunker/dune
+++ b/src/bin_evm_proxy/chunker/dune
@@ -5,7 +5,7 @@
  (name octez_evm_chunker)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   evm_proxy_lib)
  (flags
   (:standard)
diff --git a/src/bin_evm_proxy/dune b/src/bin_evm_proxy/dune
index fe22daaba1a51838c3f78e639c29b153998f113e..732c1494df5eae1b97f88da9bd437335e9117b12 100644
--- a/src/bin_evm_proxy/dune
+++ b/src/bin_evm_proxy/dune
@@ -7,12 +7,12 @@
  (package octez-evm-proxy)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-clic
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-server
-  tezos-version.value
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.clic
+  octez-libs.rpc-http
+  octez-libs.rpc-http-server
+  octez-version.value
   evm_proxy_lib)
  (link_flags
   (:standard)
diff --git a/src/bin_evm_proxy/lib/dune b/src/bin_evm_proxy/lib/dune
index 1ca186f2568cd2dea08056a4caaf1488e32fab06..df54bcae863c7f43a8976315e7ea89e3b96ffd82 100644
--- a/src/bin_evm_proxy/lib/dune
+++ b/src/bin_evm_proxy/lib/dune
@@ -6,10 +6,10 @@
  (package octez-evm-proxy-lib)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-client-unix
-  tezos-version.value
+  octez-libs.base
+  octez-libs.rpc-http
+  octez-libs.rpc-http-client-unix
+  octez-version.value
   lwt-exit
   rlp
   rope)
diff --git a/src/bin_evm_proxy/upgrade_signer/dune b/src/bin_evm_proxy/upgrade_signer/dune
index 1395df352162895b6f717bf45b89dd07df3e6bd6..ef4e77fd7c1556b4f488b1d8142ef926f9009cdd 100644
--- a/src/bin_evm_proxy/upgrade_signer/dune
+++ b/src/bin_evm_proxy/upgrade_signer/dune
@@ -5,9 +5,9 @@
  (name octez_evm_upgrade_signer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.clic
   evm_proxy_lib)
  (flags
   (:standard)
diff --git a/src/bin_node/dune b/src/bin_node/dune
index 7a86e12cdb5e5b7b6829e5d20e46e7ee258e0136..35956a2d1978f875a32d20245880fd0898db9fb4 100644
--- a/src/bin_node/dune
+++ b/src/bin_node/dune
@@ -7,15 +7,15 @@
  (package octez-node)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-version
-  tezos-version.value
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.version
+  octez-version.value
   octez-node-config
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.shell-services
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-server
+  octez-libs.rpc-http
+  octez-libs.rpc-http-server
   octez-shell-libs.p2p
   octez-shell-libs.shell
   octez-shell-libs.store
@@ -33,7 +33,7 @@
   prometheus-app.unix
   lwt-exit
   uri
-  octez-libs.tezos-base.p2p-identity-file
+  octez-libs.base.p2p-identity-file
   (select void_for_linking-tezos-protocol-genesis-embedded-protocol from
    (tezos-protocol-genesis.embedded-protocol -> void_for_linking-tezos-protocol-genesis-embedded-protocol.empty)
    (-> void_for_linking-tezos-protocol-genesis-embedded-protocol.empty))
diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune
index 9ead09785401fbe057abcf649dc4b8bcb104bac0..089b1d3eebe6335b271be50504bc90927ba6cbfb 100644
--- a/src/bin_proxy_server/dune
+++ b/src/bin_proxy_server/dune
@@ -7,20 +7,20 @@
  (package octez-proxy-server)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-rpc
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.rpc
   cmdliner
   lwt-exit
   lwt.unix
   octez-shell-libs.proxy
   tezos-proxy-server-config
-  octez-libs.tezos-rpc-http-client-unix
-  octez-libs.tezos-rpc-http-server
+  octez-libs.rpc-http-client-unix
+  octez-libs.rpc-http-server
   octez-shell-libs.shell-services
   octez-shell-libs.shell-context
-  tezos-version.value
+  octez-version.value
   uri
   (select void_for_linking-tezos-client-genesis from
    (tezos-client-genesis -> void_for_linking-tezos-client-genesis.empty)
diff --git a/src/bin_sequencer_node/dune b/src/bin_sequencer_node/dune
index 86b255eb907800a2107fe18313b1d44a71585b32..f36ed627c2e8b6cba9b6e4e4341bd747f6dd7e1b 100644
--- a/src/bin_sequencer_node/dune
+++ b/src/bin_sequencer_node/dune
@@ -7,8 +7,8 @@
  (package octez-smart-rollup-sequencer-node)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
   octez-shell-libs.client-commands
diff --git a/src/bin_signer/dune b/src/bin_signer/dune
index 409f3ddc0db177a52a5aa7682cea16c519ddea87..39490ad53c14290a8511a682c319a01d17fe0115 100644
--- a/src/bin_signer/dune
+++ b/src/bin_signer/dune
@@ -7,18 +7,18 @@
  (package octez-signer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.clic
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
   octez-shell-libs.client-commands
   octez-shell-libs.signer-services
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-server
-  octez-libs.tezos-rpc-http-client-unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
+  octez-libs.rpc-http
+  octez-libs.rpc-http-server
+  octez-libs.rpc-http-client-unix
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
   octez-shell-libs.signer-backends.unix)
  (link_flags
   (:standard)
diff --git a/src/bin_smart_rollup_node/dune b/src/bin_smart_rollup_node/dune
index cff8d3d9ca4eabea333865ab7e45c18623913ace..78a4c8ca9f5e2aca832d97d29433345c8eb33a4d 100644
--- a/src/bin_smart_rollup_node/dune
+++ b/src/bin_smart_rollup_node/dune
@@ -7,8 +7,8 @@
  (package octez-smart-rollup-node)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune
index fd3241eab86cf709d0f32d2090591b0e9529a2c7..7eb640525d282bab5a78f1eee962a7f5967bc7ac 100644
--- a/src/bin_snoop/dune
+++ b/src/bin_snoop/dune
@@ -7,10 +7,10 @@
  (package octez-snoop)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.clic
   tezos-benchmark
   tezos-benchmark-examples
   octez-shell-libs.shell-benchmarks
@@ -18,7 +18,7 @@
   str
   pyml
   prbnmcn-stats
-  tezos-version.value)
+  octez-version.value)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune
index c43639ed8520dc193633d850ac103ec04f46253f..4abaad52a2a1d50f80d12b1c29cebdb71703c80f 100644
--- a/src/bin_tps_evaluation/dune
+++ b/src/bin_tps_evaluation/dune
@@ -7,7 +7,7 @@
  (package tezos-tps-evaluation)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   caqti
   caqti-dynload
   caqti-lwt
diff --git a/src/bin_wasm_debugger/dune b/src/bin_wasm_debugger/dune
index 77c573dddc985ca9c1f99a261cefcf63df364c0e..d693688100c9fdeb4e9d0174f19514fb47b1ea85 100644
--- a/src/bin_wasm_debugger/dune
+++ b/src/bin_wasm_debugger/dune
@@ -7,17 +7,17 @@
  (package octez-smart-rollup-wasm-debugger)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-tree-encoding
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.tree-encoding
+  octez-libs.base.unix
   yaml
   octez-protocol-alpha-libs.client
   octez-l2-libs.scoru-wasm
   octez-l2-libs.scoru-wasm-helpers
   octez-l2-libs.webassembly-interpreter
   octez-l2-libs.webassembly-interpreter-extra
-  tezos-version.value)
+  octez-version.value)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
diff --git a/src/lib_aplonk/dune b/src/lib_aplonk/dune
index 1854f232308d3f11060ad9ad2588ca068b9b42a1..0f6c104c14312918ef411c3db888904b50c5f309 100644
--- a/src/lib_aplonk/dune
+++ b/src/lib_aplonk/dune
@@ -3,8 +3,8 @@
 
 (library
  (name aplonk)
- (public_name octez-libs.octez-aplonk)
+ (public_name octez-libs.aplonk)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.octez-plonk.aggregation)
+  octez-libs.plonk.aggregation)
  (preprocess (pps ppx_repr)))
diff --git a/src/lib_aplonk/plonk-aggregation/dune b/src/lib_aplonk/plonk-aggregation/dune
index decff0c74fbb32edb994413a86d0b97ec1d28d15..9c2a4733350d206a974fbf0a14396cd3db344966 100644
--- a/src/lib_aplonk/plonk-aggregation/dune
+++ b/src/lib_aplonk/plonk-aggregation/dune
@@ -3,11 +3,11 @@
 
 (library
  (name aggregation)
- (public_name octez-libs.octez-plonk.aggregation)
+ (public_name octez-libs.plonk.aggregation)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.octez-plonk
-  octez-libs.octez-bls12-381-polynomial)
+  octez-libs.plonk
+  octez-libs.bls12-381-polynomial)
  (preprocess (pps ppx_repr))
  (flags
   (:standard)
diff --git a/src/lib_aplonk/test/dune b/src/lib_aplonk/test/dune
index 0987a8415099b5f77b577b2da22796203bbf42aa..647cba2e3fac526151b72f6ccad27f448d63429e 100644
--- a/src/lib_aplonk/test/dune
+++ b/src/lib_aplonk/test/dune
@@ -5,8 +5,8 @@
  (name main)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.octez-plonk.plonk-test
-  octez-libs.octez-aplonk)
+  octez-libs.plonk.plonk-test
+  octez-libs.aplonk)
  (modules main test_aplonk test_main_protocol))
 
 (rule
@@ -31,6 +31,6 @@
 (executable
  (name bench)
  (libraries
-  octez-libs.octez-plonk.plonk-test
-  octez-libs.octez-aplonk)
+  octez-libs.plonk.plonk-test
+  octez-libs.aplonk)
  (modules bench))
diff --git a/src/lib_base/dune b/src/lib_base/dune
index 6d05fe449bb4db3247825bf06fbc9847362da0be..5eb86f9747e1a9197afcef768cd32e5d2cfd4e27 100644
--- a/src/lib_base/dune
+++ b/src/lib_base/dune
@@ -5,16 +5,16 @@
 
 (library
  (name tezos_base)
- (public_name octez-libs.tezos-base)
+ (public_name octez-libs.base)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto
+  octez-libs.stdlib
+  octez-libs.crypto
   data-encoding
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-rpc
-  octez-libs.tezos-micheline
-  octez-libs.tezos-event-logging
+  octez-libs.error-monad
+  octez-libs.rpc
+  octez-libs.micheline
+  octez-libs.event-logging
   ptime
   ptime.clock.os
   ezjsonm
diff --git a/src/lib_base/p2p_identity_file/dune b/src/lib_base/p2p_identity_file/dune
index ccd19e5c23797374d9c072e8b1866676a1f3bfa0..289f92a0ab7999a8a0e35b2727f9587d67c8dfe5 100644
--- a/src/lib_base/p2p_identity_file/dune
+++ b/src/lib_base/p2p_identity_file/dune
@@ -3,11 +3,11 @@
 
 (library
  (name tezos_base_p2p_identity_file)
- (public_name octez-libs.tezos-base.p2p-identity-file)
+ (public_name octez-libs.base.p2p-identity-file)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix)
+  octez-libs.base
+  octez-libs.stdlib-unix)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune
index 115c8f944116e4cc16b69b39311b9b001f1a0385..4fb2dced466a0221c119b1e0ec339a7d7e37b96c 100644
--- a/src/lib_base/test/dune
+++ b/src/lib_base/test/dune
@@ -8,10 +8,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-error-monad
+  octez-libs.base
+  octez-libs.error-monad
   data-encoding
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
   octez-alcotezt)
  (js_of_ocaml)
diff --git a/src/lib_base/test_helpers/dune b/src/lib_base/test_helpers/dune
index 9e25d00204d2da19828c4ba169c327611b1b1b90..59f16d46664ef844fe584ecf71b09b249bffc154 100644
--- a/src/lib_base/test_helpers/dune
+++ b/src/lib_base/test_helpers/dune
@@ -3,13 +3,13 @@
 
 (library
  (name tezos_base_test_helpers)
- (public_name octez-libs.tezos-base-test-helpers)
+ (public_name octez-libs.base-test-helpers)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-event-logging-test-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.event-logging-test-helpers
+  octez-libs.test-helpers
   octez-alcotezt
   qcheck-alcotest)
  (library_flags (:standard -linkall))
diff --git a/src/lib_base/unix/dune b/src/lib_base/unix/dune
index 19dc0fc507e7eadf628504558bc245e8b1219d9e..e288c4218b310ea66c64eb2ccd701e0fe2191901 100644
--- a/src/lib_base/unix/dune
+++ b/src/lib_base/unix/dune
@@ -3,18 +3,18 @@
 
 (library
  (name tezos_base_unix)
- (public_name octez-libs.tezos-base.unix)
+ (public_name octez-libs.base.unix)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-crypto
-  octez-libs.tezos-base
-  octez-libs.tezos-hacl
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-stdlib-unix
+  octez-libs.error-monad
+  octez-libs.crypto
+  octez-libs.base
+  octez-libs.hacl
+  octez-libs.stdlib
+  octez-libs.stdlib-unix
   data-encoding
   uri
-  octez-libs.tezos-event-logging)
+  octez-libs.event-logging)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
  (flags
diff --git a/src/lib_base/unix/test/dune b/src/lib_base/unix/test/dune
index d41336c91afd35c9cd2d2ec6903729f62461ecbb..5bb5699458c17ea6716ec36788d203aa95a66836 100644
--- a/src/lib_base/unix/test/dune
+++ b/src/lib_base/unix/test/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-error-monad
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.error-monad
   data-encoding
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
   octez-alcotezt
   tezt)
diff --git a/src/lib_benchmark/dune b/src/lib_benchmark/dune
index ea3b934e9a3cc3247989a7cfea756196b0c10969..75c00befbb2c9e0df4baddb6dd4622061d018ed4 100644
--- a/src/lib_benchmark/dune
+++ b/src/lib_benchmark/dune
@@ -7,11 +7,11 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   str
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-crypto
-  octez-libs.tezos-micheline
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.stdlib-unix
+  octez-libs.crypto
+  octez-libs.micheline
+  octez-libs.clic
   data-encoding
   prbnmcn-linalg
   prbnmcn-stats
diff --git a/src/lib_benchmark/example/dune b/src/lib_benchmark/example/dune
index 2d68cde5f02e3cd2ef301643567b64780ad0f06c..b26a70efb36a33e40499ce7a8845d88fe32845f7 100644
--- a/src/lib_benchmark/example/dune
+++ b/src/lib_benchmark/example/dune
@@ -6,9 +6,9 @@
  (public_name tezos-benchmark-examples)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-crypto
+  octez-libs.base
+  octez-libs.stdlib-unix
+  octez-libs.crypto
   tezos-benchmark)
  (flags
   (:standard)
diff --git a/src/lib_benchmark/lib_micheline_rewriting/dune b/src/lib_benchmark/lib_micheline_rewriting/dune
index 6c4c7a2a6d87f719e56540c97feb8f2da1bc0925..bfe5bd406798759023122cb25d345ff727008d94 100644
--- a/src/lib_benchmark/lib_micheline_rewriting/dune
+++ b/src/lib_benchmark/lib_micheline_rewriting/dune
@@ -8,10 +8,10 @@
  (libraries
   zarith
   zarith_stubs_js
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-micheline)
+  octez-libs.stdlib
+  octez-libs.crypto
+  octez-libs.error-monad
+  octez-libs.micheline)
  (flags
   (:standard)
   -open Tezos_stdlib
diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune
index 32a4f92720a4b867ca723bf2eb3e0696759b2153..5007c81f602558138462e2c9c953e21866cc87b3 100644
--- a/src/lib_benchmark/lib_micheline_rewriting/test/dune
+++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-protocol-alpha.protocol
-  octez-libs.tezos-error-monad
+  octez-libs.error-monad
   octez-protocol-alpha-libs.client)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_benchmark/test/dune b/src/lib_benchmark/test/dune
index b0259d22cfed2c62ab97957b523d8fc9b5482cde..4b2642c83610b6bea7d73dbdeb405c4e9e5285e3 100644
--- a/src/lib_benchmark/test/dune
+++ b/src/lib_benchmark/test/dune
@@ -7,11 +7,11 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-micheline
-  octez-libs.tezos-crypto
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.micheline
+  octez-libs.crypto
   tezos-benchmark
   tezos-benchmark-examples)
  (library_flags (:standard -linkall))
diff --git a/src/lib_bls12_381_hash/dune b/src/lib_bls12_381_hash/dune
index 3171bd8ef00d8e38614d6e2d5c276eba9bde8b92..f708295ee5011ebbd3a1f2f1ec17c60a4ea16533 100644
--- a/src/lib_bls12_381_hash/dune
+++ b/src/lib_bls12_381_hash/dune
@@ -3,7 +3,7 @@
 
 (library
  (name bls12_381_hash)
- (public_name octez-libs.octez-bls12-381-hash)
+ (public_name octez-libs.bls12-381-hash)
  (instrumentation (backend bisect_ppx))
  (libraries
   bls12-381)
diff --git a/src/lib_bls12_381_hash/test/dune b/src/lib_bls12_381_hash/test/dune
index c2f20d2bcb70c848247090142df9f34dddba90d5..88d48159830e26326fb2c31e78caa292b6338175 100644
--- a/src/lib_bls12_381_hash/test/dune
+++ b/src/lib_bls12_381_hash/test/dune
@@ -8,7 +8,7 @@
   tezt.core
   octez-alcotezt
   bls12-381
-  octez-libs.octez-bls12-381-hash)
+  octez-libs.bls12-381-hash)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_bls12_381_polynomial/dune b/src/lib_bls12_381_polynomial/dune
index 75f2c8d4eceb6e759b81d98d80dafb894b1eefc5..fb13c5397281827909d3a77278dde67962620495 100644
--- a/src/lib_bls12_381_polynomial/dune
+++ b/src/lib_bls12_381_polynomial/dune
@@ -3,7 +3,7 @@
 
 (library
  (name octez_bls12_381_polynomial)
- (public_name octez-libs.octez-bls12-381-polynomial)
+ (public_name octez-libs.bls12-381-polynomial)
  (instrumentation (backend bisect_ppx))
  (libraries
   bls12-381
diff --git a/src/lib_bls12_381_polynomial/test/dune b/src/lib_bls12_381_polynomial/test/dune
index c41ddadbe9bd83de85703b6e53d04b953cbf0cd6..5d0ff4b55bedca56169d46391f656e943c4193d4 100644
--- a/src/lib_bls12_381_polynomial/test/dune
+++ b/src/lib_bls12_381_polynomial/test/dune
@@ -8,9 +8,9 @@
   tezt.core
   octez-alcotezt
   qcheck-alcotest
-  octez-libs.octez-polynomial
+  octez-libs.polynomial
   bls12-381
-  octez-libs.octez-bls12-381-polynomial)
+  octez-libs.bls12-381-polynomial)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_bls12_381_signature/dune b/src/lib_bls12_381_signature/dune
index a5385219c951444d0a2e6141f8a7a12670f0cd21..c6540e14ff7c64d9fdd03c38c906cc6816ed1236 100644
--- a/src/lib_bls12_381_signature/dune
+++ b/src/lib_bls12_381_signature/dune
@@ -5,7 +5,7 @@
 
 (library
  (name bls12_381_signature)
- (public_name octez-libs.octez-bls12-381-signature)
+ (public_name octez-libs.bls12-381-signature)
  (instrumentation (backend bisect_ppx))
  (libraries
   bls12-381)
diff --git a/src/lib_bls12_381_signature/test/dune b/src/lib_bls12_381_signature/test/dune
index 4fe3df8699ca3b529bf849b36ee0479cf80d1e54..3021eadbc928e0f3cba32af2734285022e36e369 100644
--- a/src/lib_bls12_381_signature/test/dune
+++ b/src/lib_bls12_381_signature/test/dune
@@ -7,7 +7,7 @@
  (libraries
   tezt.core
   bls12-381
-  octez-libs.octez-bls12-381-signature
+  octez-libs.bls12-381-signature
   octez-alcotezt
   integers_stubs_js)
  (library_flags (:standard -linkall))
diff --git a/src/lib_clic/dune b/src/lib_clic/dune
index 34ab7d25a477428fa7cfe89856d7cf50e65c78a5..8ed1a08ebcd5a41be1efa3a27ac94938c33f044f 100644
--- a/src/lib_clic/dune
+++ b/src/lib_clic/dune
@@ -3,14 +3,14 @@
 
 (library
  (name tezos_clic)
- (public_name octez-libs.tezos-clic)
+ (public_name octez-libs.clic)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
+  octez-libs.stdlib
   lwt
   re
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-lwt-result-stdlib)
+  octez-libs.error-monad
+  octez-libs.lwt-result-stdlib)
  (js_of_ocaml)
  (flags
   (:standard)
diff --git a/src/lib_clic/examples/dune b/src/lib_clic/examples/dune
index f1691cce4903faf1b88d6c38c99e3640308c432d..fe2d3a891ef7c8026ec5c2949c34d87a7d3e325d 100644
--- a/src/lib_clic/examples/dune
+++ b/src/lib_clic/examples/dune
@@ -4,5 +4,5 @@
 (executable
  (name clic_example)
  (libraries
-  octez-libs.tezos-clic
+  octez-libs.clic
   lwt.unix))
diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune
index b5e3a6b77673397313c62b24a9b98ec9c78f88fe..b548c6150bdf9b316fed99d14ff990cd05c786e5 100644
--- a/src/lib_clic/test/dune
+++ b/src/lib_clic/test/dune
@@ -6,8 +6,8 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-clic
+  octez-libs.stdlib
+  octez-libs.clic
   lwt.unix
   octez-alcotezt)
  (library_flags (:standard -linkall))
diff --git a/src/lib_clic/unix/dune b/src/lib_clic/unix/dune
index 4217a92c2deb5f64f93924d94e447eeed0339edf..4b7b2d26bad087590cc38247b33195c538c9ad8c 100644
--- a/src/lib_clic/unix/dune
+++ b/src/lib_clic/unix/dune
@@ -3,14 +3,14 @@
 
 (library
  (name tezos_clic_unix)
- (public_name octez-libs.tezos-clic.unix)
+ (public_name octez-libs.clic.unix)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-clic
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-lwt-result-stdlib)
+  octez-libs.stdlib
+  octez-libs.clic
+  octez-libs.stdlib-unix
+  octez-libs.error-monad
+  octez-libs.lwt-result-stdlib)
  (flags
   (:standard)
   -open Tezos_stdlib
diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune
index 99322c4751aa87fb9e26b7641637b409f7155612..afc68dbc4b09a13ce58866f122dde18b2b1bce27 100644
--- a/src/lib_client_base/dune
+++ b/src/lib_client_base/dune
@@ -8,9 +8,9 @@
  (public_name octez-shell-libs.client-base)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-rpc
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.rpc
   octez-shell-libs.shell-services
   octez-libs.tezos-sapling
   uri)
diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune
index 3789adbe2fb8cc77ee6f9b3a9e559b1727843fb2..61a2c722799e478f2d91c980ad4dc9fcd3b2f888 100644
--- a/src/lib_client_base/test/dune
+++ b/src/lib_client_base/test/dune
@@ -8,7 +8,7 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.client-base
   octez-alcotezt)
  (js_of_ocaml)
diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune
index 5b1b1ceab1fdef3c5fdc98cee7d2adc5a0fed2b4..5ec17f341bea230e933d09eb0db83291ebeb3eb2 100644
--- a/src/lib_client_base_unix/dune
+++ b/src/lib_client_base_unix/dune
@@ -6,14 +6,14 @@
  (public_name octez-shell-libs.client-base-unix)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-clic
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-client-unix
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.clic
+  octez-libs.rpc
+  octez-libs.rpc-http
+  octez-libs.rpc-http-client-unix
   octez-shell-libs.shell-services
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.client-commands
   octez-shell-libs.mockup
@@ -22,7 +22,7 @@
   octez-shell-libs.proxy
   octez-shell-libs.proxy.rpc
   octez-shell-libs.signer-backends.unix
-  tezos-version.value
+  octez-version.value
   lwt-exit
   uri)
  (library_flags (:standard -linkall))
diff --git a/src/lib_client_base_unix/test/dune b/src/lib_client_base_unix/test/dune
index bbc945be0bae13c2214a91795ea3f5f10eb1be14..0654698fe1806c2edfb6a681e6e7240b30fc3f53 100644
--- a/src/lib_client_base_unix/test/dune
+++ b/src/lib_client_base_unix/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.mockup-commands
   octez-shell-libs.client-base-unix
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-alcotezt)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune
index 77605660e64eaaf4e3a94225f9356bc1d88de615..ad9671c7fe68902dfc99640e17d11df07a99cb18 100644
--- a/src/lib_client_commands/dune
+++ b/src/lib_client_commands/dune
@@ -6,15 +6,15 @@
  (public_name octez-shell-libs.client-commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-rpc
-  octez-libs.tezos-clic
-  octez-libs.tezos-clic.unix
+  octez-libs.base
+  octez-libs.rpc
+  octez-libs.clic
+  octez-libs.clic.unix
   octez-shell-libs.client-base
   octez-shell-libs.shell-services
   octez-libs.tezos-p2p-services
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-base.unix
+  octez-libs.stdlib-unix
+  octez-libs.base.unix
   octez-shell-libs.signer-backends
   data-encoding
   uri)
diff --git a/src/lib_context/disk/dune b/src/lib_context/disk/dune
index 4bee93503931303bca4278141b13899c86f53949..aa4bd6faf471a5755f59000af0c853b39b9a1901 100644
--- a/src/lib_context/disk/dune
+++ b/src/lib_context/disk/dune
@@ -6,16 +6,16 @@
  (public_name octez-libs.tezos-context.disk)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   bigstringaf
   fmt
   irmin
   irmin-pack
   irmin-pack.unix
   logs.fmt
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-context.sigs
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
+  octez-libs.context.sigs
   octez-libs.tezos-context.helpers
   octez-libs.tezos-context.encoding
   octez-libs.tezos-context.memory
diff --git a/src/lib_context/dump/dune b/src/lib_context/dump/dune
index a9ada4044f371172ebed730ff9e23fc9756c0f1e..0fbf57f658592eae157f590d5f2a9206071cae92 100644
--- a/src/lib_context/dump/dune
+++ b/src/lib_context/dump/dune
@@ -6,8 +6,8 @@
  (public_name octez-libs.tezos-context.dump)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.stdlib-unix
   fmt)
  (flags
   (:standard)
diff --git a/src/lib_context/encoding/dune b/src/lib_context/encoding/dune
index 9d35152f2072e338e9baa7a050c4bd82a86b1fa8..4bd5f5f1ed2294ad70bcc6ed3466ec8bc22de989 100644
--- a/src/lib_context/encoding/dune
+++ b/src/lib_context/encoding/dune
@@ -6,8 +6,8 @@
  (public_name octez-libs.tezos-context.encoding)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib
+  octez-libs.base
+  octez-libs.stdlib
   irmin
   irmin-pack)
  (flags
diff --git a/src/lib_context/helpers/dune b/src/lib_context/helpers/dune
index 5336086afa08f92e5c7247937a7797b09033fb41..8545db7b2618624eba15ae1f7ed014bf49768975 100644
--- a/src/lib_context/helpers/dune
+++ b/src/lib_context/helpers/dune
@@ -6,10 +6,10 @@
  (public_name octez-libs.tezos-context.helpers)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib
+  octez-libs.base
+  octez-libs.stdlib
   octez-libs.tezos-context.encoding
-  octez-libs.tezos-context.sigs
+  octez-libs.context.sigs
   octez-libs.tezos-context.merkle_proof_encoding
   irmin
   irmin-pack)
diff --git a/src/lib_context/memory/dune b/src/lib_context/memory/dune
index e7cc2b354d98ac3ecfe532d123526a0bfd982f8c..4f841ac94dd17cc3cbfd2ef5f817e4113d157bd4 100644
--- a/src/lib_context/memory/dune
+++ b/src/lib_context/memory/dune
@@ -6,11 +6,11 @@
  (public_name octez-libs.tezos-context.memory)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib
+  octez-libs.base
+  octez-libs.stdlib
   irmin-pack
   irmin-pack.mem
-  octez-libs.tezos-context.sigs
+  octez-libs.context.sigs
   octez-libs.tezos-context.encoding
   octez-libs.tezos-context.helpers)
  (flags
diff --git a/src/lib_context/memory/test/dune b/src/lib_context/memory/test/dune
index 9a54c63ecb74c1b7d0577112ccf7c54970cac2a2..d933cc2edc35388b3fdd7413c685f6cd1dbfcaa9 100644
--- a/src/lib_context/memory/test/dune
+++ b/src/lib_context/memory/test/dune
@@ -6,11 +6,11 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   octez-libs.tezos-context.disk
   octez-libs.tezos-context.memory
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-alcotezt)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_context/merkle_proof_encoding/dune b/src/lib_context/merkle_proof_encoding/dune
index 4ea6fd61a23ee0127d919461cbb4602685a74991..9cce4773c23bcaeadc3f113ca9f2cb8b887abf7e 100644
--- a/src/lib_context/merkle_proof_encoding/dune
+++ b/src/lib_context/merkle_proof_encoding/dune
@@ -8,9 +8,9 @@
  (public_name octez-libs.tezos-context.merkle_proof_encoding)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-context.sigs)
+  octez-libs.base
+  octez-libs.stdlib
+  octez-libs.context.sigs)
  (js_of_ocaml)
  (flags
   (:standard)
diff --git a/src/lib_context/sigs/dune b/src/lib_context/sigs/dune
index 8863074fe35175700dc1517e4465e06de894bd1c..b91eb960559643132442bc3e7e3bc4c653e03783 100644
--- a/src/lib_context/sigs/dune
+++ b/src/lib_context/sigs/dune
@@ -5,11 +5,11 @@
 
 (library
  (name tezos_context_sigs)
- (public_name octez-libs.tezos-context.sigs)
+ (public_name octez-libs.context.sigs)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib)
+  octez-libs.base
+  octez-libs.stdlib)
  (js_of_ocaml)
  (flags
   (:standard)
diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune
index 53c4b73c24709fa2bd9cab2aa0c98fb02ac6666c..e066e74c035533beb1f2fab5bc4f7d425b611cc0 100644
--- a/src/lib_context/test/dune
+++ b/src/lib_context/test/dune
@@ -6,14 +6,14 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-context.sigs
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.context.sigs
   octez-libs.tezos-context.disk
   octez-libs.tezos-context.memory
   octez-libs.tezos-context.encoding
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-test-helpers
+  octez-libs.stdlib-unix
+  octez-libs.test-helpers
   qcheck-alcotest
   octez-alcotezt)
  (library_flags (:standard -linkall))
diff --git a/src/lib_crawler/dune b/src/lib_crawler/dune
index 0df8bf62bd49758472e0b73d21adc9fd74b1ce0e..fbd9a54bc44a774bdaa138a16bfb82245734b119 100644
--- a/src/lib_crawler/dune
+++ b/src/lib_crawler/dune
@@ -6,10 +6,10 @@
  (public_name octez-crawler)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.rpc-http
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.shell)
  (flags
diff --git a/src/lib_crypto/dune b/src/lib_crypto/dune
index 41a47f9dff2ed7e40201b76792c1171d600a4685..40b03dd96c29448744b8b244d8b5c0129a1ec04d 100644
--- a/src/lib_crypto/dune
+++ b/src/lib_crypto/dune
@@ -5,22 +5,22 @@
 
 (library
  (name tezos_crypto)
- (public_name octez-libs.tezos-crypto)
+ (public_name octez-libs.crypto)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
+  octez-libs.stdlib
   data-encoding
-  octez-libs.tezos-lwt-result-stdlib
+  octez-libs.lwt-result-stdlib
   lwt
-  octez-libs.tezos-hacl
+  octez-libs.hacl
   secp256k1-internal
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-rpc
+  octez-libs.error-monad
+  octez-libs.rpc
   aches
   zarith
   zarith_stubs_js
   bls12-381
-  octez-libs.octez-bls12-381-signature)
+  octez-libs.bls12-381-signature)
  (js_of_ocaml)
  (flags
   (:standard)
diff --git a/src/lib_crypto/test-unix/dune b/src/lib_crypto/test-unix/dune
index 1b297cc44211b044ddc1554cdeafc00adb0aeb33..a2ef828418e775f6b791680a70c302f11f2f9ddb 100644
--- a/src/lib_crypto/test-unix/dune
+++ b/src/lib_crypto/test-unix/dune
@@ -6,17 +6,17 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto
-  octez-libs.tezos-error-monad
+  octez-libs.stdlib
+  octez-libs.crypto
+  octez-libs.error-monad
   zarith
   zarith_stubs_js
-  octez-libs.tezos-hacl
+  octez-libs.hacl
   data-encoding
   octez-alcotezt
   lwt.unix
   qcheck-alcotest
-  octez-libs.tezos-test-helpers)
+  octez-libs.test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_crypto/test/dune b/src/lib_crypto/test/dune
index 80bdcdbf9ab0ac532d34f2af4c400fb60a7b90d9..734d6990eaae5b3613646436cc8f5a4b6abe5239 100644
--- a/src/lib_crypto/test/dune
+++ b/src/lib_crypto/test/dune
@@ -8,16 +8,16 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto
-  octez-libs.tezos-error-monad
+  octez-libs.stdlib
+  octez-libs.crypto
+  octez-libs.error-monad
   zarith
   zarith_stubs_js
-  octez-libs.tezos-hacl
+  octez-libs.hacl
   data-encoding
   octez-alcotezt
   qcheck-alcotest
-  octez-libs.tezos-test-helpers)
+  octez-libs.test-helpers)
  (js_of_ocaml)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_crypto_dal/dal_config/dune b/src/lib_crypto_dal/dal_config/dune
index 7e0326af6600041491606678ef1817030f694586..d558b8aeaebf8257be4ef0b0aa48bfe1cd6882d0 100644
--- a/src/lib_crypto_dal/dal_config/dune
+++ b/src/lib_crypto_dal/dal_config/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_crypto_dal_octez_dal_config)
- (public_name octez-libs.tezos-crypto-dal.octez-dal-config)
+ (public_name octez-libs.crypto-dal.dal-config)
  (instrumentation (backend bisect_ppx))
  (libraries
   data-encoding)
diff --git a/src/lib_crypto_dal/dune b/src/lib_crypto_dal/dune
index 047c3673e9f75def92b4e6b544be1faf332179df..216097b580bf9a79da53e91c80a7f872b89bc465 100644
--- a/src/lib_crypto_dal/dune
+++ b/src/lib_crypto_dal/dune
@@ -3,15 +3,15 @@
 
 (library
  (name tezos_crypto_dal)
- (public_name octez-libs.tezos-crypto-dal)
+ (public_name octez-libs.crypto-dal)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-error-monad
+  octez-libs.stdlib
+  octez-libs.error-monad
   data-encoding
-  octez-libs.tezos-crypto-dal.octez-dal-config
-  octez-libs.tezos-crypto
-  octez-libs.octez-bls12-381-polynomial
+  octez-libs.crypto-dal.dal-config
+  octez-libs.crypto
+  octez-libs.bls12-381-polynomial
   lwt.unix)
  (flags
   (:standard)
diff --git a/src/lib_crypto_dal/test/dune b/src/lib_crypto_dal/test/dune
index fe20fe8823707abb116c6c7611e10fc21ea2f1d6..6590376bc9b8f97f3a52b61e878962bb5b008211 100644
--- a/src/lib_crypto_dal/test/dune
+++ b/src/lib_crypto_dal/test/dune
@@ -6,15 +6,15 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto-dal
-  octez-libs.tezos-crypto-dal.octez-dal-config
-  octez-libs.tezos-error-monad
+  octez-libs.stdlib
+  octez-libs.crypto-dal
+  octez-libs.crypto-dal.dal-config
+  octez-libs.error-monad
   data-encoding
   octez-alcotezt
   qcheck-alcotest
-  octez-libs.octez-bls12-381-polynomial
-  octez-libs.tezos-test-helpers)
+  octez-libs.bls12-381-polynomial
+  octez-libs.test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_dac/dune b/src/lib_dac/dune
index 58365f51f535e739d02b68b5be7f3074c6c62a0e..ecb02d595a615e120e7e5728b3dddc55785540a4 100644
--- a/src/lib_dac/dune
+++ b/src/lib_dac/dune
@@ -6,7 +6,7 @@
  (public_name tezos-dac-lib)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.protocol-updater)
  (flags
   (:standard)
diff --git a/src/lib_dac/test/dune b/src/lib_dac/test/dune
index f0f7f0ebc2e8f6770853951003223bb256e18452..97c621f9bd5dfc69e338693a9af63a10700712c0 100644
--- a/src/lib_dac/test/dune
+++ b/src/lib_dac/test/dune
@@ -6,11 +6,11 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-base
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.stdlib
+  octez-libs.stdlib-unix
+  octez-libs.base
+  octez-libs.test-helpers
+  octez-libs.base-test-helpers
   tezos-dac-lib
   octez-alcotezt)
  (library_flags (:standard -linkall))
diff --git a/src/lib_dac_client/dune b/src/lib_dac_client/dune
index ce122353e5824011d7a9e9a66f1beeeb7c581a7b..b59fdec01dd1771eb4195fd90a503063edf28c59 100644
--- a/src/lib_dac_client/dune
+++ b/src/lib_dac_client/dune
@@ -6,11 +6,11 @@
  (public_name tezos-dac-client-lib)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   tezos-dac-lib)
  (flags
   (:standard)
diff --git a/src/lib_dac_node/dune b/src/lib_dac_node/dune
index f12c2be6e297dd62e5d0b059199fe6611cefa58b..2c94bfe3f1ca2c2a32ef07e05a0715cce6309362 100644
--- a/src/lib_dac_node/dune
+++ b/src/lib_dac_node/dune
@@ -6,13 +6,13 @@
  (package tezos-dac-node-lib)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-l2-libs.layer2_store
-  octez-libs.tezos-rpc-http-server
+  octez-libs.rpc-http-server
   tezos-dac-lib
   tezos-dac-client-lib)
  (flags
diff --git a/src/lib_dac_node/test/dune b/src/lib_dac_node/test/dune
index bf0946c00e537d70a3273786b86f202edbe0942f..7e6a346c6e87c35ff4458e0c80fa33c6e0da3bef 100644
--- a/src/lib_dac_node/test/dune
+++ b/src/lib_dac_node/test/dune
@@ -6,11 +6,11 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-base
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.stdlib
+  octez-libs.stdlib-unix
+  octez-libs.base
+  octez-libs.test-helpers
+  octez-libs.base-test-helpers
   tezos_dac_node_lib
   octez-alcotezt)
  (library_flags (:standard -linkall))
diff --git a/src/lib_dal_node/dune b/src/lib_dal_node/dune
index 1677daa71fb3d6fe4ab168f1c459f4e09c4bc937..e2cffe304b3147a04443d82b6357dacdd17b0192 100644
--- a/src/lib_dal_node/dune
+++ b/src/lib_dal_node/dune
@@ -6,14 +6,14 @@
  (public_name tezos-dal-node-lib)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   tezos-dal-node-services
   octez-shell-libs.client-base
   octez-shell-libs.protocol-updater
   octez-shell-libs.client-base-unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-crypto-dal
+  octez-libs.stdlib-unix
+  octez-libs.crypto-dal
   octez-shell-libs.p2p
   octez-libs.tezos-p2p-services)
  (flags
diff --git a/src/lib_dal_node/gossipsub/dune b/src/lib_dal_node/gossipsub/dune
index fbdbf41ab7b2f527742ac7e5c8fb394c5bcbbb11..c4032a49778dbaa99b0764fb8396d77c692c6d4e 100644
--- a/src/lib_dal_node/gossipsub/dune
+++ b/src/lib_dal_node/gossipsub/dune
@@ -6,12 +6,12 @@
  (public_name tezos-dal-node-lib.gossipsub)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-crypto-dal
+  octez-libs.base
+  octez-libs.crypto-dal
   octez-libs.tezos-gossipsub
   octez-shell-libs.p2p
   octez-libs.tezos-p2p-services
-  octez-libs.tezos-crypto)
+  octez-libs.crypto)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_dal_node_services/dune b/src/lib_dal_node_services/dune
index 227582c3a08ffd4407d0f560832a9261e196c14a..b6eeda6439b03c1be201ed97faaa3fdcb1209b74 100644
--- a/src/lib_dal_node_services/dune
+++ b/src/lib_dal_node_services/dune
@@ -6,9 +6,9 @@
  (public_name tezos-dal-node-services)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-rpc
-  octez-libs.tezos-crypto-dal)
+  octez-libs.base
+  octez-libs.rpc
+  octez-libs.crypto-dal)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_distributed_plonk/communication/dune b/src/lib_distributed_plonk/communication/dune
index 4401ae600ea9441abdc78f3c160b7fefe2aa4475..33d2a347bbb023cd394a483612059565438c8713 100644
--- a/src/lib_distributed_plonk/communication/dune
+++ b/src/lib_distributed_plonk/communication/dune
@@ -3,12 +3,12 @@
 
 (library
  (name communication)
- (public_name octez-libs.octez-plonk.communication)
+ (public_name octez-libs.plonk.communication)
  (instrumentation (backend bisect_ppx))
  (libraries
   logs
   octez-distributed-lwt-internal
-  octez-libs.octez-plonk.distribution)
+  octez-libs.plonk.distribution)
  (preprocess (pps ppx_repr))
  (flags
   (:standard)
diff --git a/src/lib_distributed_plonk/distribution/dune b/src/lib_distributed_plonk/distribution/dune
index ccbb006909140fe5c8fcb2b6b8411408de4ce3fa..408734f8cf34332279026ab56a86b9aba3245ead 100644
--- a/src/lib_distributed_plonk/distribution/dune
+++ b/src/lib_distributed_plonk/distribution/dune
@@ -3,9 +3,9 @@
 
 (library
  (name distribution)
- (public_name octez-libs.octez-plonk.distribution)
+ (public_name octez-libs.plonk.distribution)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.octez-plonk
-  octez-libs.octez-plonk.aggregation)
+  octez-libs.plonk
+  octez-libs.plonk.aggregation)
  (preprocess (pps ppx_repr)))
diff --git a/src/lib_distributed_plonk/distribution/test/dune b/src/lib_distributed_plonk/distribution/test/dune
index 912953f9172b060fcc29b78a174aa4a03b8ed497..d433942f537d8e8178e2ca153a9cd73e5d25dae5 100644
--- a/src/lib_distributed_plonk/distribution/test/dune
+++ b/src/lib_distributed_plonk/distribution/test/dune
@@ -5,8 +5,8 @@
  (name main)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.octez-plonk.aggregation
-  octez-libs.octez-plonk.plonk-test)
+  octez-libs.plonk.aggregation
+  octez-libs.plonk.plonk-test)
  (modules main test_polynomial_commitment))
 
 (rule
diff --git a/src/lib_distributed_plonk/dune b/src/lib_distributed_plonk/dune
index 7bc83600dcdd8d52c988b3ecd522cb401b46c169..757601a5ac238a393e1dc35d757c5a3b07d3196e 100644
--- a/src/lib_distributed_plonk/dune
+++ b/src/lib_distributed_plonk/dune
@@ -3,13 +3,13 @@
 
 (library
  (name distributed_plonk)
- (public_name octez-libs.octez-distributed-plonk)
+ (public_name octez-libs.distributed-plonk)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.octez-aplonk
-  octez-libs.octez-plonk.communication
-  octez-libs.octez-plonk
-  octez-libs.octez-plonk.plonk-test)
+  octez-libs.aplonk
+  octez-libs.plonk.communication
+  octez-libs.plonk
+  octez-libs.plonk.plonk-test)
  (preprocess (pps ppx_repr))
  (flags
   (:standard)
@@ -24,14 +24,14 @@
 (executable
  (name worker_runner)
  (libraries
-  octez-libs.octez-distributed-plonk
-  octez-libs.octez-plonk.distribution)
+  octez-libs.distributed-plonk
+  octez-libs.plonk.distribution)
  (modules worker_runner))
 
 (executable
  (name distribution)
  (libraries
-  octez-libs.octez-distributed-plonk)
+  octez-libs.distributed-plonk)
  (flags
   (:standard)
   -open Distributed_plonk)
@@ -40,7 +40,7 @@
 (executable
  (name distribution_meta)
  (libraries
-  octez-libs.octez-distributed-plonk)
+  octez-libs.distributed-plonk)
  (flags
   (:standard)
   -open Distributed_plonk)
diff --git a/src/lib_distributed_plonk/test/dune b/src/lib_distributed_plonk/test/dune
index 1f1a283bda3af6998744b3753a15d942c015e98e..6b73caa0a029f57478c76c5f89e4661fbe78f34a 100644
--- a/src/lib_distributed_plonk/test/dune
+++ b/src/lib_distributed_plonk/test/dune
@@ -4,12 +4,12 @@
 (executable
  (name main)
  (libraries
-  octez-libs.octez-distributed-plonk
-  octez-libs.octez-plonk
-  octez-libs.octez-plonk.aggregation
-  octez-libs.octez-plonk.distribution
-  octez-libs.octez-aplonk
-  octez-libs.octez-plonk.plonk-test))
+  octez-libs.distributed-plonk
+  octez-libs.plonk
+  octez-libs.plonk.aggregation
+  octez-libs.plonk.distribution
+  octez-libs.aplonk
+  octez-libs.plonk.plonk-test))
 
 (rule
  (alias runtest)
diff --git a/src/lib_epoxy_tx/dune b/src/lib_epoxy_tx/dune
index 05385d364ef5d6c9b30d6e18e46c748596599be8..23abb98e6a726f46db16f8a0c2bd50626fc29ddb 100644
--- a/src/lib_epoxy_tx/dune
+++ b/src/lib_epoxy_tx/dune
@@ -3,11 +3,11 @@
 
 (library
  (name epoxy_tx)
- (public_name octez-libs.octez-epoxy-tx)
+ (public_name octez-libs.epoxy-tx)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.octez-plompiler
+  octez-libs.plompiler
   hex
   stdint
-  octez-libs.octez-plonk
-  octez-libs.octez-mec))
+  octez-libs.plonk
+  octez-libs.mec))
diff --git a/src/lib_epoxy_tx/test/dune b/src/lib_epoxy_tx/test/dune
index 0a0729527294ea957662d92aa129eeeb4416b5e6..043bb3c91d29211177240cc06ea8d8ebb5d5d5e9 100644
--- a/src/lib_epoxy_tx/test/dune
+++ b/src/lib_epoxy_tx/test/dune
@@ -5,9 +5,9 @@
  (name main)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.octez-epoxy-tx
-  octez-libs.octez-plonk.plonk-test
-  octez-libs.octez-aplonk))
+  octez-libs.epoxy-tx
+  octez-libs.plonk.plonk-test
+  octez-libs.aplonk))
 
 (rule
  (alias runtest)
diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune
index 25c0e1dc5ff3c901ab7ef7337f351ae91167751a..6d8a4321f3b4a00caba5ab440256ced62df50253 100644
--- a/src/lib_error_monad/dune
+++ b/src/lib_error_monad/dune
@@ -3,14 +3,14 @@
 
 (library
  (name tezos_error_monad)
- (public_name octez-libs.tezos-error-monad)
+ (public_name octez-libs.error-monad)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
+  octez-libs.stdlib
   data-encoding
   lwt-canceler
   lwt
-  octez-libs.tezos-lwt-result-stdlib)
+  octez-libs.lwt-result-stdlib)
  (js_of_ocaml)
  (flags
   (:standard)
diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune
index 1b90349ef60a2ff46c4d8f55b0c25823c70321af..aa692ecde6bb18683f7ef6ab93618c4155171c07 100644
--- a/src/lib_error_monad/test/dune
+++ b/src/lib_error_monad/test/dune
@@ -6,7 +6,7 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-error-monad
+  octez-libs.error-monad
   data-encoding
   octez-alcotezt)
  (js_of_ocaml)
diff --git a/src/lib_event_logging/dune b/src/lib_event_logging/dune
index 72eb70f0b244df51d40c93845d4432c7d849a31e..97d40a67a610ceae033cb465d57571820c1c16cd 100644
--- a/src/lib_event_logging/dune
+++ b/src/lib_event_logging/dune
@@ -3,13 +3,13 @@
 
 (library
  (name tezos_event_logging)
- (public_name octez-libs.tezos-event-logging)
+ (public_name octez-libs.event-logging)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
+  octez-libs.stdlib
   data-encoding
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-lwt-result-stdlib
+  octez-libs.error-monad
+  octez-libs.lwt-result-stdlib
   uri)
  (js_of_ocaml)
  (flags
diff --git a/src/lib_event_logging/test_helpers/dune b/src/lib_event_logging/test_helpers/dune
index f082fdbe1f6c67f8f5bacf3bedbcf5e8f020819b..02df20ce04bdff5d3c9a3ca486a448dff2683452 100644
--- a/src/lib_event_logging/test_helpers/dune
+++ b/src/lib_event_logging/test_helpers/dune
@@ -3,14 +3,14 @@
 
 (library
  (name tezos_event_logging_test_helpers)
- (public_name octez-libs.tezos-event-logging-test-helpers)
+ (public_name octez-libs.event-logging-test-helpers)
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-lwt-result-stdlib
+  octez-libs.stdlib
+  octez-libs.lwt-result-stdlib
   data-encoding
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-event-logging
-  octez-libs.tezos-test-helpers
+  octez-libs.error-monad
+  octez-libs.event-logging
+  octez-libs.test-helpers
   octez-alcotezt)
  (js_of_ocaml)
  (library_flags (:standard -linkall))
diff --git a/src/lib_expect_helper/dune b/src/lib_expect_helper/dune
index e193793da838665f6e2290607f93b052c6f892b9..2b301162dac40451e14221e33275f87877c90352 100644
--- a/src/lib_expect_helper/dune
+++ b/src/lib_expect_helper/dune
@@ -3,5 +3,5 @@
 
 (library
  (name tezos_expect_helper)
- (public_name octez-libs.tezos-expect-helper)
+ (public_name octez-libs.expect-helper)
  (instrumentation (backend bisect_ppx)))
diff --git a/src/lib_expect_helper/test/dune b/src/lib_expect_helper/test/dune
index ca4a1147e51e90701a0e1ce08be43b2a496dc372..3c5a9c117084bee37efc4d060590ffb09153b78a 100644
--- a/src/lib_expect_helper/test/dune
+++ b/src/lib_expect_helper/test/dune
@@ -6,6 +6,6 @@
  (package octez-libs)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-expect-helper)
+  octez-libs.expect-helper)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect)))
diff --git a/src/lib_gossipsub/dune b/src/lib_gossipsub/dune
index f2c28e2886e235741bc01e8079b70b9e8b330c72..3816ea4e11a57b17eb804403f20e712b26486475 100644
--- a/src/lib_gossipsub/dune
+++ b/src/lib_gossipsub/dune
@@ -9,12 +9,12 @@
   ringo
   aches
   fmt
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-version)
+  octez-libs.error-monad
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
+  octez-libs.version)
  (flags
   (:standard)
   -open Tezos_error_monad
diff --git a/src/lib_gossipsub/test/dune b/src/lib_gossipsub/test/dune
index 160647b2a2880afe6f29362250be411b0abebd45..40fa201f777acb1083d2a0dc1d53c243f96c20c2 100644
--- a/src/lib_gossipsub/test/dune
+++ b/src/lib_gossipsub/test/dune
@@ -5,12 +5,12 @@
  (name test_gossipsub)
  (libraries
   fmt
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   octez-libs.tezos-gossipsub
   tezt
   qcheck-core
-  octez-libs.tezos-test-helpers)
+  octez-libs.test-helpers)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_hacl/dune b/src/lib_hacl/dune
index 9512e76290922133e5bbbd021487d50a00f26787..3a7a67ef82475cffc78d19e685aa8f333717a6af 100644
--- a/src/lib_hacl/dune
+++ b/src/lib_hacl/dune
@@ -5,7 +5,7 @@
 
 (library
  (name tezos_hacl)
- (public_name octez-libs.tezos-hacl)
+ (public_name octez-libs.hacl)
  (instrumentation (backend bisect_ppx))
  (libraries
   hacl-star
diff --git a/src/lib_hacl/test/dune b/src/lib_hacl/test/dune
index a7c56f4a0c3da16d5f9c7e7394cdaf1db7c815d9..a8115c6dc5f48b2f6d7aa21b7232d71614e693bc 100644
--- a/src/lib_hacl/test/dune
+++ b/src/lib_hacl/test/dune
@@ -8,16 +8,16 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-lwt-result-stdlib
+  octez-libs.stdlib
+  octez-libs.error-monad
+  octez-libs.lwt-result-stdlib
   zarith
   zarith_stubs_js
   data-encoding
-  octez-libs.tezos-hacl
+  octez-libs.hacl
   qcheck-alcotest
   octez-alcotezt
-  octez-libs.tezos-test-helpers)
+  octez-libs.test-helpers)
  (js_of_ocaml)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_injector/dune b/src/lib_injector/dune
index 215bfab1dc47bb186f48196af603b624f05ba967..92aa4259f61107e528c338bed459aa136db53526 100644
--- a/src/lib_injector/dune
+++ b/src/lib_injector/dune
@@ -6,12 +6,12 @@
  (public_name octez-injector)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   logs.lwt
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-crypto
-  octez-libs.tezos-micheline
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.crypto
+  octez-libs.micheline
   octez-shell-libs.client-base
   octez-libs.tezos-workers
   octez-shell-libs.shell
diff --git a/src/lib_layer2_store/dune b/src/lib_layer2_store/dune
index 4da66c7215e7336fee1cd2366d4e5eba20fbdff2..2167a2b3504cd9aefec408144ab847360b3dcaae 100644
--- a/src/lib_layer2_store/dune
+++ b/src/lib_layer2_store/dune
@@ -7,12 +7,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   index
-  octez-libs.tezos-base
+  octez-libs.base
   irmin-pack
   irmin-pack.unix
   irmin
   aches-lwt
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-libs.tezos-context.encoding)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_layer2_store/test/dune b/src/lib_layer2_store/test/dune
index afdb234debc47c28fb0b9dbfdeded99d0769d13e..db3eaf3919b13d999c8b7c1945b4d0671dd924b9 100644
--- a/src/lib_layer2_store/test/dune
+++ b/src/lib_layer2_store/test/dune
@@ -6,7 +6,7 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-error-monad
+  octez-libs.error-monad
   octez-l2-libs.layer2_store
   qcheck-alcotest
   octez-alcotezt)
diff --git a/src/lib_lazy_containers/dune b/src/lib_lazy_containers/dune
index aebc6053dbfcc4163b32c21ffb02e79ad928e914..25f5a67aa5e615f08dfa233202b44e9899d1afdb 100644
--- a/src/lib_lazy_containers/dune
+++ b/src/lib_lazy_containers/dune
@@ -3,8 +3,8 @@
 
 (library
  (name tezos_lazy_containers)
- (public_name octez-libs.tezos-lazy-containers)
+ (public_name octez-libs.lazy-containers)
  (instrumentation (backend bisect_ppx))
  (libraries
   zarith
-  octez-libs.tezos-tree-encoding))
+  octez-libs.tree-encoding))
diff --git a/src/lib_lazy_containers/test/dune b/src/lib_lazy_containers/test/dune
index 98fda0e2013fc8c6b0a47db26635b0eb2504e8f1..cf268439666231ee4917836e6fecb91ba6c9d7a6 100644
--- a/src/lib_lazy_containers/test/dune
+++ b/src/lib_lazy_containers/test/dune
@@ -6,7 +6,7 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-lazy-containers
+  octez-libs.lazy-containers
   qcheck-core
   qcheck-alcotest
   lwt.unix
diff --git a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune
index eca2e26415efbecfddba65e3c6990e78f260a932..6c184b695a0348c7c0458631fe5ccde11d4c7da9 100644
--- a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune
+++ b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune
@@ -3,7 +3,7 @@
 
 (library
  (name bare_functor_outputs)
- (public_name octez-libs.tezos-lwt-result-stdlib.bare.functor-outputs)
+ (public_name octez-libs.lwt-result-stdlib.bare.functor-outputs)
  (instrumentation (backend bisect_ppx))
  (libraries
   lwt)
diff --git a/src/lib_lwt_result_stdlib/bare/sigs/dune b/src/lib_lwt_result_stdlib/bare/sigs/dune
index 38a5e298ca6db1b31cf276eaa07b5044505df009..561af8963433d4bd6adb106228493f70ba50875d 100644
--- a/src/lib_lwt_result_stdlib/bare/sigs/dune
+++ b/src/lib_lwt_result_stdlib/bare/sigs/dune
@@ -3,10 +3,10 @@
 
 (library
  (name bare_sigs)
- (public_name octez-libs.tezos-lwt-result-stdlib.bare.sigs)
+ (public_name octez-libs.lwt-result-stdlib.bare.sigs)
  (instrumentation (backend bisect_ppx))
  (libraries
   seqes
   lwt
-  octez-libs.tezos-lwt-result-stdlib.bare.functor-outputs)
+  octez-libs.lwt-result-stdlib.bare.functor-outputs)
  (js_of_ocaml))
diff --git a/src/lib_lwt_result_stdlib/bare/structs/dune b/src/lib_lwt_result_stdlib/bare/structs/dune
index 711ccc12cb5a713a881b7bf9105b38f55533c59f..56c23fcc164226af469b1d1581ec8252aea55e8b 100644
--- a/src/lib_lwt_result_stdlib/bare/structs/dune
+++ b/src/lib_lwt_result_stdlib/bare/structs/dune
@@ -3,10 +3,10 @@
 
 (library
  (name bare_structs)
- (public_name octez-libs.tezos-lwt-result-stdlib.bare.structs)
+ (public_name octez-libs.lwt-result-stdlib.bare.structs)
  (instrumentation (backend bisect_ppx))
  (libraries
   seqes
   lwt
-  octez-libs.tezos-lwt-result-stdlib.bare.sigs)
+  octez-libs.lwt-result-stdlib.bare.sigs)
  (js_of_ocaml))
diff --git a/src/lib_lwt_result_stdlib/dune b/src/lib_lwt_result_stdlib/dune
index d7891ab8aa918135fb9c38e492dbef611e434246..5a03968952db734124080bdfcfa15d26d5ba8100 100644
--- a/src/lib_lwt_result_stdlib/dune
+++ b/src/lib_lwt_result_stdlib/dune
@@ -3,14 +3,14 @@
 
 (library
  (name tezos_lwt_result_stdlib)
- (public_name octez-libs.tezos-lwt-result-stdlib)
+ (public_name octez-libs.lwt-result-stdlib)
  (instrumentation (backend bisect_ppx))
  (libraries
   lwt
-  octez-libs.tezos-lwt-result-stdlib.bare.sigs
-  octez-libs.tezos-lwt-result-stdlib.bare.structs
-  octez-libs.tezos-lwt-result-stdlib.traced.sigs
-  octez-libs.tezos-lwt-result-stdlib.traced.structs)
+  octez-libs.lwt-result-stdlib.bare.sigs
+  octez-libs.lwt-result-stdlib.bare.structs
+  octez-libs.lwt-result-stdlib.traced.sigs
+  octez-libs.lwt-result-stdlib.traced.structs)
  (js_of_ocaml))
 
 (documentation (package octez-libs) (mld_files tezos_lwt_result_stdlib))
diff --git a/src/lib_lwt_result_stdlib/examples/traces/dune b/src/lib_lwt_result_stdlib/examples/traces/dune
index f77cf6ff11f9d662f5defb0039f12091e87f2da9..e139911a92beaad3052397fdb3086d97d37bbd90 100644
--- a/src/lib_lwt_result_stdlib/examples/traces/dune
+++ b/src/lib_lwt_result_stdlib/examples/traces/dune
@@ -3,9 +3,9 @@
 
 (library
  (name traces)
- (public_name octez-libs.tezos-lwt-result-stdlib.examples.traces)
+ (public_name octez-libs.lwt-result-stdlib.examples.traces)
  (instrumentation (backend bisect_ppx))
  (libraries
   lwt
-  octez-libs.tezos-lwt-result-stdlib.bare.structs
-  octez-libs.tezos-lwt-result-stdlib.traced.sigs))
+  octez-libs.lwt-result-stdlib.bare.structs
+  octez-libs.lwt-result-stdlib.traced.sigs))
diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune
index c1e443424b9a06c97ab8aa1ead1c704cc650bb18..1cc4c9d87ca5b8f3f9f832a16a1213a7c265729c 100644
--- a/src/lib_lwt_result_stdlib/test/dune
+++ b/src/lib_lwt_result_stdlib/test/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-lwt-result-stdlib
-  octez-libs.tezos-lwt-result-stdlib.examples.traces
+  octez-libs.lwt-result-stdlib
+  octez-libs.lwt-result-stdlib.examples.traces
   lwt.unix
   octez-alcotezt
   qcheck-alcotest
-  octez-libs.tezos-test-helpers)
+  octez-libs.test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune
index d4fb0e8ba29e0bb30a78b7bf3ff326505a206448..d6f24ff8774c2251fbc7bd2133c1e37fe5095f00 100644
--- a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune
+++ b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune
@@ -3,9 +3,9 @@
 
 (library
  (name traced_functor_outputs)
- (public_name octez-libs.tezos-lwt-result-stdlib.traced.functor-outputs)
+ (public_name octez-libs.lwt-result-stdlib.traced.functor-outputs)
  (instrumentation (backend bisect_ppx))
  (libraries
   lwt
-  octez-libs.tezos-lwt-result-stdlib.bare.sigs)
+  octez-libs.lwt-result-stdlib.bare.sigs)
  (js_of_ocaml))
diff --git a/src/lib_lwt_result_stdlib/traced/sigs/dune b/src/lib_lwt_result_stdlib/traced/sigs/dune
index 9504b8d93b3a355ecce8182e253516f05a85371e..156b9c3bfa3f47002093aecd132c0eabd4e220ec 100644
--- a/src/lib_lwt_result_stdlib/traced/sigs/dune
+++ b/src/lib_lwt_result_stdlib/traced/sigs/dune
@@ -3,11 +3,11 @@
 
 (library
  (name traced_sigs)
- (public_name octez-libs.tezos-lwt-result-stdlib.traced.sigs)
+ (public_name octez-libs.lwt-result-stdlib.traced.sigs)
  (instrumentation (backend bisect_ppx))
  (libraries
   lwt
-  octez-libs.tezos-lwt-result-stdlib.bare.sigs
-  octez-libs.tezos-lwt-result-stdlib.bare.structs
-  octez-libs.tezos-lwt-result-stdlib.traced.functor-outputs)
+  octez-libs.lwt-result-stdlib.bare.sigs
+  octez-libs.lwt-result-stdlib.bare.structs
+  octez-libs.lwt-result-stdlib.traced.functor-outputs)
  (js_of_ocaml))
diff --git a/src/lib_lwt_result_stdlib/traced/structs/dune b/src/lib_lwt_result_stdlib/traced/structs/dune
index de70664091f6257c4443fe5e0f398b6fd75ab967..c2c1943d569a9008ae110f89de45abc748568b4c 100644
--- a/src/lib_lwt_result_stdlib/traced/structs/dune
+++ b/src/lib_lwt_result_stdlib/traced/structs/dune
@@ -3,10 +3,10 @@
 
 (library
  (name traced_structs)
- (public_name octez-libs.tezos-lwt-result-stdlib.traced.structs)
+ (public_name octez-libs.lwt-result-stdlib.traced.structs)
  (instrumentation (backend bisect_ppx))
  (libraries
   lwt
-  octez-libs.tezos-lwt-result-stdlib.traced.sigs
-  octez-libs.tezos-lwt-result-stdlib.bare.structs)
+  octez-libs.lwt-result-stdlib.traced.sigs
+  octez-libs.lwt-result-stdlib.bare.structs)
  (js_of_ocaml))
diff --git a/src/lib_mec/dune b/src/lib_mec/dune
index 6662301a0d1ee5201b40c7823dd0d135e9d2159a..04023252e1c2a64f0b1e64196de504300efff412 100644
--- a/src/lib_mec/dune
+++ b/src/lib_mec/dune
@@ -3,7 +3,7 @@
 
 (library
  (name mec)
- (public_name octez-libs.octez-mec)
+ (public_name octez-libs.mec)
  (instrumentation (backend bisect_ppx))
  (libraries
   alcotest
diff --git a/src/lib_mec/test/dune b/src/lib_mec/test/dune
index ed6bcbddfaa6e97f857e541893a06003a50179c9..0752b1d8e5397ea7a99cb2491911a5a5fa48a06f 100644
--- a/src/lib_mec/test/dune
+++ b/src/lib_mec/test/dune
@@ -7,7 +7,7 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.octez-mec)
+  octez-libs.mec)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune
index 191904f1abe1f6170803e37a6a6349ab563dd27a..5955a166b6b5b165bf00a4c2f2cdc9634803039c 100644
--- a/src/lib_micheline/dune
+++ b/src/lib_micheline/dune
@@ -3,14 +3,14 @@
 
 (library
  (name tezos_micheline)
- (public_name octez-libs.tezos-micheline)
+ (public_name octez-libs.micheline)
  (instrumentation (backend bisect_ppx))
  (libraries
   uutf
   zarith
   zarith_stubs_js
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-error-monad
+  octez-libs.stdlib
+  octez-libs.error-monad
   data-encoding)
  (inline_tests (flags -verbose) (modes native js))
  (preprocess (pps ppx_expect))
diff --git a/src/lib_micheline/test/dune b/src/lib_micheline/test/dune
index 31762daa75dde7f094615b7d0a387d5546f2d1b8..6832930594bd44333bac65ce87f3389951bcca99 100644
--- a/src/lib_micheline/test/dune
+++ b/src/lib_micheline/test/dune
@@ -6,7 +6,7 @@
  (package octez-libs)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-micheline)
+  octez-libs.micheline)
  (inline_tests (flags -verbose) (modes native js))
  (preprocess (pps ppx_expect))
  (js_of_ocaml)
@@ -20,7 +20,7 @@
  (package octez-libs)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-micheline)
+  octez-libs.micheline)
  (inline_tests (flags -verbose) (modes native js))
  (preprocess (pps ppx_expect))
  (js_of_ocaml)
diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune
index 181552e149595d891eebbf5c9ef1d1f4c53c03b2..d4a4778c990e86f9af4ad12fd79074dfb6e25aa9 100644
--- a/src/lib_mockup/dune
+++ b/src/lib_mockup/dune
@@ -6,7 +6,7 @@
  (public_name octez-shell-libs.mockup-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.client-base
   octez-shell-libs.shell-services
   octez-proto-libs.protocol-environment
@@ -21,18 +21,18 @@
  (public_name octez-shell-libs.mockup)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   octez-shell-libs.client-base
   octez-shell-libs.mockup-proxy
   resto-cohttp-self-serving-client
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-libs.tezos-p2p-services
   octez-shell-libs.p2p
   octez-proto-libs.protocol-environment
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-client
+  octez-libs.stdlib-unix
+  octez-libs.rpc-http
+  octez-libs.rpc-http-client
   octez-shell-libs.mockup-registration)
  (flags
   (:standard)
@@ -51,8 +51,8 @@
  (public_name octez-shell-libs.mockup-commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.client-commands
   octez-shell-libs.client-base
   octez-shell-libs.mockup
diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune
index 22fa071263fab924635ae5f9b687fca53c3398e2..63ec793bca1fee6f4d565f79beea0d010caca02b 100644
--- a/src/lib_mockup/test/dune
+++ b/src/lib_mockup/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-rpc
+  octez-libs.base
+  octez-libs.base-test-helpers
+  octez-libs.test-helpers
+  octez-libs.rpc
   octez-shell-libs.mockup
   octez-shell-libs.mockup-registration
   octez-shell-libs.client-base
diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune
index c735f245c41d1dcced4bc8593f3f0972530f57ab..81437aab8aeb5ee0e891a837dfde3a0008e97f40 100644
--- a/src/lib_mockup_proxy/dune
+++ b/src/lib_mockup_proxy/dune
@@ -6,12 +6,12 @@
  (public_name octez-shell-libs.mockup-proxy)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.client-base
   octez-proto-libs.protocol-environment
-  octez-libs.tezos-rpc-http
+  octez-libs.rpc-http
   resto-cohttp-self-serving-client
-  octez-libs.tezos-rpc-http-client
+  octez-libs.rpc-http-client
   octez-shell-libs.shell-services
   uri)
  (flags
diff --git a/src/lib_node_config/dune b/src/lib_node_config/dune
index 321a86ad70fc86f0197cd5c148dacc8f1829bf87..047410e8f4c67b646db990a24fae85dd1a5d01e2 100644
--- a/src/lib_node_config/dune
+++ b/src/lib_node_config/dune
@@ -6,12 +6,12 @@
  (public_name octez-node-config)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
   octez-shell-libs.shell-services
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-server
+  octez-libs.rpc-http
+  octez-libs.rpc-http-server
   octez-libs.tezos-context
   octez-shell-libs.store
   octez-shell-libs.validation)
diff --git a/src/lib_p2p/dune b/src/lib_p2p/dune
index 6ac21e731be947ffa72a3ebb7af495c259454b0d..21ae2d40cdc3fd587d0dd44666c5f87917c9e11e 100644
--- a/src/lib_p2p/dune
+++ b/src/lib_p2p/dune
@@ -10,14 +10,14 @@
   lwt-canceler
   ringo
   aches
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
   octez-libs.tezos-p2p-services
-  octez-libs.tezos-version
+  octez-libs.version
   prometheus
-  octez-libs.tezos-base.p2p-identity-file)
+  octez-libs.base.p2p-identity-file)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_p2p/test/common/dune b/src/lib_p2p/test/common/dune
index ba7e9ee73ca61349b6d4730c29159d552b6cc37b..796ad0429c8d8034dda66c1aff32b7f0187bd22a 100644
--- a/src/lib_p2p/test/common/dune
+++ b/src/lib_p2p/test/common/dune
@@ -7,10 +7,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
   octez-shell-libs.p2p
   octez-libs.tezos-p2p-services)
  (flags
diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune
index e492dad111d2b6b6d7ade03135736922ee83e256..6302b22e7286825763567a679304230280cc04af 100644
--- a/src/lib_p2p/test/dune
+++ b/src/lib_p2p/test/dune
@@ -15,14 +15,14 @@
   test_p2p_maintenance)
  (instrumentation (backend bisect_ppx --bisect-sigterm))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
   octez-shell-libs.p2p
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-event-logging-test-helpers
+  octez-libs.test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.event-logging-test-helpers
   octez-shell-libs.p2p_test_common
   octez-libs.tezos-p2p-services
   tezt-tezos
diff --git a/src/lib_p2p/tezt/dune b/src/lib_p2p/tezt/dune
index 52045df7d7ea0d71ac07022f34f53eae013c95ed..ec76d19f667210399cf2aa1a6510dd80bf906a80 100644
--- a/src/lib_p2p/tezt/dune
+++ b/src/lib_p2p/tezt/dune
@@ -6,15 +6,15 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
   octez-shell-libs.p2p
   octez-libs.tezos-p2p-services
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-event-logging-test-helpers
+  octez-libs.test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.event-logging-test-helpers
   octez-shell-libs.p2p_test_common)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_p2p_services/dune b/src/lib_p2p_services/dune
index 6d706385af3afae71fe17d19db78e9c8b8258e40..3e28d10ab4ed2a8a5e508d5dd507f0dee5e7e845 100644
--- a/src/lib_p2p_services/dune
+++ b/src/lib_p2p_services/dune
@@ -8,8 +8,8 @@
  (public_name octez-libs.tezos-p2p-services)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-rpc)
+  octez-libs.base
+  octez-libs.rpc)
  (js_of_ocaml)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_plompiler/dune b/src/lib_plompiler/dune
index 6c3712c55f777c46ebd2f82b8f04f65ec7419c33..70e887514be5ac6d87979847d0279a0f0510ed0e 100644
--- a/src/lib_plompiler/dune
+++ b/src/lib_plompiler/dune
@@ -3,13 +3,13 @@
 
 (library
  (name plompiler)
- (public_name octez-libs.octez-plompiler)
+ (public_name octez-libs.plompiler)
  (instrumentation (backend bisect_ppx))
  (libraries
   repr
   stdint
   hacl-star
-  octez-libs.octez-bls12-381-hash
-  octez-libs.octez-polynomial
-  octez-libs.octez-mec)
+  octez-libs.bls12-381-hash
+  octez-libs.polynomial
+  octez-libs.mec)
  (preprocess (staged_pps ppx_repr ppx_deriving.show)))
diff --git a/src/lib_plonk/dune b/src/lib_plonk/dune
index 78ce62ed6fdaec159122f9decb6879be18124d4f..a38189c452f1457c6aa5290bafd7a25d0daf403b 100644
--- a/src/lib_plonk/dune
+++ b/src/lib_plonk/dune
@@ -3,14 +3,14 @@
 
 (library
  (name plonk)
- (public_name octez-libs.octez-plonk)
+ (public_name octez-libs.plonk)
  (instrumentation (backend bisect_ppx))
  (libraries
   repr
   hacl-star
   data-encoding
-  octez-libs.octez-bls12-381-polynomial
-  octez-libs.octez-plompiler
+  octez-libs.bls12-381-polynomial
+  octez-libs.plompiler
   str)
  (preprocess (pps ppx_repr))
  (flags
diff --git a/src/lib_plonk/test/dune b/src/lib_plonk/test/dune
index 787ed42601a2385b593006b3f81450e3ade5f12a..d3735adea05eb4fd96ad5c97abe905c7f7e5ff82 100644
--- a/src/lib_plonk/test/dune
+++ b/src/lib_plonk/test/dune
@@ -3,12 +3,12 @@
 
 (library
  (name plonk_test)
- (public_name octez-libs.octez-plonk.plonk-test)
+ (public_name octez-libs.plonk.plonk-test)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.octez-plonk
-  octez-libs.octez-plonk.aggregation
-  octez-libs.octez-plonk.distribution)
+  octez-libs.plonk
+  octez-libs.plonk.aggregation
+  octez-libs.plonk.distribution)
  (preprocess (pps ppx_repr))
  (modules helpers cases))
 
@@ -34,9 +34,9 @@
 (executable
  (name main)
  (libraries
-  octez-libs.octez-plonk.plonk-test
+  octez-libs.plonk.plonk-test
   qcheck-alcotest
-  octez-libs.octez-bls12-381-polynomial)
+  octez-libs.bls12-381-polynomial)
  (flags
   (:standard)
   -open Octez_bls12_381_polynomial)
@@ -57,5 +57,5 @@
 (executable
  (name bench)
  (libraries
-  octez-libs.octez-plonk.plonk-test)
+  octez-libs.plonk.plonk-test)
  (modules bench))
diff --git a/src/lib_plonk/test_plompiler/dune b/src/lib_plonk/test_plompiler/dune
index fe46d7ee0a80337519171827a9d24688391c2e85..9234277e0b677d6f24776bb987bd14da3906da6b 100644
--- a/src/lib_plonk/test_plompiler/dune
+++ b/src/lib_plonk/test_plompiler/dune
@@ -4,15 +4,15 @@
 (executable
  (name afl)
  (libraries
-  octez-libs.octez-plompiler
-  octez-libs.octez-plonk
+  octez-libs.plompiler
+  octez-libs.plonk
   bls12-381)
  (modules afl))
 
 (executable
  (name main)
  (libraries
-  octez-libs.octez-plonk.plonk-test)
+  octez-libs.plonk.plonk-test)
  (modules
   bench_poseidon
   benchmark
diff --git a/src/lib_polynomial/dune b/src/lib_polynomial/dune
index 9dde4ad109c86038456d2ed984578dc8d730d29c..8c75460587ff0d8f95ebc10f3ca69a77f2e0fe97 100644
--- a/src/lib_polynomial/dune
+++ b/src/lib_polynomial/dune
@@ -3,7 +3,7 @@
 
 (library
  (name polynomial)
- (public_name octez-libs.octez-polynomial)
+ (public_name octez-libs.polynomial)
  (instrumentation (backend bisect_ppx))
  (libraries
   bls12-381
diff --git a/src/lib_polynomial/test/dune b/src/lib_polynomial/test/dune
index 1c115f4df4b135bdc759feb555030ade6b755c3e..534bc67e680672496a2dbdc7406f7f0515ebbf41 100644
--- a/src/lib_polynomial/test/dune
+++ b/src/lib_polynomial/test/dune
@@ -7,9 +7,9 @@
  (libraries
   tezt.core
   bls12-381
-  octez-libs.octez-mec
+  octez-libs.mec
   octez-alcotezt
-  octez-libs.octez-polynomial)
+  octez-libs.polynomial)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_protocol_compiler/bin/dune b/src/lib_protocol_compiler/bin/dune
index 03407500dbb6d0e44189a92be52596f1d0ae9a88..c1bb952dc1231bec736aba0f0103921d92ece622 100644
--- a/src/lib_protocol_compiler/bin/dune
+++ b/src/lib_protocol_compiler/bin/dune
@@ -16,7 +16,7 @@
  (modes native)
  (libraries
   octez-protocol-compiler.native
-  tezos-version.value)
+  octez-version.value)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
@@ -29,8 +29,8 @@
  (package octez-protocol-compiler)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.stdlib-unix
   octez-protocol-compiler)
  (link_flags
   (:standard)
@@ -49,9 +49,9 @@
  (instrumentation (backend bisect_ppx))
  (modes native)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix)
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune
index 3f565280e68b11543db1ad5ef43cd06a5af74752..9e4300a4f68ff819c50e3bf528d834395325b3d1 100644
--- a/src/lib_protocol_compiler/dune
+++ b/src/lib_protocol_compiler/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-compiler)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   octez-proto-libs.protocol-environment.sigs
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   compiler-libs.common
   lwt.unix
   ocplib-ocamlres
@@ -74,7 +74,7 @@
  (public_name octez-protocol-compiler.native)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-compiler
   compiler-libs.optcomp)
  (flags
diff --git a/src/lib_protocol_compiler/registerer/dune b/src/lib_protocol_compiler/registerer/dune
index 3dad3ef8ce52ec018263be66dbd67e97194f604b..f4499b0f86f6914b2c1063dffa9dfbc4cf723669 100644
--- a/src/lib_protocol_compiler/registerer/dune
+++ b/src/lib_protocol_compiler/registerer/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-compiler.registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment.sigs)
  (flags
   (:standard)
diff --git a/src/lib_protocol_environment/context_ops/dune b/src/lib_protocol_environment/context_ops/dune
index ef8b77bac515e02b392a04d5c04417f12589fc80..917ea3933f83ed2a572fc7d9d1ca6a54614ee798 100644
--- a/src/lib_protocol_environment/context_ops/dune
+++ b/src/lib_protocol_environment/context_ops/dune
@@ -6,8 +6,8 @@
  (public_name octez-shell-libs.context-ops)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-error-monad
+  octez-libs.base
+  octez-libs.error-monad
   octez-proto-libs.protocol-environment
   octez-libs.tezos-context
   octez-shell-libs.shell-context)
diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune
index 39a2ed20dd198cb2e20bcb132cb86f117018d1bd..9faa82f4a53f571c5c24b2d381f8e5f466040a54 100644
--- a/src/lib_protocol_environment/dune
+++ b/src/lib_protocol_environment/dune
@@ -9,19 +9,19 @@
   zarith
   zarith_stubs_js
   bls12-381
-  octez-libs.octez-plonk
-  octez-libs.tezos-crypto-dal
+  octez-libs.plonk
+  octez-libs.crypto-dal
   class_group_vdf
   aches
   aches-lwt
-  octez-libs.tezos-base
+  octez-libs.base
   octez-libs.tezos-sapling
   octez-proto-libs.protocol-environment.sigs
   octez-proto-libs.protocol-environment.structs
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   octez-libs.tezos-context.memory
   octez-l2-libs.scoru-wasm
-  octez-libs.tezos-event-logging)
+  octez-libs.event-logging)
  (flags
   (:standard)
   -open Plonk
diff --git a/src/lib_protocol_environment/shell_context/dune b/src/lib_protocol_environment/shell_context/dune
index b119e228b533d05bf6f2f71b8254153c6108635c..8dd2ce73b84bc464aa7354832352ec8acc017a4e 100644
--- a/src/lib_protocol_environment/shell_context/dune
+++ b/src/lib_protocol_environment/shell_context/dune
@@ -6,7 +6,7 @@
  (public_name octez-shell-libs.shell-context)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment
   octez-libs.tezos-context)
  (flags
diff --git a/src/lib_protocol_environment/structs/dune b/src/lib_protocol_environment/structs/dune
index 1dfd027534913c10385a3b52ab1e09cae442c091..c204612d1623938e1f7fa0812054fdd434abd6e4 100644
--- a/src/lib_protocol_environment/structs/dune
+++ b/src/lib_protocol_environment/structs/dune
@@ -6,13 +6,13 @@
  (public_name octez-proto-libs.protocol-environment.structs)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto
-  octez-libs.tezos-lwt-result-stdlib
+  octez-libs.stdlib
+  octez-libs.crypto
+  octez-libs.lwt-result-stdlib
   octez-l2-libs.scoru-wasm
   data-encoding
   bls12-381
-  octez-libs.octez-plonk)
+  octez-libs.plonk)
  (flags
   (:standard)
   -open Plonk))
diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune
index 09a1ad4b525d078e9f48d681413df1a595e33f94..3487222a694b8aa76368d76fd8ba3b1da3999494 100644
--- a/src/lib_protocol_environment/test/dune
+++ b/src/lib_protocol_environment/test/dune
@@ -6,11 +6,11 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   octez-proto-libs.protocol-environment
   octez-alcotezt
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
   lwt.unix)
  (library_flags (:standard -linkall))
diff --git a/src/lib_protocol_environment/test_shell_context/dune b/src/lib_protocol_environment/test_shell_context/dune
index 9ee02ee86bb066485f5e33f7371a5364869a16ae..4ada56e1232a7bab63dd79e4ad61c75d3592f432 100644
--- a/src/lib_protocol_environment/test_shell_context/dune
+++ b/src/lib_protocol_environment/test_shell_context/dune
@@ -8,8 +8,8 @@
   tezt.core
   octez-shell-libs.shell-context
   octez-alcotezt
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base
+  octez-libs.test-helpers
+  octez-libs.base
   octez-proto-libs.protocol-environment)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_protocol_updater/dune b/src/lib_protocol_updater/dune
index 9d7e34008dd2fa60535cb7300a1f530182a07b9f..9abeb5553645c096ebca3d97e022aa4489420f6a 100644
--- a/src/lib_protocol_updater/dune
+++ b/src/lib_protocol_updater/dune
@@ -6,9 +6,9 @@
  (public_name octez-shell-libs.protocol-updater)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.stdlib-unix
+  octez-libs.micheline
   octez-shell-libs.shell-services
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-context
diff --git a/src/lib_proxy/dune b/src/lib_proxy/dune
index 86e1c9b4064c8770eb9d1cd6ff21cdf6f6600ae9..1e4d1802b346bb8269a8d32ccdd55dd4c275246e 100644
--- a/src/lib_proxy/dune
+++ b/src/lib_proxy/dune
@@ -8,11 +8,11 @@
  (libraries
   aches
   aches-lwt
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.client-base
   octez-proto-libs.protocol-environment
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.shell-services
   octez-libs.tezos-context.memory
   uri)
diff --git a/src/lib_proxy/rpc/dune b/src/lib_proxy/rpc/dune
index 1b8a77c618cd5faab45986a8faad8129e70dc7bf..0fff1d19643bbbb4be6ca85b448478e0ff74d1aa 100644
--- a/src/lib_proxy/rpc/dune
+++ b/src/lib_proxy/rpc/dune
@@ -6,10 +6,10 @@
  (public_name octez-shell-libs.proxy.rpc)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.client-base
   octez-shell-libs.mockup-proxy
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.proxy
   uri)
  (flags
diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune
index 34159ca41a17bb60e5619ee8a1de29123a3af8c5..6a30cc01e8d5a4b245babaf2d64708e2d0a508fe 100644
--- a/src/lib_proxy/test/dune
+++ b/src/lib_proxy/test/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
   octez-shell-libs.proxy
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.test-helpers
   tezos_proxy_test_helpers_shell_services
   qcheck-alcotest
   octez-alcotezt
diff --git a/src/lib_proxy/test_helpers/shell_services/dune b/src/lib_proxy/test_helpers/shell_services/dune
index 78024d57725bd825176f90a198d8fe6dee3846f6..e8e0eacb385a4718f9869a0bef30309659771cdd 100644
--- a/src/lib_proxy/test_helpers/shell_services/dune
+++ b/src/lib_proxy/test_helpers/shell_services/dune
@@ -4,9 +4,9 @@
 (library
  (name tezos_proxy_test_helpers_shell_services)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.shell-services
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-core
   octez-libs.tezos-context.memory
   lwt.unix
diff --git a/src/lib_proxy/test_helpers/shell_services/test/dune b/src/lib_proxy/test_helpers/shell_services/test/dune
index 6dcab7122b06f3deb8eabbf56cc02500be048db3..ca30a339fac0fba5e103ec1530379e3d1c7c2b21 100644
--- a/src/lib_proxy/test_helpers/shell_services/test/dune
+++ b/src/lib_proxy/test_helpers/shell_services/test/dune
@@ -6,9 +6,9 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-test-helpers
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.test-helpers
   octez-shell-libs.shell-services
   tezos_proxy_test_helpers_shell_services
   qcheck-alcotest
diff --git a/src/lib_proxy_server_config/dune b/src/lib_proxy_server_config/dune
index 74367086f702434cd5ba4d7c9b9e658cdd22ed98..70c723b128cffeab5ff920a50ea74763462307f7 100644
--- a/src/lib_proxy_server_config/dune
+++ b/src/lib_proxy_server_config/dune
@@ -6,8 +6,8 @@
  (public_name tezos-proxy-server-config)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.stdlib-unix
   uri)
  (flags
   (:standard)
diff --git a/src/lib_proxy_server_config/test/dune b/src/lib_proxy_server_config/test/dune
index 1c163d0463e655d53f3b9e9bba66531503fa5bca..1ec7a620b96736b720c39178eb5eadd792b7fa9f 100644
--- a/src/lib_proxy_server_config/test/dune
+++ b/src/lib_proxy_server_config/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   tezos-proxy-server-config
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
   octez-alcotezt
   uri)
diff --git a/src/lib_requester/dune b/src/lib_requester/dune
index da9b68a9b1b915326b393aeac63fd7d093b72bc7..2e40733529af6f7de0864e00b07fcabb5e83553d 100644
--- a/src/lib_requester/dune
+++ b/src/lib_requester/dune
@@ -3,11 +3,11 @@
 
 (library
  (name tezos_requester)
- (public_name octez-libs.tezos-requester)
+ (public_name octez-libs.requester)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.stdlib-unix
   lwt-watcher)
  (flags
   (:standard)
diff --git a/src/lib_requester/test/dune b/src/lib_requester/test/dune
index 5ce93ef95e5c44a87368bb3cb8b285c3a0081e23..af8d39d0fa7d2e58ed224fc25e3431e56c1fdd9d 100644
--- a/src/lib_requester/test/dune
+++ b/src/lib_requester/test/dune
@@ -6,13 +6,13 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-requester
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.stdlib
+  octez-libs.stdlib-unix
+  octez-libs.requester
   octez-alcotezt
   qcheck-alcotest)
  (library_flags (:standard -linkall))
diff --git a/src/lib_rpc/dune b/src/lib_rpc/dune
index 094efd228c19c8f2a799b311fd2b6f74632c43df..b3aa7ec449db642c7ea9d0ccf9fd929adc0e43de 100644
--- a/src/lib_rpc/dune
+++ b/src/lib_rpc/dune
@@ -3,11 +3,11 @@
 
 (library
  (name tezos_rpc)
- (public_name octez-libs.tezos-rpc)
+ (public_name octez-libs.rpc)
  (instrumentation (backend bisect_ppx))
  (libraries
   data-encoding
-  octez-libs.tezos-error-monad
+  octez-libs.error-monad
   resto
   resto-directory
   uri)
diff --git a/src/lib_rpc_http/dune b/src/lib_rpc_http/dune
index b76b01637e5fed8d51701451380f04eebc501dad..ac82773be4d2c9a4f86acc100ab90eb97abd8676 100644
--- a/src/lib_rpc_http/dune
+++ b/src/lib_rpc_http/dune
@@ -3,11 +3,11 @@
 
 (library
  (name tezos_rpc_http)
- (public_name octez-libs.tezos-rpc-http)
+ (public_name octez-libs.rpc-http)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-rpc
+  octez-libs.base
+  octez-libs.rpc
   resto-cohttp
   uri)
  (flags
@@ -17,13 +17,13 @@
 
 (library
  (name tezos_rpc_http_client)
- (public_name octez-libs.tezos-rpc-http-client)
+ (public_name octez-libs.rpc-http-client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   resto-cohttp-client
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http)
+  octez-libs.rpc
+  octez-libs.rpc-http)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
@@ -32,15 +32,15 @@
 
 (library
  (name tezos_rpc_http_client_unix)
- (public_name octez-libs.tezos-rpc-http-client-unix)
+ (public_name octez-libs.rpc-http-client-unix)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-base
+  octez-libs.stdlib-unix
+  octez-libs.base
   cohttp-lwt-unix
   resto-cohttp-client
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http-client)
+  octez-libs.rpc
+  octez-libs.rpc-http-client)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
@@ -49,16 +49,16 @@
 
 (library
  (name tezos_rpc_http_server)
- (public_name octez-libs.tezos-rpc-http-server)
+ (public_name octez-libs.rpc-http-server)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.stdlib-unix
   cohttp-lwt-unix
   resto-cohttp-server
   resto-acl
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http)
+  octez-libs.rpc
+  octez-libs.rpc-http)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_rpc_http/test/dune b/src/lib_rpc_http/test/dune
index d98bc811e5bd16a3713dfe8e755325eb658961b6..702e92001273d06ac901b1784104016d6346cc3d 100644
--- a/src/lib_rpc_http/test/dune
+++ b/src/lib_rpc_http/test/dune
@@ -6,13 +6,13 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-rpc-http-server
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib
+  octez-libs.stdlib-unix
+  octez-libs.test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.rpc-http-server
   qcheck-alcotest
   octez-alcotezt)
  (library_flags (:standard -linkall))
diff --git a/src/lib_sapling/dune b/src/lib_sapling/dune
index d3396f3bc68f116f15f7d86f6fbb2f6f6078d8ce..375820da35b91b5d47d60a7adb07281eb7b2ae49 100644
--- a/src/lib_sapling/dune
+++ b/src/lib_sapling/dune
@@ -13,10 +13,10 @@
   ctypes
   ctypes_stubs_js
   data-encoding
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-lwt-result-stdlib)
+  octez-libs.stdlib
+  octez-libs.crypto
+  octez-libs.error-monad
+  octez-libs.lwt-result-stdlib)
  (js_of_ocaml (javascript_files runtime.js))
  (flags
   (:standard)
diff --git a/src/lib_sapling/test/dune b/src/lib_sapling/test/dune
index eeca0bd46cfb71efba95b91c306ca9156544aeab..3febd9dca18289f961f10ef5c43230889f450ddd 100644
--- a/src/lib_sapling/test/dune
+++ b/src/lib_sapling/test/dune
@@ -9,14 +9,14 @@
  (libraries
   tezt.core
   octez-libs.tezos-sapling
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   str
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib
+  octez-libs.stdlib-unix
   data-encoding
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-alcotezt)
  (library_flags (:standard -linkall))
  (flags
@@ -42,7 +42,7 @@
  (modes js)
  (libraries
   octez-libs.tezos-sapling
-  octez-libs.tezos-hacl)
+  octez-libs.hacl)
  (js_of_ocaml)
  (link_flags
   (:standard)
diff --git a/src/lib_scoru_sequencer/dune b/src/lib_scoru_sequencer/dune
index 0e4e31a3c5e7397b2a10870937a6243351648f7d..a2ed39c56881c9953dc06aec9f1df115fc2a7e01 100644
--- a/src/lib_scoru_sequencer/dune
+++ b/src/lib_scoru_sequencer/dune
@@ -6,16 +6,16 @@
  (package octez-smart-rollup-sequencer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-alpha-libs.smart-rollup-layer2
   tezos-protocol-alpha.protocol
   octez_smart_rollup_node_alpha
   octez-libs.tezos-workers
   octez-smart-rollup-node-lib
   octez-l2-libs.smart-rollup
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-server)
+  octez-libs.rpc
+  octez-libs.rpc-http
+  octez-libs.rpc-http-server)
  (flags
   (:standard)
   -open Tezos_base
diff --git a/src/lib_scoru_sequencer/test/dune b/src/lib_scoru_sequencer/test/dune
index 494975ca96bd7021839885d37e1c56f874190ab2..1ab038244513af325c00ebbac0cb2bbc042d184a 100644
--- a/src/lib_scoru_sequencer/test/dune
+++ b/src/lib_scoru_sequencer/test/dune
@@ -6,11 +6,11 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez_smart_rollup_sequencer
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
   octez-alcotezt)
  (library_flags (:standard -linkall))
diff --git a/src/lib_scoru_wasm/bench/dune b/src/lib_scoru_wasm/bench/dune
index 9a6f2bd0ad04aef3eb4f273b1ab0baa759854515..312676802b30fb207dc2b592a33166bdb9da51e8 100644
--- a/src/lib_scoru_wasm/bench/dune
+++ b/src/lib_scoru_wasm/bench/dune
@@ -6,7 +6,7 @@
  (public_name octez-l2-libs.smart_rollup_wasm_benchmark_lib)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezt
   octez-l2-libs.webassembly-interpreter
   octez-libs.tezos-context.memory
diff --git a/src/lib_scoru_wasm/bench/executable/dune b/src/lib_scoru_wasm/bench/executable/dune
index 5785c64a89afec9c60f0f83b95b23c178bcb6cc1..0c54e4960f2db2ba83b5b6e4b6da72ec7e051f84 100644
--- a/src/lib_scoru_wasm/bench/executable/dune
+++ b/src/lib_scoru_wasm/bench/executable/dune
@@ -5,7 +5,7 @@
  (name octez_smart_rollup_wasm_benchmark)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-l2-libs.smart_rollup_wasm_benchmark_lib)
  (preprocess (pps ppx_deriving.show))
  (flags
diff --git a/src/lib_scoru_wasm/dune b/src/lib_scoru_wasm/dune
index 1cc81848cc22b656af133a1e1262d3d17eaf6562..7c6ff3c2d81efc6cc6bc36063b094b9a5444b7ae 100644
--- a/src/lib_scoru_wasm/dune
+++ b/src/lib_scoru_wasm/dune
@@ -6,13 +6,13 @@
  (public_name octez-l2-libs.scoru-wasm)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-tree-encoding
-  octez-libs.tezos-lazy-containers
+  octez-libs.base
+  octez-libs.tree-encoding
+  octez-libs.lazy-containers
   octez-l2-libs.webassembly-interpreter
-  octez-libs.tezos-context.sigs
+  octez-libs.context.sigs
   octez-libs.tezos-context.memory
-  octez-libs.tezos-lwt-result-stdlib
+  octez-libs.lwt-result-stdlib
   data-encoding)
  (flags
   (:standard)
diff --git a/src/lib_scoru_wasm/fast/dune b/src/lib_scoru_wasm/fast/dune
index f856151919df7d77818b703a20f2344c888daeba..4fe14613fa85a16f1b00ac1fa6d5a74a8fb846cd 100644
--- a/src/lib_scoru_wasm/fast/dune
+++ b/src/lib_scoru_wasm/fast/dune
@@ -6,10 +6,10 @@
  (public_name octez-l2-libs.scoru-wasm-fast)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-tree-encoding
+  octez-libs.base
+  octez-libs.tree-encoding
   octez-l2-libs.webassembly-interpreter
-  octez-libs.tezos-lazy-containers
+  octez-libs.lazy-containers
   octez-l2-libs.scoru-wasm
   octez-l2-libs.wasmer)
  (flags
diff --git a/src/lib_scoru_wasm/fast/test/dune b/src/lib_scoru_wasm/fast/test/dune
index c6d0f92526f87496291a43c42cda2f98e0c3858f..9ad1e2a01fe16927ca0c9e9279d926b3d64a48fe 100644
--- a/src/lib_scoru_wasm/fast/test/dune
+++ b/src/lib_scoru_wasm/fast/test/dune
@@ -6,14 +6,14 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-tree-encoding
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.tree-encoding
+  octez-libs.base.unix
   octez-libs.tezos-context.disk
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-l2-libs.scoru-wasm-helpers
   octez-l2-libs.scoru_wasm_test_helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-l2-libs.scoru-wasm
   octez-l2-libs.scoru-wasm-fast
   qcheck-alcotest
diff --git a/src/lib_scoru_wasm/helpers/dune b/src/lib_scoru_wasm/helpers/dune
index 4c3d8fde5a9b8b09a27c4e303e10306a702411e9..d350907ef32f04227ab0d464bcd1c7638fc56325 100644
--- a/src/lib_scoru_wasm/helpers/dune
+++ b/src/lib_scoru_wasm/helpers/dune
@@ -6,9 +6,9 @@
  (public_name octez-l2-libs.scoru-wasm-helpers)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-tree-encoding
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.tree-encoding
+  octez-libs.base.unix
   octez-libs.tezos-context.disk
   octez-l2-libs.scoru-wasm
   octez-l2-libs.scoru-wasm-fast
diff --git a/src/lib_scoru_wasm/regressions/dune b/src/lib_scoru_wasm/regressions/dune
index 0ad781034fae2477747c856dab5b294651755310..bc6ff2b2cfc8e62804c9b9e3f5467fb359607e14 100644
--- a/src/lib_scoru_wasm/regressions/dune
+++ b/src/lib_scoru_wasm/regressions/dune
@@ -6,10 +6,10 @@
  (package tezos-scoru-wasm-regressions)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-l2-libs.scoru-wasm
   octez-l2-libs.scoru-wasm-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.smart-rollup
   tezos-protocol-alpha.parameters
diff --git a/src/lib_scoru_wasm/test/dune b/src/lib_scoru_wasm/test/dune
index 1ad93deb13e8667f1b439db96f81fc4c4243c838..0cec6b0dca9ba249c337ef5d8a1840806da034ac 100644
--- a/src/lib_scoru_wasm/test/dune
+++ b/src/lib_scoru_wasm/test/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-tree-encoding
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.tree-encoding
+  octez-libs.base.unix
   octez-libs.tezos-context.disk
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.test-helpers
   octez-l2-libs.scoru-wasm
   qcheck-alcotest
   octez-alcotezt
diff --git a/src/lib_scoru_wasm/test/durable_snapshot/dune b/src/lib_scoru_wasm/test/durable_snapshot/dune
index 3d6891f946297e4c10e414247ae2af104d110200..aeca685300a8224c6f665468b1b6923100520ee4 100644
--- a/src/lib_scoru_wasm/test/durable_snapshot/dune
+++ b/src/lib_scoru_wasm/test/durable_snapshot/dune
@@ -6,8 +6,8 @@
  (public_name octez-l2-libs.scoru_wasm_durable_snapshot)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-tree-encoding
+  octez-libs.base
+  octez-libs.tree-encoding
   octez-l2-libs.webassembly-interpreter-extra)
  (preprocess (staged_pps ppx_import ppx_deriving.show))
  (flags
diff --git a/src/lib_scoru_wasm/test/helpers/dune b/src/lib_scoru_wasm/test/helpers/dune
index b70c4d75d399719e80b1f8a74529ebb77fcc28f9..86f544157aa41da6ce9433584c8cc4617a53377e 100644
--- a/src/lib_scoru_wasm/test/helpers/dune
+++ b/src/lib_scoru_wasm/test/helpers/dune
@@ -6,12 +6,12 @@
  (public_name octez-l2-libs.scoru_wasm_test_helpers)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-tree-encoding
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.tree-encoding
+  octez-libs.base.unix
   octez-libs.tezos-context.disk
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.test-helpers
   octez-l2-libs.scoru-wasm
   octez-l2-libs.scoru_wasm_durable_snapshot
   octez-l2-libs.scoru-wasm-fast
diff --git a/src/lib_shell/dune b/src/lib_shell/dune
index 079c1d7816dddbfaf1171f165013d3bd2ba9c571..741e609f346d2c958560f980543e05d0f36d9e11 100644
--- a/src/lib_shell/dune
+++ b/src/lib_shell/dune
@@ -9,9 +9,9 @@
   lwt-watcher
   lwt-canceler
   prometheus
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-rpc
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.rpc
   octez-libs.tezos-context
   octez-shell-libs.store
   octez-shell-libs.store.shared
@@ -19,15 +19,15 @@
   octez-shell-libs.context-ops
   octez-shell-libs.shell-context
   octez-shell-libs.p2p
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.shell-services
   octez-libs.tezos-p2p-services
   octez-shell-libs.protocol-updater
-  octez-libs.tezos-requester
+  octez-libs.requester
   octez-libs.tezos-workers
   octez-shell-libs.validation
-  octez-libs.tezos-version
-  octez-libs.tezos-crypto-dal.octez-dal-config
+  octez-libs.version
+  octez-libs.crypto-dal.dal-config
   lwt-exit)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune
index 35616680a754d1c29c3b44ef33ff55632e5da4ed..4523db0626fbb395a57b7c41b162559d1b27004d 100644
--- a/src/lib_shell/test/dune
+++ b/src/lib_shell/test/dune
@@ -6,8 +6,8 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base
+  octez-libs.base-test-helpers
   octez-shell-libs.store
   octez-shell-libs.store.shared
   octez-libs.tezos-context
@@ -16,16 +16,16 @@
   octez-shell-libs.protocol-updater
   octez-shell-libs.p2p
   octez-libs.tezos-p2p-services
-  octez-libs.tezos-requester
+  octez-libs.requester
   octez-shell-libs.shell
   octez-shell-libs.shell-services
   tezos-protocol-demo-noops.embedded-protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.validation
-  octez-libs.tezos-event-logging-test-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.event-logging-test-helpers
+  octez-libs.test-helpers
   octez-alcotezt
-  tezos-version.value)
+  octez-version.value)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_shell_benchmarks/dune b/src/lib_shell_benchmarks/dune
index 29f203251fc44aab980112fe01fe3156c6c41e46..a250398cc7111f8e4705d2f7f732a306726b0ff5 100644
--- a/src/lib_shell_benchmarks/dune
+++ b/src/lib_shell_benchmarks/dune
@@ -6,14 +6,14 @@
  (public_name octez-shell-libs.shell-benchmarks)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-base
-  octez-libs.tezos-error-monad
+  octez-libs.stdlib
+  octez-libs.base
+  octez-libs.error-monad
   tezos-benchmark
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   octez-libs.tezos-context
   octez-shell-libs.shell-context
-  octez-libs.tezos-micheline)
+  octez-libs.micheline)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_shell_services/dune b/src/lib_shell_services/dune
index a4ee09752fecd0c63e5af0d94805f42cd86607f5..2ded885afd4787440fd8481daab4e318b431e6c9 100644
--- a/src/lib_shell_services/dune
+++ b/src/lib_shell_services/dune
@@ -8,13 +8,13 @@
  (public_name octez-shell-libs.shell-services)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-rpc
+  octez-libs.base
+  octez-libs.rpc
   octez-libs.tezos-p2p-services
-  octez-libs.tezos-version
-  octez-libs.tezos-context.sigs
+  octez-libs.version
+  octez-libs.context.sigs
   octez-libs.tezos-context.merkle_proof_encoding
-  octez-libs.tezos-crypto-dal.octez-dal-config)
+  octez-libs.crypto-dal.dal-config)
  (js_of_ocaml)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune
index 31722d124647cdf44046ad1a4d735fb0b9ff60aa..da42455cacf7a66ac3325772c0d8133a54ee789d 100644
--- a/src/lib_shell_services/test/dune
+++ b/src/lib_shell_services/test/dune
@@ -8,7 +8,7 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.shell-services
   octez-alcotezt)
  (js_of_ocaml)
diff --git a/src/lib_signer_backends/dune b/src/lib_signer_backends/dune
index e8eb440be0dfeef95cbeb9a53b35f80c4c1136f7..1b3a7c82ba4b4462211e326c89c92917d5540374 100644
--- a/src/lib_signer_backends/dune
+++ b/src/lib_signer_backends/dune
@@ -6,11 +6,11 @@
  (public_name octez-shell-libs.signer-backends)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib
+  octez-libs.base
+  octez-libs.stdlib
   octez-shell-libs.client-base
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-client
+  octez-libs.rpc-http
+  octez-libs.rpc-http-client
   octez-shell-libs.signer-services
   octez-shell-libs.shell-services
   uri)
diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune
index 35ff89aced3dd0bf8756cc7a4eec50a505fb4442..9493ac797bdf5d92577adbad7205da9ad3005400 100644
--- a/src/lib_signer_backends/test/dune
+++ b/src/lib_signer_backends/test/dune
@@ -6,11 +6,11 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-crypto
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib
+  octez-libs.error-monad
+  octez-libs.crypto
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends
   octez-alcotezt
diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune
index dd7c278b9e48d63cc51eef2f098ecf0b6b9f516c..1efb70bae61039afb14d16e67f9e381502d9d691 100644
--- a/src/lib_signer_backends/unix/dune
+++ b/src/lib_signer_backends/unix/dune
@@ -8,15 +8,15 @@
  (libraries
   ocplib-endian.bigstring
   fmt
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-clic
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.clic
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
   octez-shell-libs.client-base
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-client
-  octez-libs.tezos-rpc-http-client-unix
+  octez-libs.rpc-http
+  octez-libs.rpc-http-client
+  octez-libs.rpc-http-client-unix
   octez-shell-libs.signer-services
   octez-shell-libs.signer-backends
   octez-shell-libs.shell-services
diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune
index 5b80eb2566a5b453239ddf25da213e9241a25a2f..cfc0786ab87d5c0de544d719d80d443da9369d7e 100644
--- a/src/lib_signer_backends/unix/test/dune
+++ b/src/lib_signer_backends/unix/test/dune
@@ -6,9 +6,9 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto
+  octez-libs.error-monad
+  octez-libs.stdlib
+  octez-libs.crypto
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends.unix
   octez-alcotezt)
diff --git a/src/lib_signer_services/dune b/src/lib_signer_services/dune
index 1a636494cca79480556359d1d8648ff9a64a6009..f4291c62cd4bd1110f8c3acab6c0ee0523043e88 100644
--- a/src/lib_signer_services/dune
+++ b/src/lib_signer_services/dune
@@ -8,8 +8,8 @@
  (public_name octez-shell-libs.signer-services)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-rpc
+  octez-libs.base
+  octez-libs.rpc
   octez-shell-libs.client-base)
  (js_of_ocaml)
  (library_flags (:standard -linkall))
diff --git a/src/lib_smart_rollup/dune b/src/lib_smart_rollup/dune
index 4c53d64f1043f9f9311e726668e1339960a93672..197bb53eff2ba73a9fd9da0ca9c9fef8e57b7dce 100644
--- a/src/lib_smart_rollup/dune
+++ b/src/lib_smart_rollup/dune
@@ -6,11 +6,11 @@
  (public_name octez-l2-libs.smart-rollup)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-crypto
-  octez-libs.tezos-crypto-dal)
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.crypto
+  octez-libs.crypto-dal)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_smart_rollup_node/dune b/src/lib_smart_rollup_node/dune
index 8b992886e4379451e173297fdcb6fff494ad8e5f..52bf47a0fd781d68f00267738348efca8e2dd362 100644
--- a/src/lib_smart_rollup_node/dune
+++ b/src/lib_smart_rollup_node/dune
@@ -6,10 +6,10 @@
  (public_name octez-smart-rollup-node-lib)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-crypto
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
+  octez-libs.crypto
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
   cohttp-lwt-unix
@@ -19,7 +19,7 @@
   tezos-dac-lib
   tezos-dac-client-lib
   octez-injector
-  tezos-version.value
+  octez-version.value
   octez-l2-libs.layer2_store
   octez-crawler
   octez-libs.tezos-workers
diff --git a/src/lib_srs_extraction/dune b/src/lib_srs_extraction/dune
index 0ec4cea83ecd36e72a87faa7c0a7a79f5a169da0..35810b9c038b79e30a8c2698916004081b65445a 100644
--- a/src/lib_srs_extraction/dune
+++ b/src/lib_srs_extraction/dune
@@ -3,10 +3,10 @@
 
 (library
  (name octez_srs_extraction)
- (public_name octez-libs.octez-srs-extraction)
+ (public_name octez-libs.srs-extraction)
  (libraries
   bls12-381
-  octez-libs.octez-bls12-381-polynomial)
+  octez-libs.bls12-381-polynomial)
  (flags
   (:standard)
   -open Octez_bls12_381_polynomial)
@@ -15,11 +15,11 @@
 (executable
  (name srs_extraction_main)
  (libraries
-  octez-libs.octez-srs-extraction
+  octez-libs.srs-extraction
   cmdliner
   unix
   bls12-381
-  octez-libs.octez-bls12-381-polynomial)
+  octez-libs.bls12-381-polynomial)
  (flags
   (:standard)
   -open Octez_srs_extraction
diff --git a/src/lib_srs_extraction/test/dune b/src/lib_srs_extraction/test/dune
index 7297d0b942cdf018173129bad2ed34a8713db8d4..1d3ba69b76763acde60d02fb41dea33a30899ab9 100644
--- a/src/lib_srs_extraction/test/dune
+++ b/src/lib_srs_extraction/test/dune
@@ -6,7 +6,7 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.octez-srs-extraction
+  octez-libs.srs-extraction
   octez-alcotezt)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_stdlib/dune b/src/lib_stdlib/dune
index 8f505d43dc181bf04b25d1f4649fb9ccf43a4c84..2234e92aa224c20b3eb383c93f611930cbd65105 100644
--- a/src/lib_stdlib/dune
+++ b/src/lib_stdlib/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_stdlib)
- (public_name octez-libs.tezos-stdlib)
+ (public_name octez-libs.stdlib)
  (instrumentation (backend bisect_ppx))
  (libraries
   hex
diff --git a/src/lib_stdlib/test-unix/dune b/src/lib_stdlib/test-unix/dune
index d54ad041b0a21610537fc56d64b7779bd282c3d7..4194f69b4cc4e4c498ce89cec24712047cf5ebaa 100644
--- a/src/lib_stdlib/test-unix/dune
+++ b/src/lib_stdlib/test-unix/dune
@@ -6,11 +6,11 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-stdlib
+  octez-libs.stdlib
   octez-alcotezt
   bigstring
   lwt.unix
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune
index b132aa3e9d4748890875b281b7ac7db09faee52d..e6e13aaf0a14595f308c1fd07bd00aef95e2eed1 100644
--- a/src/lib_stdlib/test/dune
+++ b/src/lib_stdlib/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-stdlib
+  octez-libs.stdlib
   octez-alcotezt
   bigstring
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest)
  (js_of_ocaml)
  (library_flags (:standard -linkall))
diff --git a/src/lib_stdlib_unix/dune b/src/lib_stdlib_unix/dune
index ac9959436ad308b5d0193ea20c183f52234719f8..60493475455a2af79334bdf69bf19a9cf39e92dc 100644
--- a/src/lib_stdlib_unix/dune
+++ b/src/lib_stdlib_unix/dune
@@ -3,14 +3,14 @@
 
 (library
  (name tezos_stdlib_unix)
- (public_name octez-libs.tezos-stdlib-unix)
+ (public_name octez-libs.stdlib-unix)
  (instrumentation (backend bisect_ppx))
  (libraries
   unix
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-lwt-result-stdlib
-  octez-libs.tezos-event-logging
-  octez-libs.tezos-stdlib
+  octez-libs.error-monad
+  octez-libs.lwt-result-stdlib
+  octez-libs.event-logging
+  octez-libs.stdlib
   data-encoding
   aches-lwt
   lwt.unix
diff --git a/src/lib_stdlib_unix/test/dune b/src/lib_stdlib_unix/test/dune
index 1acb9ca1ee548f61fdadbe550fe6f1162155c655..b05b181da28378a4fd28e2ea85e48d5d71299e2e 100644
--- a/src/lib_stdlib_unix/test/dune
+++ b/src/lib_stdlib_unix/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-event-logging
-  octez-libs.tezos-test-helpers
+  octez-libs.error-monad
+  octez-libs.stdlib-unix
+  octez-libs.event-logging
+  octez-libs.test-helpers
   qcheck-alcotest
   octez-alcotezt)
  (library_flags (:standard -linkall))
diff --git a/src/lib_store/dune b/src/lib_store/dune
index d069275156a09340f1009c6b49305b31e66aa729..c504a93cb3e7bd9040e14f1964261c60a984ba41 100644
--- a/src/lib_store/dune
+++ b/src/lib_store/dune
@@ -6,9 +6,9 @@
  (public_name octez-shell-libs.store)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-crypto
-  octez-libs.tezos-rpc
+  octez-libs.base
+  octez-libs.crypto
+  octez-libs.rpc
   lwt-watcher
   octez-shell-libs.shell-services
   octez-shell-libs.validation
diff --git a/src/lib_store/mocked/dune b/src/lib_store/mocked/dune
index 4b4c40bc2c76d5cf976667e4b4ec5220ac31f4af..6fb87b39a0eb20060401710e69f83e27ba4ac770 100644
--- a/src/lib_store/mocked/dune
+++ b/src/lib_store/mocked/dune
@@ -7,8 +7,8 @@
  (implements octez-shell-libs.store)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-crypto
+  octez-libs.base
+  octez-libs.crypto
   octez-shell-libs.shell-services
   octez-libs.tezos-context.memory
   octez-shell-libs.context-ops
diff --git a/src/lib_store/shared/dune b/src/lib_store/shared/dune
index beb56eb199512ca287cd5c380b84c8a9cf21b9c8..d2ba5b996ecea16e4441dab78dfe6891101751f4 100644
--- a/src/lib_store/shared/dune
+++ b/src/lib_store/shared/dune
@@ -6,9 +6,9 @@
  (public_name octez-shell-libs.store.shared)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-base
-  octez-libs.tezos-crypto
+  octez-libs.stdlib-unix
+  octez-libs.base
+  octez-libs.crypto
   octez-shell-libs.shell-services
   aches
   aches-lwt
diff --git a/src/lib_store/unix/dune b/src/lib_store/unix/dune
index 1df685a9f7547b0c5827b862cbc5ffe4d45694ad..c38869f5a9033f2ac3ec5bea53fd03dc55fb0834 100644
--- a/src/lib_store/unix/dune
+++ b/src/lib_store/unix/dune
@@ -7,8 +7,8 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-shell-libs.shell-services
-  octez-libs.tezos-base
-  octez-libs.tezos-version
+  octez-libs.base
+  octez-libs.version
   index
   irmin-pack
   octez-shell-libs.store.shared
@@ -18,9 +18,9 @@
   octez-shell-libs.shell-context
   octez-shell-libs.validation
   octez-shell-libs.protocol-updater
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto
+  octez-libs.stdlib-unix
+  octez-libs.stdlib
+  octez-libs.crypto
   lwt-watcher
   aches
   aches-lwt
@@ -58,9 +58,9 @@
  (public_name octez-shell-libs.store.unix-reconstruction)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-crypto
+  octez-libs.base
+  octez-libs.stdlib-unix
+  octez-libs.crypto
   octez-shell-libs.shell-services
   octez-shell-libs.protocol-updater
   octez-shell-libs.validation
@@ -86,9 +86,9 @@
  (public_name octez-shell-libs.store.unix-snapshots)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-crypto
+  octez-libs.base
+  octez-libs.stdlib-unix
+  octez-libs.crypto
   octez-shell-libs.shell-services
   octez-libs.tezos-context
   octez-shell-libs.validation
diff --git a/src/lib_store/unix/test/bench/dune b/src/lib_store/unix/test/bench/dune
index bb0c34944336888c62619c428a8d596c873aff33..e6225bf1861567152d79b5563a0980d870f87bb6 100644
--- a/src/lib_store/unix/test/bench/dune
+++ b/src/lib_store/unix/test/bench/dune
@@ -5,7 +5,7 @@
  (name bench)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezt
   octez-alcotezt
   src_lib_store_unix_test_tezt_lib)
diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune
index 2e7245668b5ab4b7fdf2f0ddd2060a7ef9efc6b7..a5d01a65fdfd7f433f6ecf0ab421aeac14306cc9 100644
--- a/src/lib_store/unix/test/dune
+++ b/src/lib_store/unix/test/dune
@@ -6,15 +6,15 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-crypto
+  octez-libs.base
+  octez-libs.crypto
   octez-shell-libs.context-ops
   octez-shell-libs.store.shared
   octez-shell-libs.store.unix
   octez-shell-libs.store.unix-reconstruction
   octez-shell-libs.store.unix-snapshots
   octez-shell-libs.shell-services
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.validation
   octez-shell-libs.protocol-updater
   tezos-protocol-demo-noops.embedded-protocol
@@ -23,7 +23,7 @@
   tezos-protocol-alpha.parameters
   octez-protocol-alpha-libs.plugin
   octez-alcotezt
-  octez-libs.tezos-test-helpers)
+  octez-libs.test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/lib_store/unix/test/slow/dune b/src/lib_store/unix/test/slow/dune
index 5dbeba3507882ed8854d758d6373d4f982fcae85..e7d8f51c97f8aa11823bee3bc2de2f0472bf91eb 100644
--- a/src/lib_store/unix/test/slow/dune
+++ b/src/lib_store/unix/test/slow/dune
@@ -5,7 +5,7 @@
  (name test_slow)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezt
   octez-alcotezt
   src_lib_store_unix_test_tezt_lib)
diff --git a/src/lib_test/dune b/src/lib_test/dune
index 44ae1a69153eb53b3497807473e12c84b187e2be..4d74751358733833d6bce00971b4ad61f6bcb3e4 100644
--- a/src/lib_test/dune
+++ b/src/lib_test/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_test_helpers)
- (public_name octez-libs.tezos-test-helpers)
+ (public_name octez-libs.test-helpers)
  (instrumentation (backend bisect_ppx))
  (libraries
   uri
diff --git a/src/lib_time_measurement/runtime/dune b/src/lib_time_measurement/runtime/dune
index 02105e4a3f2177e09a836cff441084f28b21df70..e28cfdbbf28a59e222c9cb9c175d266983645c97 100644
--- a/src/lib_time_measurement/runtime/dune
+++ b/src/lib_time_measurement/runtime/dune
@@ -3,7 +3,7 @@
  (public_name tezos-time-measurement)
  (libraries unix
             data-encoding
-            octez-libs.tezos-event-logging
+            octez-libs.event-logging
             lwt)
  (instrumentation.backend (ppx tezos-time-measurement.ppx))
  (flags (:standard
diff --git a/src/lib_tree_encoding/dune b/src/lib_tree_encoding/dune
index 8aa81d6d23193ddb3ef44f708da0bb7bcf947484..61a71212903ce4fcb157bf6e4b57dc90c800ad6c 100644
--- a/src/lib_tree_encoding/dune
+++ b/src/lib_tree_encoding/dune
@@ -3,12 +3,12 @@
 
 (library
  (name tezos_tree_encoding)
- (public_name octez-libs.tezos-tree-encoding)
+ (public_name octez-libs.tree-encoding)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-context.sigs
-  octez-libs.tezos-lwt-result-stdlib
+  octez-libs.base
+  octez-libs.context.sigs
+  octez-libs.lwt-result-stdlib
   data-encoding)
  (flags
   (:standard)
diff --git a/src/lib_tree_encoding/test/dune b/src/lib_tree_encoding/test/dune
index f092f45ab6830f80d3184d1a44f6dbdeb0f48437..a00ef209c758678d08db6b0ced95f0f87d6d62e2 100644
--- a/src/lib_tree_encoding/test/dune
+++ b/src/lib_tree_encoding/test/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-tree-encoding
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.tree-encoding
+  octez-libs.base.unix
   octez-libs.tezos-context.disk
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.test-helpers
   octez-l2-libs.webassembly-interpreter
   qcheck-alcotest
   octez-alcotezt)
diff --git a/src/lib_validation/dune b/src/lib_validation/dune
index dda9937c893d976c85765090bcf802ff9f867f45..cc7fcce2fd123de70dacc0676c216966512db5b7 100644
--- a/src/lib_validation/dune
+++ b/src/lib_validation/dune
@@ -7,16 +7,16 @@
  (instrumentation (backend bisect_ppx))
  (instrumentation (backend tezos-time-measurement))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-crypto
-  octez-libs.tezos-rpc
+  octez-libs.base
+  octez-libs.crypto
+  octez-libs.rpc
   octez-libs.tezos-context
   octez-shell-libs.context-ops
   octez-shell-libs.shell-context
   octez-shell-libs.shell-services
   octez-shell-libs.protocol-updater
-  octez-libs.tezos-stdlib-unix
-  tezos-version.value)
+  octez-libs.stdlib-unix
+  octez-version.value)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_version/dune b/src/lib_version/dune
index 2149ba5e69d79bd3bfc5e79b7435180662a6ce7f..7ea69d18dfc4305630b8bc0a7d0e318fd1b6c164 100644
--- a/src/lib_version/dune
+++ b/src/lib_version/dune
@@ -5,11 +5,11 @@
 
 (library
  (name tezos_version)
- (public_name octez-libs.tezos-version)
+ (public_name octez-libs.version)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-version.parser)
+  octez-libs.base
+  octez-libs.version.parser)
  (js_of_ocaml)
  (flags
   (:standard)
diff --git a/src/lib_version/exe/dune b/src/lib_version/exe/dune
index daa80e6bc32fb998b65407d5c2600add08f823b7..73fed2d85216c3317acd2aae00bac5f57caa3622 100644
--- a/src/lib_version/exe/dune
+++ b/src/lib_version/exe/dune
@@ -5,17 +5,17 @@
  (name get_git_info)
  (libraries
   dune-configurator
-  octez-libs.tezos-version.parser)
+  octez-libs.version.parser)
  (modules get_git_info))
 
 (executable
  (name tezos_print_version)
- (public_name tezos-version)
- (package tezos-version)
+ (public_name octez-version)
+ (package octez-version)
  (libraries
-  tezos-version.value
-  octez-libs.tezos-version
-  octez-libs.tezos-base.unix)
+  octez-version.value
+  octez-libs.version
+  octez-libs.base.unix)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp))
diff --git a/src/lib_version/parser/dune b/src/lib_version/parser/dune
index 59bdfe72db2efc46ed6b1520b0627c32fff28ecf..8d8f2f935b07ee0136555c3a6ca6461045981526 100644
--- a/src/lib_version/parser/dune
+++ b/src/lib_version/parser/dune
@@ -3,7 +3,7 @@
 
 (library
  (name tezos_version_parser)
- (public_name octez-libs.tezos-version.parser)
+ (public_name octez-libs.version.parser)
  (instrumentation (backend bisect_ppx))
  (preprocess (pps ppx_deriving.show))
  (js_of_ocaml))
diff --git a/src/lib_version/test/dune b/src/lib_version/test/dune
index 1e23f9967a374b50235ea988f24d54aa548bd1ed..d5a2a029b4ec07e7134bdb154892435241c652e3 100644
--- a/src/lib_version/test/dune
+++ b/src/lib_version/test/dune
@@ -8,8 +8,8 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-version
-  octez-libs.tezos-version.parser
+  octez-libs.version
+  octez-libs.version.parser
   octez-alcotezt)
  (js_of_ocaml)
  (library_flags (:standard -linkall))
diff --git a/src/lib_version/value/dune b/src/lib_version/value/dune
index 3f2f3d385dff05079a05242636db9eaf7969e37c..81f6aa83b940d0bd00feecf18a136a0ae93e72e5 100644
--- a/src/lib_version/value/dune
+++ b/src/lib_version/value/dune
@@ -5,12 +5,12 @@
 
 (library
  (name tezos_version_value)
- (public_name tezos-version.value)
+ (public_name octez-version.value)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-version
-  octez-libs.tezos-version.parser)
+  octez-libs.base
+  octez-libs.version
+  octez-libs.version.parser)
  (js_of_ocaml)
  (flags
   (:standard)
diff --git a/src/lib_webassembly/bin/dune b/src/lib_webassembly/bin/dune
index ab857ad4bef5f41ae1a89d5e5362969acb976748..2e40e6f6b311849899ab7d419f55f252f4984bc9 100644
--- a/src/lib_webassembly/bin/dune
+++ b/src/lib_webassembly/bin/dune
@@ -8,8 +8,8 @@
   octez-l2-libs.webassembly-interpreter
   octez-l2-libs.webassembly-interpreter-extra
   lwt.unix
-  octez-libs.tezos-tree-encoding
-  octez-libs.tezos-lazy-containers)
+  octez-libs.tree-encoding
+  octez-libs.lazy-containers)
  (flags
   (:standard)
   -open Tezos_webassembly_interpreter
diff --git a/src/lib_webassembly/dune b/src/lib_webassembly/dune
index 553b9d4c6b62d0d6259a33d57a06151ca86f451a..ef8aaccbb4236032cf89a3f8b2fa66eb46f03f21 100644
--- a/src/lib_webassembly/dune
+++ b/src/lib_webassembly/dune
@@ -6,11 +6,11 @@
  (public_name octez-l2-libs.webassembly-interpreter)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-lwt-result-stdlib
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-error-monad
+  octez-libs.lwt-result-stdlib
+  octez-libs.stdlib
+  octez-libs.error-monad
   zarith
-  octez-libs.tezos-lazy-containers)
+  octez-libs.lazy-containers)
  (preprocess (pps ppx_deriving.show))
  (flags
   (:standard)
diff --git a/src/lib_webassembly/extra/dune b/src/lib_webassembly/extra/dune
index 0677ea44a0ce23a8edd81236e37e5ccdf50a86e5..9cbc9e36ac40f99ac4f96d8ad11ce5f75e0641ca 100644
--- a/src/lib_webassembly/extra/dune
+++ b/src/lib_webassembly/extra/dune
@@ -8,7 +8,7 @@
  (libraries
   octez-l2-libs.webassembly-interpreter
   lwt.unix
-  octez-libs.tezos-lazy-containers)
+  octez-libs.lazy-containers)
  (flags
   (:standard)
   -open Tezos_webassembly_interpreter
diff --git a/src/lib_workers/dune b/src/lib_workers/dune
index 63d9bb26b2a7c961b7330d180ebe9a5d0ff95609..e657f7efd9c8600e1ed0c7bcfee80e12ec07e14a 100644
--- a/src/lib_workers/dune
+++ b/src/lib_workers/dune
@@ -6,8 +6,8 @@
  (public_name octez-libs.tezos-workers)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix)
+  octez-libs.base
+  octez-libs.stdlib-unix)
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_workers/test/dune b/src/lib_workers/test/dune
index d7d3a5f9b4dea0a2e051725ebed743ab2d57d0dd..44e6552b97199c3611448c25fa8998c1defa5d51 100644
--- a/src/lib_workers/test/dune
+++ b/src/lib_workers/test/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-base
+  octez-libs.stdlib
+  octez-libs.stdlib-unix
+  octez-libs.base
   octez-libs.tezos-workers
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.test-helpers
+  octez-libs.base-test-helpers
   octez-alcotezt)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune
index aab64641d679ef2bdd6768a7b36739a45aac7d5c..d40532b6bc5377c1320338990af6f208001c39a0 100644
--- a/src/proto_000_Ps9mPmXa/lib_client/dune
+++ b/src/proto_000_Ps9mPmXa/lib_client/dune
@@ -5,15 +5,15 @@
  (name tezos_client_000_Ps9mPmXa)
  (public_name octez-protocol-000-Ps9mPmXa-libs.client)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-000-Ps9mPmXa.protocol
   tezos-protocol-000-Ps9mPmXa.protocol.lifted
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-commands
-  octez-libs.tezos-stdlib-unix)
+  octez-libs.stdlib-unix)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune b/src/proto_001_PtCJ7pwo/lib_client/dune
index 4d646c54c829bf85ba081b0bff923c2ff1349a28..4dd3fc11f856abd21cc756595332ca3586aac41e 100644
--- a/src/proto_001_PtCJ7pwo/lib_client/dune
+++ b/src/proto_001_PtCJ7pwo/lib_client/dune
@@ -5,14 +5,14 @@
  (name tezos_client_001_PtCJ7pwo)
  (public_name octez-protocol-001-PtCJ7pwo-libs.client)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-001-PtCJ7pwo.protocol
   tezos-protocol-001-PtCJ7pwo.protocol.lifted
   octez-shell-libs.signer-backends
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune
index 417c5fd0d2ef213a9f699313edf9eb956f056d22..a424359382d55f116b543e7227b29ce1c997cb5c 100644
--- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune
+++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune
@@ -5,16 +5,16 @@
  (name tezos_client_001_PtCJ7pwo_commands)
  (public_name octez-protocol-001-PtCJ7pwo-libs.client.commands)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-001-PtCJ7pwo.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-001-PtCJ7pwo-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -32,8 +32,8 @@
  (name tezos_client_001_PtCJ7pwo_commands_registration)
  (public_name octez-protocol-001-PtCJ7pwo-libs.client.commands-registration)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-001-PtCJ7pwo.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -41,7 +41,7 @@
   octez-protocol-001-PtCJ7pwo-libs.client
   octez-shell-libs.client-commands
   octez-protocol-001-PtCJ7pwo-libs.client.commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_002_PsYLVpVv/lib_client/dune b/src/proto_002_PsYLVpVv/lib_client/dune
index bf1a004ef775d52000c682b4ae794a54725e1ec4..e1e27327e5357497a5e137660f3b4cc43acfed5a 100644
--- a/src/proto_002_PsYLVpVv/lib_client/dune
+++ b/src/proto_002_PsYLVpVv/lib_client/dune
@@ -5,14 +5,14 @@
  (name tezos_client_002_PsYLVpVv)
  (public_name octez-protocol-002-PsYLVpVv-libs.client)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-002-PsYLVpVv.protocol
   tezos-protocol-002-PsYLVpVv.protocol.lifted
   octez-shell-libs.signer-backends
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune
index 593b56efe24f4690a3a7cd9f0789719228105129..8caf64a3e44537174d1eb95388bc531e12f35796 100644
--- a/src/proto_002_PsYLVpVv/lib_client_commands/dune
+++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune
@@ -5,16 +5,16 @@
  (name tezos_client_002_PsYLVpVv_commands)
  (public_name octez-protocol-002-PsYLVpVv-libs.client.commands)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-002-PsYLVpVv.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-002-PsYLVpVv-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -32,8 +32,8 @@
  (name tezos_client_002_PsYLVpVv_commands_registration)
  (public_name octez-protocol-002-PsYLVpVv-libs.client.commands-registration)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-002-PsYLVpVv.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -41,7 +41,7 @@
   octez-protocol-002-PsYLVpVv-libs.client
   octez-shell-libs.client-commands
   octez-protocol-002-PsYLVpVv-libs.client.commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_003_PsddFKi3/lib_client/dune b/src/proto_003_PsddFKi3/lib_client/dune
index f1de1f96af37b78b08e06ed0118b5793478881fc..951085bd6cfe9f9bca2e274f341c61b4020d05c9 100644
--- a/src/proto_003_PsddFKi3/lib_client/dune
+++ b/src/proto_003_PsddFKi3/lib_client/dune
@@ -5,14 +5,14 @@
  (name tezos_client_003_PsddFKi3)
  (public_name octez-protocol-003-PsddFKi3-libs.client)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-003-PsddFKi3.protocol
   tezos-protocol-003-PsddFKi3.protocol.lifted
   octez-shell-libs.signer-backends
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune
index a6a63769a73798e3500af8dd30b409bcbaf548da..4f1306da601347d742ee73723a72508ad61cde95 100644
--- a/src/proto_003_PsddFKi3/lib_client_commands/dune
+++ b/src/proto_003_PsddFKi3/lib_client_commands/dune
@@ -5,16 +5,16 @@
  (name tezos_client_003_PsddFKi3_commands)
  (public_name octez-protocol-003-PsddFKi3-libs.client.commands)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-003-PsddFKi3.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-003-PsddFKi3-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -32,8 +32,8 @@
  (name tezos_client_003_PsddFKi3_commands_registration)
  (public_name octez-protocol-003-PsddFKi3-libs.client.commands-registration)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-003-PsddFKi3.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -41,7 +41,7 @@
   octez-protocol-003-PsddFKi3-libs.client
   octez-shell-libs.client-commands
   octez-protocol-003-PsddFKi3-libs.client.commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_004_Pt24m4xi/lib_client/dune b/src/proto_004_Pt24m4xi/lib_client/dune
index 440a5629164c94dda0bfd1f9975ff1f78c7f3930..e51e3821fed02b4f9178a817b743877df0895a02 100644
--- a/src/proto_004_Pt24m4xi/lib_client/dune
+++ b/src/proto_004_Pt24m4xi/lib_client/dune
@@ -5,14 +5,14 @@
  (name tezos_client_004_Pt24m4xi)
  (public_name octez-protocol-004-Pt24m4xi-libs.client)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-004-Pt24m4xi.protocol
   tezos-protocol-004-Pt24m4xi.protocol.lifted
   octez-shell-libs.signer-backends
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune
index 47d10de2489a9eb8f104956cc3c5558c6cbb3c66..cc92a990af2a61c3b151e73254e8b1af8215ab6b 100644
--- a/src/proto_004_Pt24m4xi/lib_client_commands/dune
+++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune
@@ -5,16 +5,16 @@
  (name tezos_client_004_Pt24m4xi_commands)
  (public_name octez-protocol-004-Pt24m4xi-libs.client.commands)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-004-Pt24m4xi.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-004-Pt24m4xi-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -32,8 +32,8 @@
  (name tezos_client_004_Pt24m4xi_commands_registration)
  (public_name octez-protocol-004-Pt24m4xi-libs.client.commands-registration)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-004-Pt24m4xi.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -41,7 +41,7 @@
   octez-protocol-004-Pt24m4xi-libs.client
   octez-shell-libs.client-commands
   octez-protocol-004-Pt24m4xi-libs.client.commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_005_PsBabyM1/lib_client/dune b/src/proto_005_PsBabyM1/lib_client/dune
index 4c3884c1269e759f9eef5217e1a195b341fb71c4..333ed2598f9ef6eff75cb149e461a14e4c1014c7 100644
--- a/src/proto_005_PsBabyM1/lib_client/dune
+++ b/src/proto_005_PsBabyM1/lib_client/dune
@@ -5,14 +5,14 @@
  (name tezos_client_005_PsBabyM1)
  (public_name octez-protocol-005-PsBabyM1-libs.client)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-005-PsBabyM1.protocol
   tezos-protocol-005-PsBabyM1.protocol.lifted
   octez-shell-libs.signer-backends
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune
index b4aea26cfa0fb8d4f9e8e9b04d1716593c32c401..7a52393ab24a11285cd706e4508959844e36a83e 100644
--- a/src/proto_005_PsBabyM1/lib_client_commands/dune
+++ b/src/proto_005_PsBabyM1/lib_client_commands/dune
@@ -5,16 +5,16 @@
  (name tezos_client_005_PsBabyM1_commands)
  (public_name octez-protocol-005-PsBabyM1-libs.client.commands)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-005-PsBabyM1.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-005-PsBabyM1-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -32,8 +32,8 @@
  (name tezos_client_005_PsBabyM1_commands_registration)
  (public_name octez-protocol-005-PsBabyM1-libs.client.commands-registration)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-005-PsBabyM1.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -41,7 +41,7 @@
   octez-protocol-005-PsBabyM1-libs.client
   octez-shell-libs.client-commands
   octez-protocol-005-PsBabyM1-libs.client.commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_006_PsCARTHA/lib_client/dune b/src/proto_006_PsCARTHA/lib_client/dune
index 9fba49701ad3976bbf3a2f26128b61e8271f3d39..965e76b8d7af83560a9b1180a279b7fe81650bdc 100644
--- a/src/proto_006_PsCARTHA/lib_client/dune
+++ b/src/proto_006_PsCARTHA/lib_client/dune
@@ -5,14 +5,14 @@
  (name tezos_client_006_PsCARTHA)
  (public_name octez-protocol-006-PsCARTHA-libs.client)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-006-PsCARTHA.protocol
   tezos-protocol-006-PsCARTHA.protocol.lifted
   octez-shell-libs.signer-backends
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune
index 8bcfcff8add7113fd3f01d59b8e516e20b31c9c0..b34c33b240fc45caaaac6d826b6fee20026965ce 100644
--- a/src/proto_006_PsCARTHA/lib_client_commands/dune
+++ b/src/proto_006_PsCARTHA/lib_client_commands/dune
@@ -5,16 +5,16 @@
  (name tezos_client_006_PsCARTHA_commands)
  (public_name octez-protocol-006-PsCARTHA-libs.client.commands)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-006-PsCARTHA.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-006-PsCARTHA-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -32,8 +32,8 @@
  (name tezos_client_006_PsCARTHA_commands_registration)
  (public_name octez-protocol-006-PsCARTHA-libs.client.commands-registration)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-006-PsCARTHA.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -41,7 +41,7 @@
   octez-protocol-006-PsCARTHA-libs.client
   octez-shell-libs.client-commands
   octez-protocol-006-PsCARTHA-libs.client.commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_007_PsDELPH1/lib_client/dune b/src/proto_007_PsDELPH1/lib_client/dune
index 2cabd800ecd68c455431874b8adb457f3cc15629..41ec2f6763a9a5b86124b094bc0c18122c812be7 100644
--- a/src/proto_007_PsDELPH1/lib_client/dune
+++ b/src/proto_007_PsDELPH1/lib_client/dune
@@ -5,15 +5,15 @@
  (name tezos_client_007_PsDELPH1)
  (public_name octez-protocol-007-PsDELPH1-libs.client)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-007-PsDELPH1.protocol
   tezos-protocol-007-PsDELPH1.protocol.lifted
   octez-shell-libs.signer-backends
   octez-protocol-007-PsDELPH1-libs.plugin
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune
index 1c14de8747cc07a127455ba47b80415972dfefb5..386da8ff0be422180be29ff93bdc414d84d13833 100644
--- a/src/proto_007_PsDELPH1/lib_client_commands/dune
+++ b/src/proto_007_PsDELPH1/lib_client_commands/dune
@@ -5,16 +5,16 @@
  (name tezos_client_007_PsDELPH1_commands)
  (public_name octez-protocol-007-PsDELPH1-libs.client.commands)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-007-PsDELPH1.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-007-PsDELPH1-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -32,8 +32,8 @@
  (name tezos_client_007_PsDELPH1_commands_registration)
  (public_name octez-protocol-007-PsDELPH1-libs.client.commands-registration)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-007-PsDELPH1.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -41,7 +41,7 @@
   octez-protocol-007-PsDELPH1-libs.client
   octez-shell-libs.client-commands
   octez-protocol-007-PsDELPH1-libs.client.commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_007_PsDELPH1/lib_plugin/dune b/src/proto_007_PsDELPH1/lib_plugin/dune
index 9ebb141fa29fb5ed8f2a6b7a9de0c40876a1f1e8..67974f704927a9538026d87cc66f9122ea715e62 100644
--- a/src/proto_007_PsDELPH1/lib_plugin/dune
+++ b/src/proto_007_PsDELPH1/lib_plugin/dune
@@ -5,7 +5,7 @@
  (name tezos_protocol_plugin_007_PsDELPH1)
  (public_name octez-protocol-007-PsDELPH1-libs.plugin)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-007-PsDELPH1.protocol)
  (flags
   (:standard)
@@ -20,7 +20,7 @@
  (name tezos_protocol_plugin_007_PsDELPH1_registerer)
  (public_name octez-protocol-007-PsDELPH1-libs.plugin-registerer)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-007-PsDELPH1.embedded-protocol
   octez-protocol-007-PsDELPH1-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune
index b42446805507f3103a3922ecaf356a5a6eeb10e9..2adf84bef6d91c2ee38f9f90fbc4e5f9acd34d8f 100644
--- a/src/proto_008_PtEdo2Zk/lib_client/dune
+++ b/src/proto_008_PtEdo2Zk/lib_client/dune
@@ -6,15 +6,15 @@
  (public_name octez-protocol-008-PtEdo2Zk-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-008-PtEdo2Zk.protocol
   tezos-protocol-008-PtEdo2Zk.protocol.lifted
   octez-shell-libs.signer-backends
   octez-protocol-008-PtEdo2Zk-libs.plugin
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune
index 5a188804680581aaab345fb0687afd8056349490..1b0196ab89922e465f1d5c84d97a9b82b9490efa 100644
--- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune
+++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune
@@ -6,16 +6,16 @@
  (public_name octez-protocol-008-PtEdo2Zk-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-008-PtEdo2Zk.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-008-PtEdo2Zk-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-008-PtEdo2Zk-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
@@ -36,8 +36,8 @@
  (public_name octez-protocol-008-PtEdo2Zk-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-008-PtEdo2Zk.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -45,7 +45,7 @@
   octez-protocol-008-PtEdo2Zk-libs.client
   octez-shell-libs.client-commands
   octez-protocol-008-PtEdo2Zk-libs.client.commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-008-PtEdo2Zk-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_008_PtEdo2Zk/lib_plugin/dune b/src/proto_008_PtEdo2Zk/lib_plugin/dune
index c5207b41c3ab8ac833b0163b5885207ce382f740..1de2bf1c4d1ba378efecbeb9cc59c668251607a2 100644
--- a/src/proto_008_PtEdo2Zk/lib_plugin/dune
+++ b/src/proto_008_PtEdo2Zk/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-008-PtEdo2Zk-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-008-PtEdo2Zk.protocol)
  (flags
   (:standard)
@@ -22,7 +22,7 @@
  (public_name octez-protocol-008-PtEdo2Zk-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-008-PtEdo2Zk.embedded-protocol
   octez-protocol-008-PtEdo2Zk-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune
index 24167503becc483d1975bb99489d1df010f08aaf..32b7a3bbd53b418653ef0600d0cb07d9bb5c23d4 100644
--- a/src/proto_009_PsFLoren/lib_client/dune
+++ b/src/proto_009_PsFLoren/lib_client/dune
@@ -6,15 +6,15 @@
  (public_name octez-protocol-009-PsFLoren-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-009-PsFLoren.protocol
   tezos-protocol-009-PsFLoren.protocol.lifted
   octez-shell-libs.signer-backends
   octez-protocol-009-PsFLoren-libs.plugin
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune
index be6a7302c5e96893b672f9850dcdcb5cafab2b63..381137dc08241cba2ddf5ca50647bb8a8e7e2166 100644
--- a/src/proto_009_PsFLoren/lib_client_commands/dune
+++ b/src/proto_009_PsFLoren/lib_client_commands/dune
@@ -6,16 +6,16 @@
  (public_name octez-protocol-009-PsFLoren-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-009-PsFLoren.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-009-PsFLoren-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-009-PsFLoren-libs.plugin)
  (library_flags (:standard -linkall))
@@ -38,8 +38,8 @@
  (public_name octez-protocol-009-PsFLoren-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-009-PsFLoren.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -47,7 +47,7 @@
   octez-protocol-009-PsFLoren-libs.client
   octez-shell-libs.client-commands
   octez-protocol-009-PsFLoren-libs.client.commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-009-PsFLoren-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_009_PsFLoren/lib_plugin/dune b/src/proto_009_PsFLoren/lib_plugin/dune
index 9c7d8d189abb41adbb336ec792048bec775ba6f0..2022846fce45511071a9db17f3fdeb2e10231aa3 100644
--- a/src/proto_009_PsFLoren/lib_plugin/dune
+++ b/src/proto_009_PsFLoren/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-009-PsFLoren-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-009-PsFLoren.protocol)
  (flags
   (:standard)
@@ -22,7 +22,7 @@
  (public_name octez-protocol-009-PsFLoren-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-009-PsFLoren.embedded-protocol
   octez-protocol-009-PsFLoren-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune
index 7dc02d2028f8fe72211d994aaa3fc55547a1379d..7d3353881d8418558c2138fa4722dc7d39825648 100644
--- a/src/proto_010_PtGRANAD/lib_client/dune
+++ b/src/proto_010_PtGRANAD/lib_client/dune
@@ -6,15 +6,15 @@
  (public_name octez-protocol-010-PtGRANAD-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-010-PtGRANAD.protocol
   tezos-protocol-010-PtGRANAD.protocol.lifted
   octez-shell-libs.signer-backends
   octez-protocol-010-PtGRANAD-libs.plugin
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune
index 9cfe91b126b33238e89004b8150a46ef322605d4..4b6c57302de4ea97b430c29bea826c92d3bd2e4f 100644
--- a/src/proto_010_PtGRANAD/lib_client_commands/dune
+++ b/src/proto_010_PtGRANAD/lib_client_commands/dune
@@ -6,16 +6,16 @@
  (public_name octez-protocol-010-PtGRANAD-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-010-PtGRANAD.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-010-PtGRANAD-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-010-PtGRANAD-libs.plugin)
  (library_flags (:standard -linkall))
@@ -38,8 +38,8 @@
  (public_name octez-protocol-010-PtGRANAD-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-010-PtGRANAD.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -47,7 +47,7 @@
   octez-protocol-010-PtGRANAD-libs.client
   octez-shell-libs.client-commands
   octez-protocol-010-PtGRANAD-libs.client.commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-010-PtGRANAD-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_010_PtGRANAD/lib_plugin/dune b/src/proto_010_PtGRANAD/lib_plugin/dune
index 8d49915575f6c321b2e3dc7822525baca250e036..05e71a57bd61c8509084ffc3ef5585e9dcc5a8e2 100644
--- a/src/proto_010_PtGRANAD/lib_plugin/dune
+++ b/src/proto_010_PtGRANAD/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-010-PtGRANAD-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-010-PtGRANAD.protocol)
  (flags
   (:standard)
@@ -22,7 +22,7 @@
  (public_name octez-protocol-010-PtGRANAD-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-010-PtGRANAD.embedded-protocol
   octez-protocol-010-PtGRANAD-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune
index d80aa1a5047bf2d665c245164e878d71745aeb91..3137a865514db26ba690c99923aded8386efc806 100644
--- a/src/proto_011_PtHangz2/lib_client/dune
+++ b/src/proto_011_PtHangz2/lib_client/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-011-PtHangz2-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-011-PtHangz2.protocol
@@ -17,7 +17,7 @@
   octez-shell-libs.signer-backends
   octez-protocol-011-PtHangz2-libs.plugin
   tezos-protocol-011-PtHangz2.parameters
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune
index d2367867e0712b93d93cb30c9f7fd6aca2d9b952..84da0b54270fb70923ad28998f956ccaf4b6fd8c 100644
--- a/src/proto_011_PtHangz2/lib_client_commands/dune
+++ b/src/proto_011_PtHangz2/lib_client_commands/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-011-PtHangz2-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-011-PtHangz2.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.mockup
@@ -18,7 +18,7 @@
   octez-shell-libs.client-base
   octez-protocol-011-PtHangz2-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-011-PtHangz2-libs.plugin
   uri)
@@ -42,8 +42,8 @@
  (public_name octez-protocol-011-PtHangz2-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-011-PtHangz2.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -52,7 +52,7 @@
   octez-shell-libs.client-commands
   octez-protocol-011-PtHangz2-libs.client.commands
   octez-protocol-011-PtHangz2-libs.client.sapling
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-011-PtHangz2-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune
index c7f06c9f449c5bcdf65bea95382dc40eca3eacc1..2bdc3cf996bcd0afb2a6b1324712d9f9dccb0dbc 100644
--- a/src/proto_011_PtHangz2/lib_client_sapling/dune
+++ b/src/proto_011_PtHangz2/lib_client_sapling/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-011-PtHangz2-libs.client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-crypto
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.crypto
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends
   octez-protocol-011-PtHangz2-libs.client
diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune
index 38f75b802bf71aa562f152a155fd8a452f8f1961..f6e966e9bcc9ee9350963d534900eb3187d82ec6 100644
--- a/src/proto_011_PtHangz2/lib_parameters/dune
+++ b/src/proto_011_PtHangz2/lib_parameters/dune
@@ -6,7 +6,7 @@
  (public_name tezos-protocol-011-PtHangz2.parameters)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment
   tezos-protocol-011-PtHangz2.protocol)
  (library_flags (:standard -linkall))
@@ -19,7 +19,7 @@
 (executable
  (name gen)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-011-PtHangz2.parameters)
  (link_flags
   (:standard)
diff --git a/src/proto_011_PtHangz2/lib_plugin/dune b/src/proto_011_PtHangz2/lib_plugin/dune
index cc4bc0f68ca8d187e708c7d50ed3129ff62dafea..065c79bae8a52d48393aa6d7ddffd95ae6131958 100644
--- a/src/proto_011_PtHangz2/lib_plugin/dune
+++ b/src/proto_011_PtHangz2/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-011-PtHangz2-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-011-PtHangz2.protocol)
  (flags
   (:standard)
@@ -22,7 +22,7 @@
  (public_name octez-protocol-011-PtHangz2-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-011-PtHangz2.embedded-protocol
   octez-protocol-011-PtHangz2-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune
index 0dc63ec821eddfdd3b707cca3413e0f0858c09f9..f4a8285dc90c3446792ea5f0a6ed66765d929666 100644
--- a/src/proto_012_Psithaca/lib_client/dune
+++ b/src/proto_012_Psithaca/lib_client/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-012-Psithaca-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-012-Psithaca.protocol
@@ -17,7 +17,7 @@
   octez-shell-libs.signer-backends
   octez-protocol-012-Psithaca-libs.plugin
   tezos-protocol-012-Psithaca.parameters
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune
index 3b0c2a57de223e700251059c1c515abdfa8fca65..97b13228a873d036b0c9569d3452749db2eb82b6 100644
--- a/src/proto_012_Psithaca/lib_client_commands/dune
+++ b/src/proto_012_Psithaca/lib_client_commands/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-012-Psithaca-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-012-Psithaca.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.mockup
@@ -18,7 +18,7 @@
   octez-shell-libs.client-base
   octez-protocol-012-Psithaca-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-012-Psithaca-libs.plugin
   uri)
@@ -42,8 +42,8 @@
  (public_name octez-protocol-012-Psithaca-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-012-Psithaca.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -52,7 +52,7 @@
   octez-shell-libs.client-commands
   octez-protocol-012-Psithaca-libs.client.commands
   octez-protocol-012-Psithaca-libs.client.sapling
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-012-Psithaca-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune
index b876066b70ece47621d5f2df0995b8e66e8e32ca..63fad41561a55e26b691c6f75ca85382941a1975 100644
--- a/src/proto_012_Psithaca/lib_client_sapling/dune
+++ b/src/proto_012_Psithaca/lib_client_sapling/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-012-Psithaca-libs.client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-crypto
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.crypto
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends
   octez-protocol-012-Psithaca-libs.client
diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune
index 2e3a4949f13a444fc1ac8d26f4e24a8b8a9bac02..24378cc658949007138842326de64b5773f778fc 100644
--- a/src/proto_012_Psithaca/lib_parameters/dune
+++ b/src/proto_012_Psithaca/lib_parameters/dune
@@ -6,7 +6,7 @@
  (public_name tezos-protocol-012-Psithaca.parameters)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment
   tezos-protocol-012-Psithaca.protocol)
  (library_flags (:standard -linkall))
@@ -19,7 +19,7 @@
 (executable
  (name gen)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-012-Psithaca.parameters
   tezos-protocol-012-Psithaca.protocol)
  (link_flags
diff --git a/src/proto_012_Psithaca/lib_plugin/dune b/src/proto_012_Psithaca/lib_plugin/dune
index 0a2e628bc26bf9cba6e3fcdc20287f2c22456b11..09334f74bd448fb19b339ea3c30976a2420f7447 100644
--- a/src/proto_012_Psithaca/lib_plugin/dune
+++ b/src/proto_012_Psithaca/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-012-Psithaca-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-012-Psithaca.protocol)
  (flags
   (:standard)
@@ -22,7 +22,7 @@
  (public_name octez-protocol-012-Psithaca-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-012-Psithaca.embedded-protocol
   octez-protocol-012-Psithaca-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune
index 60cfcfe8e95a9ae04555e1e1ead5c052fe89e8af..46488a78d08924618bc69d0c4c7aea3a0e6cd225 100644
--- a/src/proto_013_PtJakart/lib_client/dune
+++ b/src/proto_013_PtJakart/lib_client/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-013-PtJakart-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-013-PtJakart.protocol
@@ -17,7 +17,7 @@
   octez-shell-libs.signer-backends
   octez-protocol-013-PtJakart-libs.plugin
   tezos-protocol-013-PtJakart.parameters
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune
index 866cb6d813c707496e2a9c435224dd87c372bd8c..3aab512b4bd18a3b19055a4020d3cd7aee76542e 100644
--- a/src/proto_013_PtJakart/lib_client_commands/dune
+++ b/src/proto_013_PtJakart/lib_client_commands/dune
@@ -6,11 +6,11 @@
  (public_name octez-protocol-013-PtJakart-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-013-PtJakart.protocol
   tezos-protocol-013-PtJakart.parameters
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.mockup
@@ -19,7 +19,7 @@
   octez-shell-libs.client-base
   octez-protocol-013-PtJakart-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-013-PtJakart-libs.plugin
   uri)
@@ -44,8 +44,8 @@
  (public_name octez-protocol-013-PtJakart-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-013-PtJakart.protocol
   tezos-protocol-013-PtJakart.parameters
   octez-proto-libs.protocol-environment
@@ -55,7 +55,7 @@
   octez-shell-libs.client-commands
   octez-protocol-013-PtJakart-libs.client.commands
   octez-protocol-013-PtJakart-libs.client.sapling
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-013-PtJakart-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune
index bdab871722042a4e2b0f830f8f9b8689d84f876c..d462f0a0eb5d9e671b3b2665364243a6f4f7955f 100644
--- a/src/proto_013_PtJakart/lib_client_sapling/dune
+++ b/src/proto_013_PtJakart/lib_client_sapling/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-013-PtJakart-libs.client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-crypto
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.crypto
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends
   octez-protocol-013-PtJakart-libs.client
diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune
index e442ef75c4cb377fca441555bbe8c968f366ff9f..ca02bce0290cf1ac5b7419abf06e1ca940607911 100644
--- a/src/proto_013_PtJakart/lib_parameters/dune
+++ b/src/proto_013_PtJakart/lib_parameters/dune
@@ -6,7 +6,7 @@
  (public_name tezos-protocol-013-PtJakart.parameters)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment
   tezos-protocol-013-PtJakart.protocol)
  (library_flags (:standard -linkall))
@@ -19,7 +19,7 @@
 (executable
  (name gen)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-013-PtJakart.parameters
   tezos-protocol-013-PtJakart.protocol)
  (link_flags
diff --git a/src/proto_013_PtJakart/lib_plugin/dune b/src/proto_013_PtJakart/lib_plugin/dune
index a502989893f9e50836b7293be1288439b2e935fe..216162f23d804899bf47ad572b207642eabb1073 100644
--- a/src/proto_013_PtJakart/lib_plugin/dune
+++ b/src/proto_013_PtJakart/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-013-PtJakart-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-013-PtJakart.protocol)
  (flags
   (:standard)
@@ -22,7 +22,7 @@
  (public_name octez-protocol-013-PtJakart-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-013-PtJakart.embedded-protocol
   octez-protocol-013-PtJakart-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune
index 00cb8adf85bd7c178d3911b04600afc388879a12..1b4e81f17ae5326d0353cd62a16f9ff3f874dd1d 100644
--- a/src/proto_014_PtKathma/lib_client/dune
+++ b/src/proto_014_PtKathma/lib_client/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-014-PtKathma-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-014-PtKathma.protocol
@@ -17,7 +17,7 @@
   octez-shell-libs.signer-backends
   octez-protocol-014-PtKathma-libs.plugin
   tezos-protocol-014-PtKathma.parameters
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_014_PtKathma/lib_client_commands/dune b/src/proto_014_PtKathma/lib_client_commands/dune
index bf54239ad05c41d0e4930cf097a31f4834d82949..e2a311cb39c02dfa78b3162792b7cd688f42f2ed 100644
--- a/src/proto_014_PtKathma/lib_client_commands/dune
+++ b/src/proto_014_PtKathma/lib_client_commands/dune
@@ -6,11 +6,11 @@
  (public_name octez-protocol-014-PtKathma-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-014-PtKathma.protocol
   tezos-protocol-014-PtKathma.parameters
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.mockup
@@ -19,7 +19,7 @@
   octez-shell-libs.client-base
   octez-protocol-014-PtKathma-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-014-PtKathma-libs.plugin
   uri)
@@ -44,8 +44,8 @@
  (public_name octez-protocol-014-PtKathma-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-014-PtKathma.protocol
   tezos-protocol-014-PtKathma.parameters
   octez-proto-libs.protocol-environment
@@ -55,7 +55,7 @@
   octez-shell-libs.client-commands
   octez-protocol-014-PtKathma-libs.client.commands
   octez-protocol-014-PtKathma-libs.client.sapling
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-014-PtKathma-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_014_PtKathma/lib_client_sapling/dune b/src/proto_014_PtKathma/lib_client_sapling/dune
index f9c74bf26deba9b5f1900767b1fa8eb5a604a42f..61b05445e7b12b7070c42510afd4e053905ae3a7 100644
--- a/src/proto_014_PtKathma/lib_client_sapling/dune
+++ b/src/proto_014_PtKathma/lib_client_sapling/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-014-PtKathma-libs.client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-crypto
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.crypto
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends
   octez-protocol-014-PtKathma-libs.client
diff --git a/src/proto_014_PtKathma/lib_parameters/dune b/src/proto_014_PtKathma/lib_parameters/dune
index fc52a73090e7c6b946823c70d3424948eb5b4a81..81bcf159a71eaa46b2b68c78d146a4ba28c10ec5 100644
--- a/src/proto_014_PtKathma/lib_parameters/dune
+++ b/src/proto_014_PtKathma/lib_parameters/dune
@@ -6,7 +6,7 @@
  (public_name tezos-protocol-014-PtKathma.parameters)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment
   tezos-protocol-014-PtKathma.protocol)
  (library_flags (:standard -linkall))
@@ -19,7 +19,7 @@
 (executable
  (name gen)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-014-PtKathma.parameters
   tezos-protocol-014-PtKathma.protocol)
  (link_flags
diff --git a/src/proto_014_PtKathma/lib_plugin/dune b/src/proto_014_PtKathma/lib_plugin/dune
index 8c355da524585de39fcf8447314f9cccf9fed2cb..f89f3adac5f0b758106a860ed50ea47507ab6d07 100644
--- a/src/proto_014_PtKathma/lib_plugin/dune
+++ b/src/proto_014_PtKathma/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-014-PtKathma-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-014-PtKathma.protocol)
  (flags
   (:standard)
@@ -22,7 +22,7 @@
  (public_name octez-protocol-014-PtKathma-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-014-PtKathma.embedded-protocol
   octez-protocol-014-PtKathma-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_015_PtLimaPt/lib_client/dune b/src/proto_015_PtLimaPt/lib_client/dune
index 6fd077dee7257e858748950e14a0329042bb9582..da7225d6b9bcfc42aed4115c6279956ade1cdbbc 100644
--- a/src/proto_015_PtLimaPt/lib_client/dune
+++ b/src/proto_015_PtLimaPt/lib_client/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-015-PtLimaPt-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-015-PtLimaPt.protocol
@@ -17,7 +17,7 @@
   octez-shell-libs.signer-backends
   octez-protocol-015-PtLimaPt-libs.plugin
   tezos-protocol-015-PtLimaPt.parameters
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_015_PtLimaPt/lib_client_commands/dune b/src/proto_015_PtLimaPt/lib_client_commands/dune
index 3e1effbf868615d97a1ea8e73f9fd2784c00ce6a..c078dcf07a4fac7212cc2f337549cded47132846 100644
--- a/src/proto_015_PtLimaPt/lib_client_commands/dune
+++ b/src/proto_015_PtLimaPt/lib_client_commands/dune
@@ -6,11 +6,11 @@
  (public_name octez-protocol-015-PtLimaPt-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-015-PtLimaPt.protocol
   tezos-protocol-015-PtLimaPt.parameters
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.mockup
@@ -19,7 +19,7 @@
   octez-shell-libs.client-base
   octez-protocol-015-PtLimaPt-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-015-PtLimaPt-libs.plugin
   uri)
@@ -43,8 +43,8 @@
  (public_name octez-protocol-015-PtLimaPt-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-015-PtLimaPt.protocol
   tezos-protocol-015-PtLimaPt.parameters
   octez-proto-libs.protocol-environment
@@ -54,7 +54,7 @@
   octez-shell-libs.client-commands
   octez-protocol-015-PtLimaPt-libs.client.commands
   octez-protocol-015-PtLimaPt-libs.client.sapling
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-015-PtLimaPt-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_015_PtLimaPt/lib_client_sapling/dune b/src/proto_015_PtLimaPt/lib_client_sapling/dune
index 39e8f13ce83869345143b049fb94d1f4db5a9d78..abb08a6bf5042c8d96af0c28ac44b6f857b39303 100644
--- a/src/proto_015_PtLimaPt/lib_client_sapling/dune
+++ b/src/proto_015_PtLimaPt/lib_client_sapling/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-015-PtLimaPt-libs.client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-crypto
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.crypto
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends
   octez-protocol-015-PtLimaPt-libs.client
diff --git a/src/proto_015_PtLimaPt/lib_parameters/dune b/src/proto_015_PtLimaPt/lib_parameters/dune
index 5eb803d39d05638a76448a805bd282ff8762bf9e..83306c5ee18435af8bae67ca6b4948d79912e5b2 100644
--- a/src/proto_015_PtLimaPt/lib_parameters/dune
+++ b/src/proto_015_PtLimaPt/lib_parameters/dune
@@ -6,7 +6,7 @@
  (public_name tezos-protocol-015-PtLimaPt.parameters)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment
   tezos-protocol-015-PtLimaPt.protocol)
  (library_flags (:standard -linkall))
@@ -19,7 +19,7 @@
 (executable
  (name gen)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-015-PtLimaPt.parameters
   tezos-protocol-015-PtLimaPt.protocol)
  (link_flags
diff --git a/src/proto_015_PtLimaPt/lib_plugin/dune b/src/proto_015_PtLimaPt/lib_plugin/dune
index dfefd49129b2e38978d6e349eb5bda61d7e71182..86690df5190b8db9ac65130bb2bae9c111583ec4 100644
--- a/src/proto_015_PtLimaPt/lib_plugin/dune
+++ b/src/proto_015_PtLimaPt/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-015-PtLimaPt-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-015-PtLimaPt.protocol)
  (flags
   (:standard)
@@ -22,7 +22,7 @@
  (public_name octez-protocol-015-PtLimaPt-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-015-PtLimaPt.embedded-protocol
   octez-protocol-015-PtLimaPt-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_016_PtMumbai/lib_client/dune b/src/proto_016_PtMumbai/lib_client/dune
index 1f211ac111a2991fe9e00fb5ae52252ce0fd97f7..321e4483820ecd0884ec2d0c3a3e7dbba73ee558 100644
--- a/src/proto_016_PtMumbai/lib_client/dune
+++ b/src/proto_016_PtMumbai/lib_client/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-016-PtMumbai-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-016-PtMumbai.protocol
@@ -17,7 +17,7 @@
   octez-shell-libs.signer-backends
   octez-protocol-016-PtMumbai-libs.plugin
   tezos-protocol-016-PtMumbai.parameters
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-016-PtMumbai-libs.smart-rollup
   uri)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_016_PtMumbai/lib_client_commands/dune b/src/proto_016_PtMumbai/lib_client_commands/dune
index 712a3ca2827383ff6c89d3bfdfc95d5e8577f127..9929baf24940eeb1fe78b872b03ce41f272fe745 100644
--- a/src/proto_016_PtMumbai/lib_client_commands/dune
+++ b/src/proto_016_PtMumbai/lib_client_commands/dune
@@ -6,11 +6,11 @@
  (public_name octez-protocol-016-PtMumbai-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-016-PtMumbai.protocol
   tezos-protocol-016-PtMumbai.parameters
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.mockup
@@ -19,7 +19,7 @@
   octez-shell-libs.client-base
   octez-protocol-016-PtMumbai-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-016-PtMumbai-libs.plugin
   uri)
@@ -43,8 +43,8 @@
  (public_name octez-protocol-016-PtMumbai-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-016-PtMumbai.protocol
   tezos-protocol-016-PtMumbai.parameters
   octez-proto-libs.protocol-environment
@@ -54,7 +54,7 @@
   octez-shell-libs.client-commands
   octez-protocol-016-PtMumbai-libs.client.commands
   octez-protocol-016-PtMumbai-libs.client.sapling
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-016-PtMumbai-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_016_PtMumbai/lib_client_sapling/dune b/src/proto_016_PtMumbai/lib_client_sapling/dune
index ac6ebd7ea3293399546546cc85f933919f41bd45..46186c005afa8c5ffb36e3fd02db50e4effa2a7d 100644
--- a/src/proto_016_PtMumbai/lib_client_sapling/dune
+++ b/src/proto_016_PtMumbai/lib_client_sapling/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-016-PtMumbai-libs.client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-crypto
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.crypto
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends
   octez-protocol-016-PtMumbai-libs.client
diff --git a/src/proto_016_PtMumbai/lib_layer2_utils/dune b/src/proto_016_PtMumbai/lib_layer2_utils/dune
index 2088c1645044f3113d5e9a7d8e6dcab10076852e..a40105ae56033e9fa97cafa21eaa7110dddc1938 100644
--- a/src/proto_016_PtMumbai/lib_layer2_utils/dune
+++ b/src/proto_016_PtMumbai/lib_layer2_utils/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-016-PtMumbai-libs.layer2-utils)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-016-PtMumbai.protocol
   octez-protocol-016-PtMumbai-libs.client)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_016_PtMumbai/lib_parameters/dune b/src/proto_016_PtMumbai/lib_parameters/dune
index 2af168d0679b5c5748004d8ef9d60c1b2ea79669..b7155fb504347c84b717fa485c7f587b8a6ed4af 100644
--- a/src/proto_016_PtMumbai/lib_parameters/dune
+++ b/src/proto_016_PtMumbai/lib_parameters/dune
@@ -6,7 +6,7 @@
  (public_name tezos-protocol-016-PtMumbai.parameters)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment
   tezos-protocol-016-PtMumbai.protocol)
  (library_flags (:standard -linkall))
@@ -19,7 +19,7 @@
 (executable
  (name gen)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-016-PtMumbai.parameters
   tezos-protocol-016-PtMumbai.protocol)
  (link_flags
diff --git a/src/proto_016_PtMumbai/lib_plugin/dune b/src/proto_016_PtMumbai/lib_plugin/dune
index a41bf941cae7e85f09cb8e5158f5e5572bfd568d..81fc3d87e283adcdfd13bd92275eebd89e820a22 100644
--- a/src/proto_016_PtMumbai/lib_plugin/dune
+++ b/src/proto_016_PtMumbai/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-016-PtMumbai-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-016-PtMumbai.protocol
   octez-protocol-016-PtMumbai-libs.smart-rollup)
  (flags
@@ -24,7 +24,7 @@
  (public_name octez-protocol-016-PtMumbai-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-016-PtMumbai.embedded-protocol
   octez-protocol-016-PtMumbai-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_016_PtMumbai/lib_sc_rollup/dune b/src/proto_016_PtMumbai/lib_sc_rollup/dune
index 26daa2ab4d74aa4c3d8c84697d4ed871b3c32295..dc1b5d18811cdda6da33d62ffd3c14a9fde0cf29 100644
--- a/src/proto_016_PtMumbai/lib_sc_rollup/dune
+++ b/src/proto_016_PtMumbai/lib_sc_rollup/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-016-PtMumbai-libs.smart-rollup)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-016-PtMumbai.protocol)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune
index 04b1e42256be70ef4617213663d25335357486c8..2bb88d94b87b2fd66879483e36fb070b4d2c00f9 100644
--- a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune
+++ b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-016-PtMumbai-libs.smart-rollup-layer2)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-016-PtMumbai.protocol
   octez-injector
   octez-l2-libs.smart-rollup)
diff --git a/src/proto_017_PtNairob/bin_accuser/dune b/src/proto_017_PtNairob/bin_accuser/dune
index c3f036b9c3aed3f4f6cfdbb1718a11d255910a90..fa09ae7e415b7569db20aaec08f0572ee9064147 100644
--- a/src/proto_017_PtNairob/bin_accuser/dune
+++ b/src/proto_017_PtNairob/bin_accuser/dune
@@ -7,13 +7,13 @@
  (package octez-accuser-PtNairob)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.client
   octez-shell-libs.client-commands
   octez-protocol-017-PtNairob-libs.baking-commands
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base-unix)
  (link_flags
   (:standard)
diff --git a/src/proto_017_PtNairob/bin_baker/dune b/src/proto_017_PtNairob/bin_baker/dune
index e104534ea6c1d633c8136c1b7016898eda244712..0c3eaff571510229b1fe4340bf9f8d6f8d78165a 100644
--- a/src/proto_017_PtNairob/bin_baker/dune
+++ b/src/proto_017_PtNairob/bin_baker/dune
@@ -7,13 +7,13 @@
  (package octez-baker-PtNairob)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.client
   octez-shell-libs.client-commands
   octez-protocol-017-PtNairob-libs.baking-commands
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base-unix)
  (link_flags
   (:standard)
diff --git a/src/proto_017_PtNairob/bin_sc_rollup_client/dune b/src/proto_017_PtNairob/bin_sc_rollup_client/dune
index 502aa538c4e18fe5c8e033bd05f68de375383162..17dbe92e5008468689102a318406750434b0b5fc 100644
--- a/src/proto_017_PtNairob/bin_sc_rollup_client/dune
+++ b/src/proto_017_PtNairob/bin_sc_rollup_client/dune
@@ -7,11 +7,11 @@
  (package octez-smart-rollup-client-PtNairob)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-017-PtNairob.protocol
   octez_smart_rollup_client_PtNairob
-  tezos-version.value)
+  octez-version.value)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
diff --git a/src/proto_017_PtNairob/bin_sc_rollup_node/dune b/src/proto_017_PtNairob/bin_sc_rollup_node/dune
index de8abc28d522eec0710d8eced2452b4d3e903041..ed63ea51a006dc5888c4812758fd7d09fbe828ad 100644
--- a/src/proto_017_PtNairob/bin_sc_rollup_node/dune
+++ b/src/proto_017_PtNairob/bin_sc_rollup_node/dune
@@ -7,8 +7,8 @@
  (package octez-smart-rollup-node-PtNairob)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-017-PtNairob.protocol
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
diff --git a/src/proto_017_PtNairob/lib_benchmark/dune b/src/proto_017_PtNairob/lib_benchmark/dune
index ab02b689e045dcba65c5af29d748735ebff75598..30ab99198aaafc4611da661b5ed3c447aa4e0b19 100644
--- a/src/proto_017_PtNairob/lib_benchmark/dune
+++ b/src/proto_017_PtNairob/lib_benchmark/dune
@@ -5,15 +5,15 @@
  (name tezos_benchmark_017_PtNairob)
  (public_name tezos-benchmark-017-PtNairob)
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-base
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-micheline
+  octez-libs.stdlib
+  octez-libs.base
+  octez-libs.error-monad
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-benchmark
   tezos-benchmark-type-inference-017-PtNairob
   tezos-protocol-017-PtNairob.protocol
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   tezos-protocol-017-PtNairob.parameters
   hashcons
   octez-protocol-017-PtNairob-libs.test-helpers
diff --git a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune
index 0be6fec4941c254a4484edb2348591b2d4c79f43..c5e98d57dc8d03a960ae6987b851302faaaaba13 100644
--- a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune
+++ b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune
@@ -6,10 +6,10 @@
  (public_name tezos-benchmark-type-inference-017-PtNairob)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-crypto
-  octez-libs.tezos-micheline
+  octez-libs.stdlib
+  octez-libs.error-monad
+  octez-libs.crypto
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-protocol-017-PtNairob.protocol
   hashcons)
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 edada2f46f7ce67587119381fcd0f69ae4a903b9..4962b1c6fb1e497ccd278624c2bf10953c8c809e 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
@@ -4,11 +4,11 @@
 (executables
  (names test_uf test_inference)
  (libraries
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-benchmark-type-inference-017-PtNairob
   tezos-protocol-017-PtNairob.protocol
-  octez-libs.tezos-error-monad
+  octez-libs.error-monad
   octez-protocol-017-PtNairob-libs.client)
  (link_flags
   (:standard)
diff --git a/src/proto_017_PtNairob/lib_benchmark/test/dune b/src/proto_017_PtNairob/lib_benchmark/test/dune
index 46b8270c9888c95b1c8f063a384cb22a3b27d5ee..95c6cfb7bdfe0d0daac82c1316275c4b2e10c92e 100644
--- a/src/proto_017_PtNairob/lib_benchmark/test/dune
+++ b/src/proto_017_PtNairob/lib_benchmark/test/dune
@@ -8,15 +8,15 @@
   test_autocompletion
   test_distribution)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-protocol-017-PtNairob.protocol
   tezos-benchmark
   tezos-benchmark-type-inference-017-PtNairob
   tezos-benchmark-017-PtNairob
   octez-protocol-017-PtNairob-libs.test-helpers
-  octez-libs.tezos-error-monad
+  octez-libs.error-monad
   prbnmcn-stats)
  (link_flags
   (:standard)
diff --git a/src/proto_017_PtNairob/lib_benchmarks_proto/dune b/src/proto_017_PtNairob/lib_benchmarks_proto/dune
index b58e1aab0881d0b9da3ba8801b82ca41d1ab21cf..804f0ea1e15e5cc003dd11154d5e06918d5e4427 100644
--- a/src/proto_017_PtNairob/lib_benchmarks_proto/dune
+++ b/src/proto_017_PtNairob/lib_benchmarks_proto/dune
@@ -7,18 +7,18 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   str
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-base
-  octez-libs.tezos-error-monad
+  octez-libs.stdlib
+  octez-libs.base
+  octez-libs.error-monad
   tezos-protocol-017-PtNairob.parameters
-  octez-libs.tezos-lazy-containers
+  octez-libs.lazy-containers
   tezos-benchmark
   tezos-benchmark-017-PtNairob
   tezos-benchmark-type-inference-017-PtNairob
   tezos-protocol-017-PtNairob.protocol
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   octez-shell-libs.shell-benchmarks
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   octez-protocol-017-PtNairob-libs.test-helpers
   octez-libs.tezos-sapling
   octez-protocol-017-PtNairob-libs.client
diff --git a/src/proto_017_PtNairob/lib_client/dune b/src/proto_017_PtNairob/lib_client/dune
index 83c8447c91ffdc47e83aa21ec72acaa7fdc15ca2..62f36ef8d89078b6b32098ee7b722d1b502ec581 100644
--- a/src/proto_017_PtNairob/lib_client/dune
+++ b/src/proto_017_PtNairob/lib_client/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-017-PtNairob-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-017-PtNairob.protocol
@@ -17,7 +17,7 @@
   octez-shell-libs.signer-backends
   octez-protocol-017-PtNairob-libs.plugin
   tezos-protocol-017-PtNairob.parameters
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-017-PtNairob-libs.smart-rollup
   uri)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_017_PtNairob/lib_client/test/dune b/src/proto_017_PtNairob/lib_client/test/dune
index 4c8a725ed0592fc7ef3b9fdc60018bcd34a0259f..710ac2f9ca36b8e8ecc17c2bc91dd60d038b428d 100644
--- a/src/proto_017_PtNairob/lib_client/test/dune
+++ b/src/proto_017_PtNairob/lib_client/test/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   octez-protocol-017-PtNairob-libs.client
   tezos-protocol-017-PtNairob.protocol
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.test-helpers
   octez-alcotezt
   qcheck-alcotest)
  (library_flags (:standard -linkall))
diff --git a/src/proto_017_PtNairob/lib_client_commands/dune b/src/proto_017_PtNairob/lib_client_commands/dune
index 7f77be5c9fa3093f06f2dba4ded9f9f73c48a389..37d2b9df602b37ac0d1455862519472dafd791e1 100644
--- a/src/proto_017_PtNairob/lib_client_commands/dune
+++ b/src/proto_017_PtNairob/lib_client_commands/dune
@@ -6,11 +6,11 @@
  (public_name octez-protocol-017-PtNairob-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-017-PtNairob.protocol
   tezos-protocol-017-PtNairob.parameters
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.mockup
@@ -19,7 +19,7 @@
   octez-shell-libs.client-base
   octez-protocol-017-PtNairob-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-017-PtNairob-libs.plugin
   uri)
@@ -43,8 +43,8 @@
  (public_name octez-protocol-017-PtNairob-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-017-PtNairob.protocol
   tezos-protocol-017-PtNairob.parameters
   octez-proto-libs.protocol-environment
@@ -54,7 +54,7 @@
   octez-shell-libs.client-commands
   octez-protocol-017-PtNairob-libs.client.commands
   octez-protocol-017-PtNairob-libs.client.sapling
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-017-PtNairob-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_017_PtNairob/lib_client_sapling/dune b/src/proto_017_PtNairob/lib_client_sapling/dune
index e65030063889f9c198925f094b36b6ab2353623a..4feca5866b4f275783a72efb95f1f32098aac1c6 100644
--- a/src/proto_017_PtNairob/lib_client_sapling/dune
+++ b/src/proto_017_PtNairob/lib_client_sapling/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-017-PtNairob-libs.client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-crypto
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.crypto
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends
   octez-protocol-017-PtNairob-libs.client
diff --git a/src/proto_017_PtNairob/lib_dac_plugin/dune b/src/proto_017_PtNairob/lib_dac_plugin/dune
index 9929658d67be90061142e5b7456ac9714882aca4..ab548602e292d5a38d7811cc976b46a03130ddef 100644
--- a/src/proto_017_PtNairob/lib_dac_plugin/dune
+++ b/src/proto_017_PtNairob/lib_dac_plugin/dune
@@ -6,9 +6,9 @@
  (public_name octez-protocol-017-PtNairob-libs.dac)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-compiler.registerer
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   tezos-dac-lib
   tezos-dac-client-lib
   octez-protocol-017-PtNairob-libs.client
diff --git a/src/proto_017_PtNairob/lib_dac_plugin/test/dune b/src/proto_017_PtNairob/lib_dac_plugin/test/dune
index 35e289605a55579a2099ffeb9433a2510353fb69..cd3da527cff4890bcde0bdd1d77dd2978886cfa7 100644
--- a/src/proto_017_PtNairob/lib_dac_plugin/test/dune
+++ b/src/proto_017_PtNairob/lib_dac_plugin/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-017-PtNairob-libs.dac
   tezos-protocol-017-PtNairob.protocol
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-017-PtNairob-libs.test-helpers
   tezos-dac-lib
   tezos_dac_node_lib
diff --git a/src/proto_017_PtNairob/lib_dal/dune b/src/proto_017_PtNairob/lib_dal/dune
index 1644079b7e7df4e9af076f8bc4486ac52e434519..6bbb739b91a31137d1936d4f2fa466880eca6420 100644
--- a/src/proto_017_PtNairob/lib_dal/dune
+++ b/src/proto_017_PtNairob/lib_dal/dune
@@ -6,9 +6,9 @@
  (public_name octez-protocol-017-PtNairob-libs.dal)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-compiler.registerer
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   tezos-dal-node-lib
   octez-protocol-017-PtNairob-libs.client
   octez-protocol-017-PtNairob-libs.plugin
diff --git a/src/proto_017_PtNairob/lib_dal/test/dune b/src/proto_017_PtNairob/lib_dal/test/dune
index 7f1b6f3e48c327aeaeff0f631c58b1410411cfdf..a11e9eb55907ae24a6d9a41df1c0814127eb72c0 100644
--- a/src/proto_017_PtNairob/lib_dal/test/dune
+++ b/src/proto_017_PtNairob/lib_dal/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-017-PtNairob-libs.dal
   tezos-protocol-017-PtNairob.protocol
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-017-PtNairob-libs.test-helpers
   octez-alcotezt)
  (library_flags (:standard -linkall))
diff --git a/src/proto_017_PtNairob/lib_delegate/dune b/src/proto_017_PtNairob/lib_delegate/dune
index c1e5898af54575f67369f167f48b45a211409bcd..f83128711ad1be8f78e0cbde2e4b509081c5ac7d 100644
--- a/src/proto_017_PtNairob/lib_delegate/dune
+++ b/src/proto_017_PtNairob/lib_delegate/dune
@@ -6,9 +6,9 @@
  (public_name octez-protocol-017-PtNairob-libs.baking)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  tezos-version.value
+  octez-libs.base
+  octez-libs.clic
+  octez-version.value
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.plugin
   octez-proto-libs.protocol-environment
@@ -16,15 +16,15 @@
   octez-shell-libs.client-base
   octez-protocol-017-PtNairob-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib
+  octez-libs.stdlib-unix
   octez-shell-libs.shell-context
   octez-libs.tezos-context
   octez-libs.tezos-context.memory
-  octez-libs.tezos-rpc-http-client-unix
+  octez-libs.rpc-http-client-unix
   octez-shell-libs.context-ops
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http
+  octez-libs.rpc
+  octez-libs.rpc-http
   tezos-dal-node-services
   lwt-canceler
   lwt-exit
@@ -53,16 +53,16 @@
  (public_name octez-protocol-017-PtNairob-libs.baking-commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-017-PtNairob-libs.client
   octez-shell-libs.client-commands
   octez-protocol-017-PtNairob-libs.baking
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -83,7 +83,7 @@
  (public_name octez-protocol-017-PtNairob-libs.baking-commands.registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -92,7 +92,7 @@
   octez-shell-libs.client-commands
   octez-protocol-017-PtNairob-libs.baking
   octez-protocol-017-PtNairob-libs.baking-commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_017_PtNairob/lib_delegate/test/dune b/src/proto_017_PtNairob/lib_delegate/test/dune
index 2a00e7e392886676eab5935922fa8b7efa0b3d2d..4db0f9b93291e29f9592f9f8ff405083edc71a0e 100644
--- a/src/proto_017_PtNairob/lib_delegate/test/dune
+++ b/src/proto_017_PtNairob/lib_delegate/test/dune
@@ -6,15 +6,15 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   octez-protocol-017-PtNairob-libs.client
   tezos-protocol-017-PtNairob.protocol
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-017-PtNairob-libs.bakings.mockup-simulator
   octez-protocol-017-PtNairob-libs.baking
   tezos-protocol-017-PtNairob.parameters
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   octez-alcotezt
   uri)
  (library_flags (:standard -linkall))
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 6028fb874a6874fae1739ae58c9b060812a26948..961dc08c895de91b24de7e369c70c7e32fe30615 100644
--- a/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune
@@ -5,12 +5,12 @@
  (name tezos_017_PtNairob_mockup_simulator)
  (public_name octez-protocol-017-PtNairob-libs.bakings.mockup-simulator)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.client
   octez-shell-libs.client-commands
   octez-protocol-017-PtNairob-libs.baking
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base-unix
   tezos-protocol-017-PtNairob.parameters
   octez-shell-libs.mockup
diff --git a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune
index 428107fbeb097b13935d7e2763bf100f54823a2a..3202475e1f7e019e575e4011cf5bc418360ec55c 100644
--- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune
+++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune
@@ -4,7 +4,7 @@
 (executable
  (name tenderbrute_main)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.client-base
   octez-protocol-017-PtNairob-libs.client
   tezos-protocol-017-PtNairob.protocol
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 af79ae7c7f6142259af753f7898dda3a12d10854..5955632c7b2cb84a7dd5afea7523ba6ac01e85c8 100644
--- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune
+++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-017-PtNairob-libs.baking.tenderbrute)
  (libraries
   data-encoding
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   tezos-protocol-017-PtNairob.protocol
   octez-shell-libs.client-base
   octez-protocol-017-PtNairob-libs.client)
diff --git a/src/proto_017_PtNairob/lib_layer2_utils/dune b/src/proto_017_PtNairob/lib_layer2_utils/dune
index fe01297abc1b1dea8d29b80f1d932aca6072ee1a..52b6261c3e2d65e3ad3069dc5413b31a4a072d22 100644
--- a/src/proto_017_PtNairob/lib_layer2_utils/dune
+++ b/src/proto_017_PtNairob/lib_layer2_utils/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-017-PtNairob-libs.layer2-utils)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.client)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_017_PtNairob/lib_parameters/dune b/src/proto_017_PtNairob/lib_parameters/dune
index c7885ff4b383c03e6bda995fe9a53108708b1a2e..b9910e8e2f111d6bdb95c595666459e76b05e0ff 100644
--- a/src/proto_017_PtNairob/lib_parameters/dune
+++ b/src/proto_017_PtNairob/lib_parameters/dune
@@ -6,7 +6,7 @@
  (public_name tezos-protocol-017-PtNairob.parameters)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment
   tezos-protocol-017-PtNairob.protocol)
  (library_flags (:standard -linkall))
@@ -19,7 +19,7 @@
 (executable
  (name gen)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.parameters
   tezos-protocol-017-PtNairob.protocol)
  (link_flags
diff --git a/src/proto_017_PtNairob/lib_plugin/dune b/src/proto_017_PtNairob/lib_plugin/dune
index a58032836f3f2e640bc563bb25e7362f6b4e4f0f..e3ad1a5b4f7e69b2c8f2a31a24c93dffd68f5a28 100644
--- a/src/proto_017_PtNairob/lib_plugin/dune
+++ b/src/proto_017_PtNairob/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-017-PtNairob-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.smart-rollup)
  (flags
@@ -24,7 +24,7 @@
  (public_name octez-protocol-017-PtNairob-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.embedded-protocol
   octez-protocol-017-PtNairob-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_017_PtNairob/lib_plugin/test/dune b/src/proto_017_PtNairob/lib_plugin/test/dune
index 0e50e3c2670a2508ea0d2d4e0af9745bcd046fbc..8912cb97b70734f872ac5f0bf122ce68298ccfb6 100644
--- a/src/proto_017_PtNairob/lib_plugin/test/dune
+++ b/src/proto_017_PtNairob/lib_plugin/test/dune
@@ -6,14 +6,14 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base-test-helpers
+  octez-libs.base.unix
   octez-alcotezt
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-micheline
+  octez-libs.stdlib-unix
+  octez-libs.micheline
   octez-protocol-017-PtNairob-libs.plugin
   tezos-protocol-017-PtNairob.protocol
   tezos-protocol-017-PtNairob.parameters
diff --git a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune
index 1115c6895c7fae0b89c7a8b69b7fd6f9e57c515b..2f3d735803d2c3ccfcecb1c893d0d5d3a2446e17 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune
@@ -7,18 +7,18 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   qcheck-alcotest
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
-  octez-libs.tezos-stdlib-unix
+  octez-libs.test-helpers
+  octez-libs.base
+  octez-libs.micheline
+  octez-libs.stdlib-unix
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.client
   tezos-protocol-017-PtNairob.parameters
   octez-proto-libs.protocol-environment
   octez-protocol-017-PtNairob-libs.plugin
   octez-shell-libs.shell-services
-  octez-libs.octez-plompiler
-  octez-libs.tezos-crypto-dal)
+  octez-libs.plompiler
+  octez-libs.crypto-dal)
  (flags
   (:standard)
   -open Tezos_test_helpers
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 4f4ea46d8ac6340fc6e48c23fe22292a00524fdc..231ccb2b94d2b5bba035a3b5707d23eec3efa789 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune
@@ -8,10 +8,10 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   tezos-protocol-017-PtNairob.parameters
   octez-protocol-017-PtNairob-libs.plugin)
  (library_flags (:standard -linkall))
diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/dune
index 04ac249f8fee64f86c2795eba8e5fcdcc00cb24b..06c7e892b2152e1c5ad13f87735fdfd0a6dd65ef 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/dune
@@ -9,12 +9,12 @@
   tezt
   octez-libs.tezos-context
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-017-PtNairob-libs.client
   tezos-protocol-017-PtNairob.protocol
   tezos-protocol-017-PtNairob.parameters
   octez-protocol-017-PtNairob-libs.test-helpers
-  octez-libs.tezos-base-test-helpers)
+  octez-libs.base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
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 c367b9b0e1969f8587bd87ebcdf1319248cd32f7..6151921ca2099189c7134b90fe57a2244deeb4df 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune
@@ -7,10 +7,10 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.test-helpers
-  octez-libs.tezos-base-test-helpers)
+  octez-libs.base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
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 90647598d8908e65e75485ba32f6337974ecc249..262c10969ad8331e7c4e83da44ae808b13eb09fb 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune
@@ -8,13 +8,13 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-017-PtNairob-libs.client
   tezos-benchmark
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   tezos-benchmark-017-PtNairob
   tezos-benchmark-type-inference-017-PtNairob
   octez-protocol-017-PtNairob-libs.plugin
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 bd2d3844ed2e7f8f1b2cb06ac792db6737768bf4..0aadf08a0dddcd8527d8a022c57bf0bd4b318f8c 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune
@@ -8,11 +8,11 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.client
   octez-protocol-017-PtNairob-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-017-PtNairob-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
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 b9e4b32114276d22bc8bca99657430d824d3d542..7cf7d5ff2cab8b499c221067eedd4b465cbfd667 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune
@@ -7,13 +7,13 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   qcheck-alcotest
   octez-protocol-017-PtNairob-libs.client
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-017-PtNairob-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-017-PtNairob-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune
index 43f1ece40b49a5050972d766af8ae7b1fb753353..6f2377cf5a46d0427e54b20d48aac35da8035c52 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   octez-protocol-017-PtNairob-libs.client
   tezos-protocol-017-PtNairob.protocol
   octez-libs.tezos-context.merkle_proof_encoding
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-017-PtNairob-libs.test-helpers
   octez-alcotezt
   qcheck-alcotest
@@ -19,8 +19,8 @@
   tezos-benchmark-017-PtNairob
   tezos-benchmark-type-inference-017-PtNairob
   octez-protocol-017-PtNairob-libs.smart-rollup
-  octez-libs.tezos-crypto-dal
-  octez-libs.tezos-base-test-helpers
+  octez-libs.crypto-dal
+  octez-libs.base-test-helpers
   tezos-protocol-017-PtNairob.parameters)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_017_PtNairob/lib_protocol/test/regression/dune b/src/proto_017_PtNairob/lib_protocol/test/regression/dune
index 0d46b9645164f310261349938fa9890f01b72f98..492d41ae2ce17d67cc7903392885848a8ef6be0e 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/regression/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/regression/dune
@@ -6,13 +6,13 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   tezt-tezos
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.client
   octez-protocol-017-PtNairob-libs.plugin
   octez-protocol-017-PtNairob-libs.test-helpers
-  octez-libs.tezos-micheline)
+  octez-libs.micheline)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_017_PtNairob/lib_protocol/test/unit/dune b/src/proto_017_PtNairob/lib_protocol/test/unit/dune
index 19e370fe6a50fd2558b04b66be2a5cecab00ebf9..cf24ec93d1eb9c72cdfce2d57c0429a6576edb40 100644
--- a/src/proto_017_PtNairob/lib_protocol/test/unit/dune
+++ b/src/proto_017_PtNairob/lib_protocol/test/unit/dune
@@ -6,21 +6,21 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.base-test-helpers
+  octez-libs.micheline
   octez-protocol-017-PtNairob-libs.client
   octez-shell-libs.client-base
   tezos-protocol-017-PtNairob.parameters
   octez-proto-libs.protocol-environment
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   tezos-protocol-017-PtNairob.protocol
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-017-PtNairob-libs.test-helpers
   octez-alcotezt
   octez-l2-libs.scoru-wasm-helpers
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto-dal
+  octez-libs.stdlib
+  octez-libs.crypto-dal
   octez-l2-libs.scoru-wasm
   octez-l2-libs.webassembly-interpreter-extra)
  (library_flags (:standard -linkall))
diff --git a/src/proto_017_PtNairob/lib_sc_rollup/dune b/src/proto_017_PtNairob/lib_sc_rollup/dune
index e792747bdb969cf3ae6623d6f682d64e1fb2a41a..b0c250c2843b35aec08e2720a3962211f68afabe 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-017-PtNairob-libs.smart-rollup)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_017_PtNairob/lib_sc_rollup_client/dune b/src/proto_017_PtNairob/lib_sc_rollup_client/dune
index 434a4effb239df1bf08610d4d3f7a0f485667b90..09afcc85fafc5852340f513f46e1784896ce983b 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup_client/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup_client/dune
@@ -6,7 +6,7 @@
  (package octez-smart-rollup-client-PtNairob)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   octez-shell-libs.client-commands
   octez-shell-libs.client-base
diff --git a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune
index d045938136cf41ecf30a4ecb680fed9712b9c566..022abf30e998105cde93d6617e302a4563dc1bdb 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-017-PtNairob-libs.smart-rollup-layer2)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   octez-injector
   octez-l2-libs.smart-rollup)
diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/dune
index f97c68dfe2dfda3a47d003d371798d6ad8757479..ffae1a4144cc335b6a9d8f461f6f26cb5a1daccd 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup_node/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dune
@@ -6,8 +6,8 @@
  (package octez-smart-rollup-node-PtNairob)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
   octez-protocol-017-PtNairob-libs.client
@@ -16,9 +16,9 @@
   tezos-protocol-017-PtNairob.protocol
   octez-protocol-017-PtNairob-libs.plugin
   tezos-protocol-017-PtNairob.parameters
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-server
+  octez-libs.rpc
+  octez-libs.rpc-http
+  octez-libs.rpc-http-server
   octez-libs.tezos-workers
   tezos-dal-node-services
   tezos-dal-node-lib
@@ -30,7 +30,7 @@
   octez-protocol-017-PtNairob-libs.layer2-utils
   octez-l2-libs.layer2_store
   octez-crawler
-  octez-libs.tezos-tree-encoding
+  octez-libs.tree-encoding
   data-encoding
   irmin-pack
   irmin-pack.unix
@@ -41,8 +41,8 @@
   octez-smart-rollup-node-lib
   octez-l2-libs.scoru-wasm
   octez-l2-libs.scoru-wasm-fast
-  octez-libs.tezos-crypto-dal
-  tezos-version.value)
+  octez-libs.crypto-dal
+  octez-version.value)
  (flags
   (:standard)
   -open Tezos_base
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 76e46aee590f3ed82b4a23e91aaa530a732f01ab..cddeb4f26b69be606cdcaec3c4afbd6eea951466 100644
--- a/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune
+++ b/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune
@@ -6,9 +6,9 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-017-PtNairob-libs.smart-rollup-layer2
   octez_smart_rollup_node_PtNairob
   octez-alcotezt
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 af7ac98b91b75ecdfd268652467fb34608c81cde..3e346d62245891a3b36d97e3e836b7b1f1d9b352 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
@@ -6,11 +6,11 @@
  (package tezos-sc-rollup-node-test)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-017-PtNairob.protocol
   tezos-protocol-017-PtNairob.parameters
   octez-protocol-017-PtNairob-libs.client
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
   qcheck-core
   logs.lwt
diff --git a/src/proto_018_Proxford/bin_accuser/dune b/src/proto_018_Proxford/bin_accuser/dune
index 7317879284e62ded911f749a5cd3f6d6566a31ae..a0588604f8393009100e83357bbcf6c34079c214 100644
--- a/src/proto_018_Proxford/bin_accuser/dune
+++ b/src/proto_018_Proxford/bin_accuser/dune
@@ -7,13 +7,13 @@
  (package octez-accuser-Proxford)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.client
   octez-shell-libs.client-commands
   octez-protocol-018-Proxford-libs.baking-commands
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base-unix)
  (link_flags
   (:standard)
diff --git a/src/proto_018_Proxford/bin_baker/dune b/src/proto_018_Proxford/bin_baker/dune
index 30fa0b9d1fc81f5c96f67dcac2420c12088f2126..785ab50c30e5c8a78190c430907ff615eade72ed 100644
--- a/src/proto_018_Proxford/bin_baker/dune
+++ b/src/proto_018_Proxford/bin_baker/dune
@@ -7,13 +7,13 @@
  (package octez-baker-Proxford)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.client
   octez-shell-libs.client-commands
   octez-protocol-018-Proxford-libs.baking-commands
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base-unix)
  (link_flags
   (:standard)
diff --git a/src/proto_018_Proxford/bin_sc_rollup_client/dune b/src/proto_018_Proxford/bin_sc_rollup_client/dune
index 02a28d1355a53bddf82161821cc05fb87cc9a893..f40c6466bb4781c1532b4d9796653d5f71246555 100644
--- a/src/proto_018_Proxford/bin_sc_rollup_client/dune
+++ b/src/proto_018_Proxford/bin_sc_rollup_client/dune
@@ -7,11 +7,11 @@
  (package octez-smart-rollup-client-Proxford)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-018-Proxford.protocol
   octez_smart_rollup_client_Proxford
-  tezos-version.value)
+  octez-version.value)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
diff --git a/src/proto_018_Proxford/bin_sc_rollup_node/dune b/src/proto_018_Proxford/bin_sc_rollup_node/dune
index 1080a3e2e71a707175951a40c837c0b8598d678a..7b81868f723da2b99e9166a5692faeb1cd69c849 100644
--- a/src/proto_018_Proxford/bin_sc_rollup_node/dune
+++ b/src/proto_018_Proxford/bin_sc_rollup_node/dune
@@ -7,8 +7,8 @@
  (package octez-smart-rollup-node-Proxford)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-018-Proxford.protocol
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
diff --git a/src/proto_018_Proxford/lib_benchmark/dune b/src/proto_018_Proxford/lib_benchmark/dune
index eef75ef96d5a36a346e1bf3d923736caefea9161..61fd6ccb54e475b07dc36cf63839e9524b3cc672 100644
--- a/src/proto_018_Proxford/lib_benchmark/dune
+++ b/src/proto_018_Proxford/lib_benchmark/dune
@@ -5,15 +5,15 @@
  (name tezos_benchmark_018_Proxford)
  (public_name tezos-benchmark-018-Proxford)
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-base
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-micheline
+  octez-libs.stdlib
+  octez-libs.base
+  octez-libs.error-monad
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-benchmark
   tezos-benchmark-type-inference-018-Proxford
   tezos-protocol-018-Proxford.protocol
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   tezos-protocol-018-Proxford.parameters
   hashcons
   octez-protocol-018-Proxford-libs.test-helpers
diff --git a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune
index 88055e078e4b43450f6b4b29ba769c6fbc9358a6..fa054e65fa4f1b53a9fc08bb0504db9961edfb99 100644
--- a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune
+++ b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune
@@ -6,10 +6,10 @@
  (public_name tezos-benchmark-type-inference-018-Proxford)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-crypto
-  octez-libs.tezos-micheline
+  octez-libs.stdlib
+  octez-libs.error-monad
+  octez-libs.crypto
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-protocol-018-Proxford.protocol
   hashcons)
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 fff654746e8847801c0c26ff3ef7467a1fb3bfe2..2a04d734a0e9d82f179e5f1750db980e461963a9 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
@@ -4,11 +4,11 @@
 (executables
  (names test_uf test_inference)
  (libraries
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-benchmark-type-inference-018-Proxford
   tezos-protocol-018-Proxford.protocol
-  octez-libs.tezos-error-monad
+  octez-libs.error-monad
   octez-protocol-018-Proxford-libs.client)
  (link_flags
   (:standard)
diff --git a/src/proto_018_Proxford/lib_benchmark/test/dune b/src/proto_018_Proxford/lib_benchmark/test/dune
index 9209044a60bedb596ef5b9a8ca639f4d85d2fdf5..7f68a26fbb8d949f8128ccaf152792d0a132012c 100644
--- a/src/proto_018_Proxford/lib_benchmark/test/dune
+++ b/src/proto_018_Proxford/lib_benchmark/test/dune
@@ -8,15 +8,15 @@
   test_autocompletion
   test_distribution)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-protocol-018-Proxford.protocol
   tezos-benchmark
   tezos-benchmark-type-inference-018-Proxford
   tezos-benchmark-018-Proxford
   octez-protocol-018-Proxford-libs.test-helpers
-  octez-libs.tezos-error-monad
+  octez-libs.error-monad
   prbnmcn-stats)
  (link_flags
   (:standard)
diff --git a/src/proto_018_Proxford/lib_benchmarks_proto/dune b/src/proto_018_Proxford/lib_benchmarks_proto/dune
index 04d0a41cba7fe8d6ee77f39d05b377821cfca61e..163e759cf5672e8e25778b22df7e949e92027911 100644
--- a/src/proto_018_Proxford/lib_benchmarks_proto/dune
+++ b/src/proto_018_Proxford/lib_benchmarks_proto/dune
@@ -7,18 +7,18 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   str
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-base
-  octez-libs.tezos-error-monad
+  octez-libs.stdlib
+  octez-libs.base
+  octez-libs.error-monad
   tezos-protocol-018-Proxford.parameters
-  octez-libs.tezos-lazy-containers
+  octez-libs.lazy-containers
   tezos-benchmark
   tezos-benchmark-018-Proxford
   tezos-benchmark-type-inference-018-Proxford
   tezos-protocol-018-Proxford.protocol
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   octez-shell-libs.shell-benchmarks
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   octez-protocol-018-Proxford-libs.test-helpers
   octez-libs.tezos-sapling
   octez-protocol-018-Proxford-libs.client
diff --git a/src/proto_018_Proxford/lib_client/dune b/src/proto_018_Proxford/lib_client/dune
index 45a8c3a13af6d2d87c8dfc47c54c51069e8ed481..65f6483fd28f012c83054ecc057825b3d01ffb20 100644
--- a/src/proto_018_Proxford/lib_client/dune
+++ b/src/proto_018_Proxford/lib_client/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-018-Proxford-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-018-Proxford.protocol
@@ -17,7 +17,7 @@
   octez-shell-libs.signer-backends
   octez-protocol-018-Proxford-libs.plugin
   tezos-protocol-018-Proxford.parameters
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-018-Proxford-libs.smart-rollup
   uri)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_018_Proxford/lib_client/test/dune b/src/proto_018_Proxford/lib_client/test/dune
index 0ea90f01b368bada842e0e802127098a107bdb72..cf3d21a888f4e32dd23af241d67ff29d4c4d6e73 100644
--- a/src/proto_018_Proxford/lib_client/test/dune
+++ b/src/proto_018_Proxford/lib_client/test/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   octez-protocol-018-Proxford-libs.client
   tezos-protocol-018-Proxford.protocol
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.test-helpers
   octez-alcotezt
   qcheck-alcotest)
  (library_flags (:standard -linkall))
diff --git a/src/proto_018_Proxford/lib_client_commands/dune b/src/proto_018_Proxford/lib_client_commands/dune
index 83ee76460af5359183fbada636835c81d67b17bb..46e40828ab13c38f73c2961347817ee24dd42722 100644
--- a/src/proto_018_Proxford/lib_client_commands/dune
+++ b/src/proto_018_Proxford/lib_client_commands/dune
@@ -6,11 +6,11 @@
  (public_name octez-protocol-018-Proxford-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-018-Proxford.protocol
   tezos-protocol-018-Proxford.parameters
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.mockup
@@ -19,7 +19,7 @@
   octez-shell-libs.client-base
   octez-protocol-018-Proxford-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-018-Proxford-libs.plugin
   uri)
@@ -43,8 +43,8 @@
  (public_name octez-protocol-018-Proxford-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-018-Proxford.protocol
   tezos-protocol-018-Proxford.parameters
   octez-proto-libs.protocol-environment
@@ -54,7 +54,7 @@
   octez-shell-libs.client-commands
   octez-protocol-018-Proxford-libs.client.commands
   octez-protocol-018-Proxford-libs.client.sapling
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-018-Proxford-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_018_Proxford/lib_client_sapling/dune b/src/proto_018_Proxford/lib_client_sapling/dune
index 074f045138a9e77132ad451918dd346e7be4fba6..fe9ef21b2f08eb12af09a107dfe647b339fd5a45 100644
--- a/src/proto_018_Proxford/lib_client_sapling/dune
+++ b/src/proto_018_Proxford/lib_client_sapling/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-018-Proxford-libs.client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-crypto
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.crypto
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends
   octez-protocol-018-Proxford-libs.client
diff --git a/src/proto_018_Proxford/lib_dac_plugin/dune b/src/proto_018_Proxford/lib_dac_plugin/dune
index 7a4ff987954bc0b9a86b1ff708a53e677d4a60e1..ded1d87d6d7c5be19e6947d3b1d5c2f5db946e73 100644
--- a/src/proto_018_Proxford/lib_dac_plugin/dune
+++ b/src/proto_018_Proxford/lib_dac_plugin/dune
@@ -6,9 +6,9 @@
  (public_name octez-protocol-018-Proxford-libs.dac)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-compiler.registerer
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   tezos-dac-lib
   tezos-dac-client-lib
   octez-protocol-018-Proxford-libs.client
diff --git a/src/proto_018_Proxford/lib_dac_plugin/test/dune b/src/proto_018_Proxford/lib_dac_plugin/test/dune
index 128d320cffa48f7562e3c5b15813661c6866033d..39c0dc7929e626cc4b718c8264a8f9f9ea5fde64 100644
--- a/src/proto_018_Proxford/lib_dac_plugin/test/dune
+++ b/src/proto_018_Proxford/lib_dac_plugin/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-018-Proxford-libs.dac
   tezos-protocol-018-Proxford.protocol
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-018-Proxford-libs.test-helpers
   tezos-dac-lib
   tezos_dac_node_lib
diff --git a/src/proto_018_Proxford/lib_dal/dune b/src/proto_018_Proxford/lib_dal/dune
index 0ca68b518f963017bbe8af254b80383c0d23d1a9..eb98552288df098113ff83ede8f800292b825945 100644
--- a/src/proto_018_Proxford/lib_dal/dune
+++ b/src/proto_018_Proxford/lib_dal/dune
@@ -6,9 +6,9 @@
  (public_name octez-protocol-018-Proxford-libs.dal)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-compiler.registerer
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   tezos-dal-node-lib
   octez-protocol-018-Proxford-libs.client
   octez-protocol-018-Proxford-libs.plugin
diff --git a/src/proto_018_Proxford/lib_dal/test/dune b/src/proto_018_Proxford/lib_dal/test/dune
index 5488983cc211aebe355c0dfff444301a17250285..af23d1979a7474779de04080f9c052b9dfafca71 100644
--- a/src/proto_018_Proxford/lib_dal/test/dune
+++ b/src/proto_018_Proxford/lib_dal/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-018-Proxford-libs.dal
   tezos-protocol-018-Proxford.protocol
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-018-Proxford-libs.test-helpers
   octez-alcotezt)
  (library_flags (:standard -linkall))
diff --git a/src/proto_018_Proxford/lib_delegate/dune b/src/proto_018_Proxford/lib_delegate/dune
index 1c0fb116e508d9c561cf7fe97210cb37470f4e80..3dd87d3ed9b0b7a0bd056404ebbc782392af4176 100644
--- a/src/proto_018_Proxford/lib_delegate/dune
+++ b/src/proto_018_Proxford/lib_delegate/dune
@@ -6,9 +6,9 @@
  (public_name octez-protocol-018-Proxford-libs.baking)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  tezos-version.value
+  octez-libs.base
+  octez-libs.clic
+  octez-version.value
   tezos-protocol-018-Proxford.protocol
   tezos-protocol-018-Proxford.protocol.lifted
   octez-protocol-018-Proxford-libs.plugin
@@ -17,15 +17,15 @@
   octez-shell-libs.client-base
   octez-protocol-018-Proxford-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib
+  octez-libs.stdlib-unix
   octez-shell-libs.shell-context
   octez-libs.tezos-context
   octez-libs.tezos-context.memory
-  octez-libs.tezos-rpc-http-client-unix
+  octez-libs.rpc-http-client-unix
   octez-shell-libs.context-ops
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http
+  octez-libs.rpc
+  octez-libs.rpc-http
   tezos-dal-node-services
   lwt-canceler
   lwt-exit
@@ -55,17 +55,17 @@
  (public_name octez-protocol-018-Proxford-libs.baking-commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   tezos-protocol-018-Proxford.parameters
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-018-Proxford-libs.client
   octez-shell-libs.client-commands
   octez-protocol-018-Proxford-libs.baking
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -87,7 +87,7 @@
  (public_name octez-protocol-018-Proxford-libs.baking-commands.registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -96,7 +96,7 @@
   octez-shell-libs.client-commands
   octez-protocol-018-Proxford-libs.baking
   octez-protocol-018-Proxford-libs.baking-commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_018_Proxford/lib_delegate/test/dune b/src/proto_018_Proxford/lib_delegate/test/dune
index f00f55bed7a7c75f03b932158bbf3aa8cc35e13e..9592462fe11f1cbf874aec412cc28a62321c47f2 100644
--- a/src/proto_018_Proxford/lib_delegate/test/dune
+++ b/src/proto_018_Proxford/lib_delegate/test/dune
@@ -6,15 +6,15 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   octez-protocol-018-Proxford-libs.client
   tezos-protocol-018-Proxford.protocol
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-018-Proxford-libs.bakings.mockup-simulator
   octez-protocol-018-Proxford-libs.baking
   tezos-protocol-018-Proxford.parameters
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   octez-alcotezt
   uri)
  (library_flags (:standard -linkall))
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 a5839f39619e52f8c4ddf9346d4e5ecc76a54879..1c5fa661b8b550169bb1152e3a260ac750e03d69 100644
--- a/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune
@@ -5,12 +5,12 @@
  (name tezos_018_Proxford_mockup_simulator)
  (public_name octez-protocol-018-Proxford-libs.bakings.mockup-simulator)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.client
   octez-shell-libs.client-commands
   octez-protocol-018-Proxford-libs.baking
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base-unix
   tezos-protocol-018-Proxford.parameters
   octez-shell-libs.mockup
diff --git a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune
index 47f7fb326a82b6e2d68a9cc339a92105772cf8c5..fd56861d0e8f9dd3151c84fedb52acf6fe8d5bc2 100644
--- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune
+++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune
@@ -4,7 +4,7 @@
 (executable
  (name tenderbrute_main)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.client-base
   octez-protocol-018-Proxford-libs.client
   tezos-protocol-018-Proxford.protocol
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 b6a6b6de4123003b0e9896af83819fd13f522af6..ec43497d8aaa04e3750448d335e6519b92064c9c 100644
--- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune
+++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-018-Proxford-libs.baking.tenderbrute)
  (libraries
   data-encoding
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   tezos-protocol-018-Proxford.protocol
   octez-shell-libs.client-base
   octez-protocol-018-Proxford-libs.client)
diff --git a/src/proto_018_Proxford/lib_layer2_utils/dune b/src/proto_018_Proxford/lib_layer2_utils/dune
index f34528937a239568fd8865406fba0f10cd943780..7e3c36c244bc647d62e922dcfdc0efcbae989ec8 100644
--- a/src/proto_018_Proxford/lib_layer2_utils/dune
+++ b/src/proto_018_Proxford/lib_layer2_utils/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-018-Proxford-libs.layer2-utils)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.client)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_018_Proxford/lib_parameters/dune b/src/proto_018_Proxford/lib_parameters/dune
index b2bf8a963a6984d05e438144c8ca1af1f54be22c..0d0b29f3cab63235c8376037d3139ad721c34f9f 100644
--- a/src/proto_018_Proxford/lib_parameters/dune
+++ b/src/proto_018_Proxford/lib_parameters/dune
@@ -6,7 +6,7 @@
  (public_name tezos-protocol-018-Proxford.parameters)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment
   tezos-protocol-018-Proxford.protocol)
  (library_flags (:standard -linkall))
@@ -19,7 +19,7 @@
 (executable
  (name gen)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.parameters
   tezos-protocol-018-Proxford.protocol)
  (link_flags
diff --git a/src/proto_018_Proxford/lib_plugin/dune b/src/proto_018_Proxford/lib_plugin/dune
index 4fd45199f2d6189f24f726882958faff6de18c9b..30da5983b8ccf9cf0b5f451820ebfef3a4a1e996 100644
--- a/src/proto_018_Proxford/lib_plugin/dune
+++ b/src/proto_018_Proxford/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-018-Proxford-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.smart-rollup)
  (flags
@@ -24,7 +24,7 @@
  (public_name octez-protocol-018-Proxford-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.embedded-protocol
   octez-protocol-018-Proxford-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_018_Proxford/lib_plugin/test/dune b/src/proto_018_Proxford/lib_plugin/test/dune
index 8ff3303f45f3f787d9a844c2864f796709bc0f2a..886f3c54156f6035640223e982c23505d4819b5b 100644
--- a/src/proto_018_Proxford/lib_plugin/test/dune
+++ b/src/proto_018_Proxford/lib_plugin/test/dune
@@ -6,14 +6,14 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base-test-helpers
+  octez-libs.base.unix
   octez-alcotezt
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-micheline
+  octez-libs.stdlib-unix
+  octez-libs.micheline
   octez-protocol-018-Proxford-libs.plugin
   tezos-protocol-018-Proxford.protocol
   tezos-protocol-018-Proxford.parameters
diff --git a/src/proto_018_Proxford/lib_protocol/test/helpers/dune b/src/proto_018_Proxford/lib_protocol/test/helpers/dune
index 31e99148acc62dbbeca4623265cac75cf0a14062..729f3cf127e8fbb51bcdb7dd3a7c39c978b73bb2 100644
--- a/src/proto_018_Proxford/lib_protocol/test/helpers/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/helpers/dune
@@ -7,18 +7,18 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   qcheck-alcotest
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
-  octez-libs.tezos-stdlib-unix
+  octez-libs.test-helpers
+  octez-libs.base
+  octez-libs.micheline
+  octez-libs.stdlib-unix
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.client
   tezos-protocol-018-Proxford.parameters
   octez-proto-libs.protocol-environment
   octez-protocol-018-Proxford-libs.plugin
   octez-shell-libs.shell-services
-  octez-libs.octez-plompiler
-  octez-libs.tezos-crypto-dal
+  octez-libs.plompiler
+  octez-libs.crypto-dal
   octez-protocol-018-Proxford-libs.smart-rollup)
  (flags
   (:standard)
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 e12c18bb6b7275f49b30e0f317c7ff599f7e0873..b10afc56f17c000d5a70eadfb7add14c0bb42744 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune
@@ -8,10 +8,10 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   tezos-protocol-018-Proxford.parameters
   octez-protocol-018-Proxford-libs.plugin)
  (library_flags (:standard -linkall))
diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/dune b/src/proto_018_Proxford/lib_protocol/test/integration/dune
index f1b6cec7d0448b1ff9ebbe7932cc5306cc791047..893747e0eed4b0fd8a8f16442282aef5577300af 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/dune
@@ -9,12 +9,12 @@
   tezt
   octez-libs.tezos-context
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-018-Proxford-libs.client
   tezos-protocol-018-Proxford.protocol
   tezos-protocol-018-Proxford.parameters
   octez-protocol-018-Proxford-libs.test-helpers
-  octez-libs.tezos-base-test-helpers)
+  octez-libs.base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
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 7c2bff8f7485e174a1bca528d5b3db93aca70ba7..7472d111a54878f02ea5b5b545a59fcb73d1f18a 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune
@@ -7,10 +7,10 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.test-helpers
-  octez-libs.tezos-base-test-helpers)
+  octez-libs.base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
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 de9bc19978270a81044c177d2017c48da68c6cae..011943b5517495e3ec6c109651bd975b03c81cf8 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune
@@ -8,13 +8,13 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-018-Proxford-libs.client
   tezos-benchmark
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   tezos-benchmark-018-Proxford
   tezos-benchmark-type-inference-018-Proxford
   octez-protocol-018-Proxford-libs.plugin
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 14f25b567add6e7a002f64c925294ab7f7911149..7043c95dd70eee8fd3ab4084de2a943e43430a73 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune
@@ -8,11 +8,11 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.client
   octez-protocol-018-Proxford-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-018-Proxford-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
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 bd54ce916f8351580b7f18711d7a76177d85475a..515d3a51b6503e930ad5c88ddce354b7c14e4a61 100644
--- a/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune
@@ -7,13 +7,13 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   qcheck-alcotest
   octez-protocol-018-Proxford-libs.client
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-018-Proxford-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-018-Proxford-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_018_Proxford/lib_protocol/test/pbt/dune b/src/proto_018_Proxford/lib_protocol/test/pbt/dune
index 0f1c9c9fe2711743707aa9be4bb1e86163a3fed0..e9b47600f1624085cb2e9ea26d2c47b86697a576 100644
--- a/src/proto_018_Proxford/lib_protocol/test/pbt/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/pbt/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   octez-protocol-018-Proxford-libs.client
   tezos-protocol-018-Proxford.protocol
   octez-libs.tezos-context.merkle_proof_encoding
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-018-Proxford-libs.test-helpers
   octez-alcotezt
   qcheck-alcotest
@@ -19,8 +19,8 @@
   tezos-benchmark-018-Proxford
   tezos-benchmark-type-inference-018-Proxford
   octez-protocol-018-Proxford-libs.smart-rollup
-  octez-libs.tezos-crypto-dal
-  octez-libs.tezos-base-test-helpers
+  octez-libs.crypto-dal
+  octez-libs.base-test-helpers
   tezos-protocol-018-Proxford.parameters)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_018_Proxford/lib_protocol/test/regression/dune b/src/proto_018_Proxford/lib_protocol/test/regression/dune
index 8cb50084545d004340f7a0ae7186b772c7a57f22..71310e28f083f44f1005e78601c4561f9ecc3f01 100644
--- a/src/proto_018_Proxford/lib_protocol/test/regression/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/regression/dune
@@ -6,13 +6,13 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   tezt-tezos
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.client
   octez-protocol-018-Proxford-libs.plugin
   octez-protocol-018-Proxford-libs.test-helpers
-  octez-libs.tezos-micheline)
+  octez-libs.micheline)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_018_Proxford/lib_protocol/test/unit/dune b/src/proto_018_Proxford/lib_protocol/test/unit/dune
index bc55798fe2d05229493c054e2db71246f4447761..6c23b6e365eadf1c0dd7ad7633ab8e3fc0e9b8f7 100644
--- a/src/proto_018_Proxford/lib_protocol/test/unit/dune
+++ b/src/proto_018_Proxford/lib_protocol/test/unit/dune
@@ -6,21 +6,21 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.base-test-helpers
+  octez-libs.micheline
   octez-protocol-018-Proxford-libs.client
   octez-shell-libs.client-base
   tezos-protocol-018-Proxford.parameters
   octez-proto-libs.protocol-environment
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   tezos-protocol-018-Proxford.protocol
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-018-Proxford-libs.test-helpers
   octez-alcotezt
   octez-l2-libs.scoru-wasm-helpers
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto-dal
+  octez-libs.stdlib
+  octez-libs.crypto-dal
   octez-l2-libs.scoru-wasm
   octez-l2-libs.webassembly-interpreter-extra)
  (library_flags (:standard -linkall))
diff --git a/src/proto_018_Proxford/lib_sc_rollup/dune b/src/proto_018_Proxford/lib_sc_rollup/dune
index 9004fa547921125e804f810ba7ec23f481f86ac4..e44a1e478851fa0212036baa543f0f8c7a0816fc 100644
--- a/src/proto_018_Proxford/lib_sc_rollup/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-018-Proxford-libs.smart-rollup)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_018_Proxford/lib_sc_rollup_client/dune b/src/proto_018_Proxford/lib_sc_rollup_client/dune
index 738f64ea15209351ab1a263fcd617c1b9dc12097..f32627ccc370982c99153fc09bcbf53a9c8bfc2d 100644
--- a/src/proto_018_Proxford/lib_sc_rollup_client/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup_client/dune
@@ -6,7 +6,7 @@
  (package octez-smart-rollup-client-Proxford)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   octez-shell-libs.client-commands
   octez-shell-libs.client-base
diff --git a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune
index 1226c858663e0b5d1490b821af54a8b073968b36..c2c79c69254f03577fa8951841e60355bfbba5f2 100644
--- a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-018-Proxford-libs.smart-rollup-layer2)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   octez-injector
   octez-l2-libs.smart-rollup)
diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/dune b/src/proto_018_Proxford/lib_sc_rollup_node/dune
index 145d06f525fae690677aca0a874923f1d7bca0a7..7f898100113c345c2f18c51b7be1658951e2d6dd 100644
--- a/src/proto_018_Proxford/lib_sc_rollup_node/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup_node/dune
@@ -6,8 +6,8 @@
  (package octez-smart-rollup-node-Proxford)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
   octez-protocol-018-Proxford-libs.client
@@ -16,9 +16,9 @@
   tezos-protocol-018-Proxford.protocol
   octez-protocol-018-Proxford-libs.plugin
   tezos-protocol-018-Proxford.parameters
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-server
+  octez-libs.rpc
+  octez-libs.rpc-http
+  octez-libs.rpc-http-server
   octez-libs.tezos-workers
   tezos-dal-node-services
   tezos-dal-node-lib
@@ -32,7 +32,7 @@
   octez-protocol-018-Proxford-libs.layer2-utils
   octez-l2-libs.layer2_store
   octez-crawler
-  octez-libs.tezos-tree-encoding
+  octez-libs.tree-encoding
   data-encoding
   irmin-pack
   irmin-pack.unix
@@ -43,8 +43,8 @@
   octez-smart-rollup-node-lib
   octez-l2-libs.scoru-wasm
   octez-l2-libs.scoru-wasm-fast
-  octez-libs.tezos-crypto-dal
-  tezos-version.value)
+  octez-libs.crypto-dal
+  octez-version.value)
  (flags
   (:standard)
   -open Tezos_base
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 4bf5fbaf39e5c348e14c9b65dd9de374d3a06ee8..f70ef478ef8a07b69f0a4985e982663b086dc204 100644
--- a/src/proto_018_Proxford/lib_sc_rollup_node/test/dune
+++ b/src/proto_018_Proxford/lib_sc_rollup_node/test/dune
@@ -6,9 +6,9 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-018-Proxford-libs.smart-rollup-layer2
   octez_smart_rollup_node_Proxford
   octez-alcotezt
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 e3d43c108b50b8f066dc932995c4e326dbd8822d..19d29f9b9e638d2cb0acdad7c7cfc37a229d4f09 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
@@ -6,11 +6,11 @@
  (package tezos-sc-rollup-node-test)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-018-Proxford.protocol
   tezos-protocol-018-Proxford.parameters
   octez-protocol-018-Proxford-libs.client
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
   qcheck-core
   logs.lwt
diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune
index be67e2e1a50cd27dae35bd193c60d49fae0a0d7d..b6adb507effd4b81f575559abe7e62a743723391 100644
--- a/src/proto_alpha/bin_accuser/dune
+++ b/src/proto_alpha/bin_accuser/dune
@@ -7,13 +7,13 @@
  (package octez-accuser-alpha)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.client
   octez-shell-libs.client-commands
   octez-protocol-alpha-libs.baking-commands
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base-unix)
  (link_flags
   (:standard)
diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune
index 42dd08f00edcfabaa6afd495b0d8fcfd6ddbfdde..2dbb38c7985f8f72e2ad67d7d008cd55c694f792 100644
--- a/src/proto_alpha/bin_baker/dune
+++ b/src/proto_alpha/bin_baker/dune
@@ -7,13 +7,13 @@
  (package octez-baker-alpha)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.client
   octez-shell-libs.client-commands
   octez-protocol-alpha-libs.baking-commands
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base-unix)
  (link_flags
   (:standard)
diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune
index 655570786ebe6838ac7a360c5596ced18930d939..032c031ef3376aea280ce8b1009b9893f7db4f8d 100644
--- a/src/proto_alpha/bin_sc_rollup_client/dune
+++ b/src/proto_alpha/bin_sc_rollup_client/dune
@@ -7,11 +7,11 @@
  (package octez-smart-rollup-client-alpha)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-alpha.protocol
   octez_smart_rollup_client_alpha
-  tezos-version.value)
+  octez-version.value)
  (link_flags
   (:standard)
   (:include %{workspace_root}/static-link-flags.sexp)
diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune
index 4101766332f89e6ae82ad0e663a87bfb420d9a38..55d58ea9bf8669db9f459d93947caf1e8696696d 100644
--- a/src/proto_alpha/bin_sc_rollup_node/dune
+++ b/src/proto_alpha/bin_sc_rollup_node/dune
@@ -7,8 +7,8 @@
  (package octez-smart-rollup-node-alpha)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-alpha.protocol
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
diff --git a/src/proto_alpha/lib_benchmark/dune b/src/proto_alpha/lib_benchmark/dune
index 71f458abdf4add56e2fcce160ff83be2034d795a..779055963c12dd625e0d858a35a7cadd6002dff6 100644
--- a/src/proto_alpha/lib_benchmark/dune
+++ b/src/proto_alpha/lib_benchmark/dune
@@ -5,15 +5,15 @@
  (name tezos_benchmark_alpha)
  (public_name tezos-benchmark-alpha)
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-base
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-micheline
+  octez-libs.stdlib
+  octez-libs.base
+  octez-libs.error-monad
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-benchmark
   tezos-benchmark-type-inference-alpha
   tezos-protocol-alpha.protocol
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   tezos-protocol-alpha.parameters
   hashcons
   octez-protocol-alpha-libs.test-helpers
diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune
index b52bc76ca32a19eaf842c9ea8db9c721a58a3b8a..08a40ecc2f8570c564c4f03b171ff2c1a691cfc6 100644
--- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune
+++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune
@@ -6,10 +6,10 @@
  (public_name tezos-benchmark-type-inference-alpha)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-error-monad
-  octez-libs.tezos-crypto
-  octez-libs.tezos-micheline
+  octez-libs.stdlib
+  octez-libs.error-monad
+  octez-libs.crypto
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-protocol-alpha.protocol
   hashcons)
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 153e2d2b196cbd59b5eebff33b4ddaccf1483d24..72649aa125497b86c4b6b808aae110674ea80733 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
@@ -4,11 +4,11 @@
 (executables
  (names test_uf test_inference)
  (libraries
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-benchmark-type-inference-alpha
   tezos-protocol-alpha.protocol
-  octez-libs.tezos-error-monad
+  octez-libs.error-monad
   octez-protocol-alpha-libs.client)
  (link_flags
   (:standard)
diff --git a/src/proto_alpha/lib_benchmark/test/dune b/src/proto_alpha/lib_benchmark/test/dune
index 34a15eae98bf8f0d60f277f73bc44e6ac22025dd..43bedd84fd399d9b3701f6a89499d4ff731cd071 100644
--- a/src/proto_alpha/lib_benchmark/test/dune
+++ b/src/proto_alpha/lib_benchmark/test/dune
@@ -8,15 +8,15 @@
   test_autocompletion
   test_distribution)
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   tezos-micheline-rewriting
   tezos-protocol-alpha.protocol
   tezos-benchmark
   tezos-benchmark-type-inference-alpha
   tezos-benchmark-alpha
   octez-protocol-alpha-libs.test-helpers
-  octez-libs.tezos-error-monad
+  octez-libs.error-monad
   prbnmcn-stats)
  (link_flags
   (:standard)
diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune
index 04b3f1db3b88ce47f1a6fda873b5023f5ff7fabd..885a8c32c538771e467d073011cd004b27ff288b 100644
--- a/src/proto_alpha/lib_benchmarks_proto/dune
+++ b/src/proto_alpha/lib_benchmarks_proto/dune
@@ -7,18 +7,18 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   str
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-base
-  octez-libs.tezos-error-monad
+  octez-libs.stdlib
+  octez-libs.base
+  octez-libs.error-monad
   tezos-protocol-alpha.parameters
-  octez-libs.tezos-lazy-containers
+  octez-libs.lazy-containers
   tezos-benchmark
   tezos-benchmark-alpha
   tezos-benchmark-type-inference-alpha
   tezos-protocol-alpha.protocol
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   octez-shell-libs.shell-benchmarks
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   octez-protocol-alpha-libs.test-helpers
   octez-libs.tezos-sapling
   octez-protocol-alpha-libs.client
diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune
index 325299dc1f24ccd9f1fb9787c64351b376f1c1f2..d0e32ae4fd90065a57fc47441b93d8023428a67e 100644
--- a/src/proto_alpha/lib_client/dune
+++ b/src/proto_alpha/lib_client/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-alpha-libs.client)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   tezos-protocol-alpha.protocol
@@ -17,7 +17,7 @@
   octez-shell-libs.signer-backends
   octez-protocol-alpha-libs.plugin
   tezos-protocol-alpha.parameters
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-alpha-libs.smart-rollup
   uri)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_alpha/lib_client/test/dune b/src/proto_alpha/lib_client/test/dune
index b6380f653cb987f73b66b399a21b12128aeaf077..2cfc5ddf053c9f4092a36fb4e4b18fa0ad970c77 100644
--- a/src/proto_alpha/lib_client/test/dune
+++ b/src/proto_alpha/lib_client/test/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   octez-protocol-alpha-libs.client
   tezos-protocol-alpha.protocol
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-test-helpers
+  octez-libs.base-test-helpers
+  octez-libs.test-helpers
   octez-alcotezt
   qcheck-alcotest)
  (library_flags (:standard -linkall))
diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune
index 35e4c2b6a863b1d37412e12c58ad31878a4d59a5..726fbd533057baccdf1c98aa7d78a2a518934f78 100644
--- a/src/proto_alpha/lib_client_commands/dune
+++ b/src/proto_alpha/lib_client_commands/dune
@@ -6,11 +6,11 @@
  (public_name octez-protocol-alpha-libs.client.commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-alpha.protocol
   tezos-protocol-alpha.parameters
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.mockup
@@ -19,7 +19,7 @@
   octez-shell-libs.client-base
   octez-protocol-alpha-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-shell-libs.client-base-unix
   octez-protocol-alpha-libs.plugin
   uri)
@@ -43,8 +43,8 @@
  (public_name octez-protocol-alpha-libs.client.commands-registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
+  octez-libs.base
+  octez-libs.clic
   tezos-protocol-alpha.protocol
   tezos-protocol-alpha.parameters
   octez-proto-libs.protocol-environment
@@ -54,7 +54,7 @@
   octez-shell-libs.client-commands
   octez-protocol-alpha-libs.client.commands
   octez-protocol-alpha-libs.client.sapling
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   octez-protocol-alpha-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune
index 075deba871eaa507ae1e8160e101220877f97d64..bd7bbeb53eaa62cc128abd1443257127df04361c 100644
--- a/src/proto_alpha/lib_client_sapling/dune
+++ b/src/proto_alpha/lib_client_sapling/dune
@@ -6,10 +6,10 @@
  (public_name octez-protocol-alpha-libs.client.sapling)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  octez-libs.tezos-crypto
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.clic
+  octez-libs.crypto
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.signer-backends
   octez-protocol-alpha-libs.client
diff --git a/src/proto_alpha/lib_dac_plugin/dune b/src/proto_alpha/lib_dac_plugin/dune
index 4cff67786069f8ae1425193a1166f6edab56145b..e2e669d4b71660af8e8a759933c8cd69292eb764 100644
--- a/src/proto_alpha/lib_dac_plugin/dune
+++ b/src/proto_alpha/lib_dac_plugin/dune
@@ -6,9 +6,9 @@
  (public_name octez-protocol-alpha-libs.dac)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-compiler.registerer
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   tezos-dac-lib
   tezos-dac-client-lib
   octez-protocol-alpha-libs.client
diff --git a/src/proto_alpha/lib_dac_plugin/test/dune b/src/proto_alpha/lib_dac_plugin/test/dune
index 312ca91315bd69cce3483d96a798631bee6820cb..291f31ef78f8dc301cf69bc7aedca93a6f08b99f 100644
--- a/src/proto_alpha/lib_dac_plugin/test/dune
+++ b/src/proto_alpha/lib_dac_plugin/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-alpha-libs.dac
   tezos-protocol-alpha.protocol
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-alpha-libs.test-helpers
   tezos-dac-lib
   tezos_dac_node_lib
diff --git a/src/proto_alpha/lib_dal/dune b/src/proto_alpha/lib_dal/dune
index 070daac7096f0fca8e5970716e4e08a49805d257..11bf919a9d5f0391429096dd4d679530d7f64427 100644
--- a/src/proto_alpha/lib_dal/dune
+++ b/src/proto_alpha/lib_dal/dune
@@ -6,9 +6,9 @@
  (public_name octez-protocol-alpha-libs.dal)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-compiler.registerer
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   tezos-dal-node-lib
   octez-protocol-alpha-libs.client
   octez-protocol-alpha-libs.plugin
diff --git a/src/proto_alpha/lib_dal/test/dune b/src/proto_alpha/lib_dal/test/dune
index b517412caaed0ba6da84a124452dedefd1688954..3465ab5f9c7eaca84940a7f906544af52607d89d 100644
--- a/src/proto_alpha/lib_dal/test/dune
+++ b/src/proto_alpha/lib_dal/test/dune
@@ -6,10 +6,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-alpha-libs.dal
   tezos-protocol-alpha.protocol
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-alpha-libs.test-helpers
   octez-alcotezt)
  (library_flags (:standard -linkall))
diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune
index ce6ab2f3d80081ca46c710c4bb20e393d67b32d0..173d3a537cc9c30217aeb916644d30b248d0cc13 100644
--- a/src/proto_alpha/lib_delegate/dune
+++ b/src/proto_alpha/lib_delegate/dune
@@ -6,9 +6,9 @@
  (public_name octez-protocol-alpha-libs.baking)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-clic
-  tezos-version.value
+  octez-libs.base
+  octez-libs.clic
+  octez-version.value
   tezos-protocol-alpha.protocol
   tezos-protocol-alpha.protocol.lifted
   octez-protocol-alpha-libs.plugin
@@ -17,15 +17,15 @@
   octez-shell-libs.client-base
   octez-protocol-alpha-libs.client
   octez-shell-libs.client-commands
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib
+  octez-libs.stdlib-unix
   octez-shell-libs.shell-context
   octez-libs.tezos-context
   octez-libs.tezos-context.memory
-  octez-libs.tezos-rpc-http-client-unix
+  octez-libs.rpc-http-client-unix
   octez-shell-libs.context-ops
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http
+  octez-libs.rpc
+  octez-libs.rpc-http
   tezos-dal-node-services
   lwt-canceler
   lwt-exit
@@ -55,17 +55,17 @@
  (public_name octez-protocol-alpha-libs.baking-commands)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   tezos-protocol-alpha.parameters
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-protocol-alpha-libs.client
   octez-shell-libs.client-commands
   octez-protocol-alpha-libs.baking
-  octez-libs.tezos-rpc
+  octez-libs.rpc
   uri)
  (library_flags (:standard -linkall))
  (flags
@@ -87,7 +87,7 @@
  (public_name octez-protocol-alpha-libs.baking-commands.registration)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez-proto-libs.protocol-environment
   octez-shell-libs.shell-services
@@ -96,7 +96,7 @@
   octez-shell-libs.client-commands
   octez-protocol-alpha-libs.baking
   octez-protocol-alpha-libs.baking-commands
-  octez-libs.tezos-rpc)
+  octez-libs.rpc)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune
index 1db8ec49b87f6cabc18965ab7ee113c48fa3a25f..b3e26a7ee53decc608aa5d4bb3e4bd480d7f01e8 100644
--- a/src/proto_alpha/lib_delegate/test/dune
+++ b/src/proto_alpha/lib_delegate/test/dune
@@ -6,15 +6,15 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   octez-protocol-alpha-libs.client
   tezos-protocol-alpha.protocol
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-alpha-libs.bakings.mockup-simulator
   octez-protocol-alpha-libs.baking
   tezos-protocol-alpha.parameters
-  octez-libs.tezos-crypto
+  octez-libs.crypto
   octez-alcotezt
   uri)
  (library_flags (:standard -linkall))
diff --git a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
index 235c8648dcb9cc06798f7bfa30ebd86b99af582a..38debd56560b8bfc8e9ad022d4ca4c90838beabb 100644
--- a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
@@ -5,12 +5,12 @@
  (name tezos_alpha_mockup_simulator)
  (public_name octez-protocol-alpha-libs.bakings.mockup-simulator)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.client
   octez-shell-libs.client-commands
   octez-protocol-alpha-libs.baking
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base-unix
   tezos-protocol-alpha.parameters
   octez-shell-libs.mockup
diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune
index 9108138ca980d6f846e43c6a6055d1a909c7418e..2209135c60978eeb726b3e758e0e773826a3515a 100644
--- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune
+++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune
@@ -4,7 +4,7 @@
 (executable
  (name tenderbrute_main)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.client-base
   octez-protocol-alpha-libs.client
   tezos-protocol-alpha.protocol
diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune
index 68e7c297e72573526780a5ef3b62931734a9a62e..f2790a68555d09912f31e6ee01d32d880afb1818 100644
--- a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune
+++ b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune
@@ -6,8 +6,8 @@
  (public_name octez-protocol-alpha-libs.baking.tenderbrute)
  (libraries
   data-encoding
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base.unix
   tezos-protocol-alpha.protocol
   octez-shell-libs.client-base
   octez-protocol-alpha-libs.client)
diff --git a/src/proto_alpha/lib_layer2_utils/dune b/src/proto_alpha/lib_layer2_utils/dune
index 486b5a32ddf7c0562d716d6c9758f5ef26d11b66..ada5df3d6d20da5b76bdcac057019e7aba93539b 100644
--- a/src/proto_alpha/lib_layer2_utils/dune
+++ b/src/proto_alpha/lib_layer2_utils/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-alpha-libs.layer2-utils)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.client)
  (inline_tests (flags -verbose) (modes native))
diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune
index ec15c6c28fd826f54f803dba6a925aa9d603f1f1..2ad55ddb06ff592f13b9be8fcf505c4c9b1dd84c 100644
--- a/src/proto_alpha/lib_parameters/dune
+++ b/src/proto_alpha/lib_parameters/dune
@@ -6,7 +6,7 @@
  (public_name tezos-protocol-alpha.parameters)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-proto-libs.protocol-environment
   tezos-protocol-alpha.protocol)
  (library_flags (:standard -linkall))
@@ -19,7 +19,7 @@
 (executable
  (name gen)
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.parameters
   tezos-protocol-alpha.protocol)
  (link_flags
diff --git a/src/proto_alpha/lib_plugin/dune b/src/proto_alpha/lib_plugin/dune
index acecc2c26e1411e2cdc652d4be2d1c11dda92d02..cbff20feaaec4d72fd3bbe745e0ea15f73668050 100644
--- a/src/proto_alpha/lib_plugin/dune
+++ b/src/proto_alpha/lib_plugin/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-alpha-libs.plugin)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.smart-rollup)
  (flags
@@ -24,7 +24,7 @@
  (public_name octez-protocol-alpha-libs.plugin-registerer)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.embedded-protocol
   octez-protocol-alpha-libs.plugin
   octez-shell-libs.validation)
diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune
index 8b0fa126c93cb50ed4358dfba18e98d8aab7bda1..28ee77b1c053118bb7b899f31f1fa9e76f5d776b 100644
--- a/src/proto_alpha/lib_plugin/test/dune
+++ b/src/proto_alpha/lib_plugin/test/dune
@@ -6,14 +6,14 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-base.unix
+  octez-libs.base
+  octez-libs.base-test-helpers
+  octez-libs.base.unix
   octez-alcotezt
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
-  octez-libs.tezos-stdlib-unix
-  octez-libs.tezos-micheline
+  octez-libs.stdlib-unix
+  octez-libs.micheline
   octez-protocol-alpha-libs.plugin
   tezos-protocol-alpha.protocol
   tezos-protocol-alpha.parameters
diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune
index 6b0a294e450e5f27dbce8f7e19a4b7246f17947d..16c985ec52759f994a8136a2029e7795a8ca94ca 100644
--- a/src/proto_alpha/lib_protocol/test/helpers/dune
+++ b/src/proto_alpha/lib_protocol/test/helpers/dune
@@ -7,18 +7,18 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   qcheck-alcotest
-  octez-libs.tezos-test-helpers
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
-  octez-libs.tezos-stdlib-unix
+  octez-libs.test-helpers
+  octez-libs.base
+  octez-libs.micheline
+  octez-libs.stdlib-unix
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.client
   tezos-protocol-alpha.parameters
   octez-proto-libs.protocol-environment
   octez-protocol-alpha-libs.plugin
   octez-shell-libs.shell-services
-  octez-libs.octez-plompiler
-  octez-libs.tezos-crypto-dal
+  octez-libs.plompiler
+  octez-libs.crypto-dal
   octez-protocol-alpha-libs.smart-rollup)
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/dune b/src/proto_alpha/lib_protocol/test/integration/consensus/dune
index e0feec1ebba533761ed62c6ff0aa1af6e9879c04..58cb3de865e33082a6817d48a3444b46f2e7c0c4 100644
--- a/src/proto_alpha/lib_protocol/test/integration/consensus/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/consensus/dune
@@ -7,10 +7,10 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   tezos-protocol-alpha.parameters
   octez-protocol-alpha-libs.plugin)
  (library_flags (:standard -linkall))
diff --git a/src/proto_alpha/lib_protocol/test/integration/dune b/src/proto_alpha/lib_protocol/test/integration/dune
index 770e4bf8c21575bfe068906a6e4e104123e38398..4aabd1ffd5ebca0e6ae161e49ef6275f8431172d 100644
--- a/src/proto_alpha/lib_protocol/test/integration/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/dune
@@ -9,12 +9,12 @@
   tezt
   octez-libs.tezos-context
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   octez-protocol-alpha-libs.client
   tezos-protocol-alpha.protocol
   tezos-protocol-alpha.parameters
   octez-protocol-alpha-libs.test-helpers
-  octez-libs.tezos-base-test-helpers)
+  octez-libs.base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_protocol/test/integration/gas/dune b/src/proto_alpha/lib_protocol/test/integration/gas/dune
index 9b686ce48dfd1ffa5345ded945ea6e27bd190447..c31ea7ea48622e468b2a2545b7187161e998cccd 100644
--- a/src/proto_alpha/lib_protocol/test/integration/gas/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/gas/dune
@@ -7,10 +7,10 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.test-helpers
-  octez-libs.tezos-base-test-helpers)
+  octez-libs.base-test-helpers)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/dune b/src/proto_alpha/lib_protocol/test/integration/michelson/dune
index db4e951bc257b1d30a66e62d1220184135ad687e..e30eacc1c5204e9c348ccbd9ef32c6c74a44382b 100644
--- a/src/proto_alpha/lib_protocol/test/integration/michelson/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/michelson/dune
@@ -7,13 +7,13 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-alpha-libs.client
   tezos-benchmark
-  octez-libs.tezos-micheline
+  octez-libs.micheline
   tezos-benchmark-alpha
   tezos-benchmark-type-inference-alpha
   octez-protocol-alpha-libs.plugin
diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/dune b/src/proto_alpha/lib_protocol/test/integration/operations/dune
index a55af3331cd1d2ea4ff3cb3df6c8baf14a5aa339..533a21198b9ab28c0e0e779ac515b6d77990b27c 100644
--- a/src/proto_alpha/lib_protocol/test/integration/operations/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/operations/dune
@@ -7,11 +7,11 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.client
   octez-protocol-alpha-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-alpha-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/dune b/src/proto_alpha/lib_protocol/test/integration/validate/dune
index 3699e3394b27a1d4b6dc810b67fbcb87a46448be..9811a7ed551273e80d3a2210a9a2f52189aa64c4 100644
--- a/src/proto_alpha/lib_protocol/test/integration/validate/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/validate/dune
@@ -7,13 +7,13 @@
  (libraries
   tezt.core
   octez-alcotezt
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   qcheck-alcotest
   octez-protocol-alpha-libs.client
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-alpha-libs.test-helpers
-  octez-libs.tezos-base-test-helpers
+  octez-libs.base-test-helpers
   octez-protocol-alpha-libs.plugin)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune
index 3df5b3c9801ed6a64279690ad0b9f4156d2d3be7..777918e0b539fb9967c10d37467a2f48c740a221 100644
--- a/src/proto_alpha/lib_protocol/test/pbt/dune
+++ b/src/proto_alpha/lib_protocol/test/pbt/dune
@@ -6,12 +6,12 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.micheline
   octez-protocol-alpha-libs.client
   tezos-protocol-alpha.protocol
   octez-libs.tezos-context.merkle_proof_encoding
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-alpha-libs.test-helpers
   octez-alcotezt
   qcheck-alcotest
@@ -19,8 +19,8 @@
   tezos-benchmark-alpha
   tezos-benchmark-type-inference-alpha
   octez-protocol-alpha-libs.smart-rollup
-  octez-libs.tezos-crypto-dal
-  octez-libs.tezos-base-test-helpers
+  octez-libs.crypto-dal
+  octez-libs.base-test-helpers
   tezos-protocol-alpha.parameters)
  (library_flags (:standard -linkall))
  (flags
diff --git a/src/proto_alpha/lib_protocol/test/regression/dune b/src/proto_alpha/lib_protocol/test/regression/dune
index 3d52b0e5c521915bd7a7ed6948da3360950a445b..27fe83f719cc3dbf3106e463a9deb868e8fa4116 100644
--- a/src/proto_alpha/lib_protocol/test/regression/dune
+++ b/src/proto_alpha/lib_protocol/test/regression/dune
@@ -6,13 +6,13 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   tezt-tezos
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.client
   octez-protocol-alpha-libs.plugin
   octez-protocol-alpha-libs.test-helpers
-  octez-libs.tezos-micheline)
+  octez-libs.micheline)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune
index f13ae91c8024d7a4aaab32a4ccb3b57f510d118f..4951fe6eb991059d3d8a5412f4c8722ce72d3a80 100644
--- a/src/proto_alpha/lib_protocol/test/unit/dune
+++ b/src/proto_alpha/lib_protocol/test/unit/dune
@@ -6,21 +6,21 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
-  octez-libs.tezos-base-test-helpers
-  octez-libs.tezos-micheline
+  octez-libs.base
+  octez-libs.base-test-helpers
+  octez-libs.micheline
   octez-protocol-alpha-libs.client
   octez-shell-libs.client-base
   tezos-protocol-alpha.parameters
   octez-proto-libs.protocol-environment
-  octez-libs.tezos-stdlib-unix
+  octez-libs.stdlib-unix
   tezos-protocol-alpha.protocol
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-alpha-libs.test-helpers
   octez-alcotezt
   octez-l2-libs.scoru-wasm-helpers
-  octez-libs.tezos-stdlib
-  octez-libs.tezos-crypto-dal
+  octez-libs.stdlib
+  octez-libs.crypto-dal
   octez-l2-libs.scoru-wasm
   octez-l2-libs.webassembly-interpreter-extra)
  (library_flags (:standard -linkall))
diff --git a/src/proto_alpha/lib_sc_rollup/dune b/src/proto_alpha/lib_sc_rollup/dune
index 1abba39af89cae32d9a0b0c396163815d3277ae4..f986ffb86cadb0406b3f5bd13590c232766b94c6 100644
--- a/src/proto_alpha/lib_sc_rollup/dune
+++ b/src/proto_alpha/lib_sc_rollup/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-alpha-libs.smart-rollup)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol)
  (inline_tests (flags -verbose) (modes native))
  (preprocess (pps ppx_expect))
diff --git a/src/proto_alpha/lib_sc_rollup_client/dune b/src/proto_alpha/lib_sc_rollup_client/dune
index 114680db506ab208dc976cd797ed56402c1ecfdb..22f005221e96186ca6e1765a21738787086368ef 100644
--- a/src/proto_alpha/lib_sc_rollup_client/dune
+++ b/src/proto_alpha/lib_sc_rollup_client/dune
@@ -6,7 +6,7 @@
  (package octez-smart-rollup-client-alpha)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez-shell-libs.client-commands
   octez-shell-libs.client-base
diff --git a/src/proto_alpha/lib_sc_rollup_layer2/dune b/src/proto_alpha/lib_sc_rollup_layer2/dune
index 99977729b7c83bcc5fcbd95e2636e90b47a8586c..78c8f142570090f948e155579a897875fa86ab71 100644
--- a/src/proto_alpha/lib_sc_rollup_layer2/dune
+++ b/src/proto_alpha/lib_sc_rollup_layer2/dune
@@ -6,7 +6,7 @@
  (public_name octez-protocol-alpha-libs.smart-rollup-layer2)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   octez-injector
   octez-l2-libs.smart-rollup)
diff --git a/src/proto_alpha/lib_sc_rollup_node/dune b/src/proto_alpha/lib_sc_rollup_node/dune
index 7af730be9c98214974b62bc38f01312e3b747145..513c11edf0c1debfd183ea717881681c36268103 100644
--- a/src/proto_alpha/lib_sc_rollup_node/dune
+++ b/src/proto_alpha/lib_sc_rollup_node/dune
@@ -6,8 +6,8 @@
  (package octez-smart-rollup-node-alpha)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.stdlib-unix
   octez-shell-libs.client-base
   octez-shell-libs.client-base-unix
   octez-protocol-alpha-libs.client
@@ -16,9 +16,9 @@
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.plugin
   tezos-protocol-alpha.parameters
-  octez-libs.tezos-rpc
-  octez-libs.tezos-rpc-http
-  octez-libs.tezos-rpc-http-server
+  octez-libs.rpc
+  octez-libs.rpc-http
+  octez-libs.rpc-http-server
   octez-libs.tezos-workers
   tezos-dal-node-services
   tezos-dal-node-lib
@@ -32,7 +32,7 @@
   octez-protocol-alpha-libs.layer2-utils
   octez-l2-libs.layer2_store
   octez-crawler
-  octez-libs.tezos-tree-encoding
+  octez-libs.tree-encoding
   data-encoding
   irmin-pack
   irmin-pack.unix
@@ -43,8 +43,8 @@
   octez-smart-rollup-node-lib
   octez-l2-libs.scoru-wasm
   octez-l2-libs.scoru-wasm-fast
-  octez-libs.tezos-crypto-dal
-  tezos-version.value)
+  octez-libs.crypto-dal
+  octez-version.value)
  (flags
   (:standard)
   -open Tezos_base
diff --git a/src/proto_alpha/lib_sc_rollup_node/test/dune b/src/proto_alpha/lib_sc_rollup_node/test/dune
index 891e9db845a8c581242ffd889751801cf10ebdae..0546847863bed3d4af7fb1a96e11f78cbca54390 100644
--- a/src/proto_alpha/lib_sc_rollup_node/test/dune
+++ b/src/proto_alpha/lib_sc_rollup_node/test/dune
@@ -6,9 +6,9 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezt.core
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   octez-protocol-alpha-libs.smart-rollup-layer2
   octez_smart_rollup_node_alpha
   octez-alcotezt
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 d65499798a70fc61f661b5120b0442630d465125..4b3453cff6bb27b85c3455e76b599bc35738988d 100644
--- a/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune
+++ b/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune
@@ -6,11 +6,11 @@
  (package tezos-sc-rollup-node-test)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   tezos-protocol-alpha.protocol
   tezos-protocol-alpha.parameters
   octez-protocol-alpha-libs.client
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   qcheck-alcotest
   qcheck-core
   logs.lwt
diff --git a/src/proto_demo_counter/lib_client/dune b/src/proto_demo_counter/lib_client/dune
index 20729f96bb4de96dda2f8c91fb947414f8e09e70..b25adef99a336e249390951d5fe5748d25047a04 100644
--- a/src/proto_demo_counter/lib_client/dune
+++ b/src/proto_demo_counter/lib_client/dune
@@ -6,7 +6,7 @@
  (public_name tezos-client-demo-counter)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-shell-libs.client-commands
diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune
index 0411d3622debcfbb0630e33228071fcc19c2c024..e0ba47c56d657ab4fe77db6230638e35a3658eaa 100644
--- a/src/proto_genesis/lib_client/dune
+++ b/src/proto_genesis/lib_client/dune
@@ -6,7 +6,7 @@
  (public_name tezos-client-genesis)
  (instrumentation (backend bisect_ppx))
  (libraries
-  octez-libs.tezos-base
+  octez-libs.base
   octez-shell-libs.shell-services
   octez-shell-libs.client-base
   octez-proto-libs.protocol-environment
@@ -14,7 +14,7 @@
   tezos-protocol-genesis.protocol.lifted
   octez-shell-libs.client-commands
   octez-shell-libs.proxy
-  octez-libs.tezos-stdlib-unix)
+  octez-libs.stdlib-unix)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
diff --git a/tezt/lib_tezos/dune b/tezt/lib_tezos/dune
index 8515f72e6f0e227fef6ba2adbe522b5fb89accbf..6516b12e82b7195e84ccc460538b548acf92cd07 100644
--- a/tezt/lib_tezos/dune
+++ b/tezt/lib_tezos/dune
@@ -9,9 +9,9 @@
   tezt-tezos.tezt-performance-regression
   uri
   hex
-  octez-libs.tezos-crypto-dal
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
+  octez-libs.crypto-dal
+  octez-libs.base
+  octez-libs.base.unix
   cohttp-lwt-unix)
  (flags
   (:standard)
diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune
index 7d438d342430ff7d3aefc4d3558504050a4ee69b..8e5ba1a27850a41a6f37dddf571c143243f82a67 100644
--- a/tezt/long_tests/dune
+++ b/tezt/long_tests/dune
@@ -3,16 +3,16 @@
  (libraries tezt
             tezt-tezos
             tezt-tezos.tezt-performance-regression
-            octez-libs.tezos-lwt-result-stdlib
+            octez-libs.lwt-result-stdlib
             octez-protocol-alpha-libs.test-helpers
-            octez-libs.tezos-micheline
+            octez-libs.micheline
             tezos-openapi
             tezos-protocol-alpha.protocol
             qcheck-core
             tezos-time-measurement
             data-encoding
-            octez-libs.tezos-event-logging
-	    octez-libs.tezos-test-helpers
+            octez-libs.event-logging
+	    octez-libs.test-helpers
             )
  (flags (:standard
           -open Tezt
diff --git a/tezt/tests/dune b/tezt/tests/dune
index 74833731eb0d9d9b5d4fb621b9d9adcbc27fdc18..9726df9fc4b98aa56bd2c59fa72170eb2985d2fb 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -5,16 +5,16 @@
  (name main)
  (instrumentation (backend bisect_ppx --bisect-sigterm))
  (libraries
-  octez-libs.tezos-test-helpers
+  octez-libs.test-helpers
   tezt
   str
   bls12-381
   tezt-tezos
   tezt_ethereum
   data-encoding
-  octez-libs.tezos-base
-  octez-libs.tezos-base.unix
-  octez-libs.tezos-stdlib-unix
+  octez-libs.base
+  octez-libs.base.unix
+  octez-libs.stdlib-unix
   tezos-protocol-alpha.protocol
   tezos_scoru_wasm_regressions
   tezt_self_tests_tezt_lib
diff --git a/tezt/vesting_contract_test/dune b/tezt/vesting_contract_test/dune
index 7a8fc67dc6acfd8d2a706994ec26931805aea3f6..c950dba38cdd66d878da17542fe56b7b7bfc34ea 100644
--- a/tezt/vesting_contract_test/dune
+++ b/tezt/vesting_contract_test/dune
@@ -1,8 +1,8 @@
 (executable
  (name main)
- (libraries octez-libs.tezos-stdlib
+ (libraries octez-libs.stdlib
             octez-protocol-alpha-libs.test-helpers
-            octez-libs.tezos-micheline
+            octez-libs.micheline
             tezos-protocol-alpha.protocol
             tezt-tezos
             ptime)