diff --git a/.gitlab/ci/opam-ci.yml b/.gitlab/ci/opam-ci.yml
index b73f71950f024417ed74db41ee0ccf65ed97f3e7..e0b7991b57a17f26f3119c94871714fbd4c9ac6c 100644
--- a/.gitlab/ci/opam-ci.yml
+++ b/.gitlab/ci/opam-ci.yml
@@ -708,106 +708,6 @@ opam:tezos-protocol-environment:
   variables:
     package: tezos-protocol-environment
 
-opam:tezos-protocol-functor-000-Ps9mPmXa:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-000-Ps9mPmXa
-
-opam:tezos-protocol-functor-001-PtCJ7pwo:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-001-PtCJ7pwo
-
-opam:tezos-protocol-functor-002-PsYLVpVv:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-002-PsYLVpVv
-
-opam:tezos-protocol-functor-003-PsddFKi3:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-003-PsddFKi3
-
-opam:tezos-protocol-functor-004-Pt24m4xi:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-004-Pt24m4xi
-
-opam:tezos-protocol-functor-005-PsBABY5H:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-005-PsBABY5H
-
-opam:tezos-protocol-functor-005-PsBabyM1:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-005-PsBabyM1
-
-opam:tezos-protocol-functor-006-PsCARTHA:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-006-PsCARTHA
-
-opam:tezos-protocol-functor-007-PsDELPH1:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-007-PsDELPH1
-
-opam:tezos-protocol-functor-008-PtEdo2Zk:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-008-PtEdo2Zk
-
-opam:tezos-protocol-functor-008-PtEdoTez:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-008-PtEdoTez
-
-opam:tezos-protocol-functor-009-PsFLoren:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-009-PsFLoren
-
-opam:tezos-protocol-functor-010-PtGRANAD:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-010-PtGRANAD
-
-opam:tezos-protocol-functor-011-PtHangz2:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-011-PtHangz2
-
-opam:tezos-protocol-functor-012-Psithaca:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-012-Psithaca
-
-opam:tezos-protocol-functor-013-PtJakart:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-013-PtJakart
-
-opam:tezos-protocol-functor-alpha:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-alpha
-
-opam:tezos-protocol-functor-demo-counter:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-demo-counter
-
-opam:tezos-protocol-functor-demo-noops:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-demo-noops
-
-opam:tezos-protocol-functor-genesis:
-  extends: .opam_template
-  variables:
-    package: tezos-protocol-functor-genesis
-
 opam:tezos-protocol-genesis:
   extends: .opam_template
   variables:
diff --git a/dune-project b/dune-project
index ca7bef7cacb611407bdad92d54f1d8408e681844..509a3a25f16d16d041113950ea8eb7d38e754c45 100644
--- a/dune-project
+++ b/dune-project
@@ -147,26 +147,6 @@
 (package (name tezos-protocol-demo-counter))
 (package (name tezos-protocol-demo-noops))
 (package (name tezos-protocol-environment))
-(package (name tezos-protocol-functor-000-Ps9mPmXa))
-(package (name tezos-protocol-functor-001-PtCJ7pwo))
-(package (name tezos-protocol-functor-002-PsYLVpVv))
-(package (name tezos-protocol-functor-003-PsddFKi3))
-(package (name tezos-protocol-functor-004-Pt24m4xi))
-(package (name tezos-protocol-functor-005-PsBABY5H))
-(package (name tezos-protocol-functor-005-PsBabyM1))
-(package (name tezos-protocol-functor-006-PsCARTHA))
-(package (name tezos-protocol-functor-007-PsDELPH1))
-(package (name tezos-protocol-functor-008-PtEdo2Zk))
-(package (name tezos-protocol-functor-008-PtEdoTez))
-(package (name tezos-protocol-functor-009-PsFLoren))
-(package (name tezos-protocol-functor-010-PtGRANAD))
-(package (name tezos-protocol-functor-011-PtHangz2))
-(package (name tezos-protocol-functor-012-Psithaca))
-(package (name tezos-protocol-functor-013-PtJakart))
-(package (name tezos-protocol-functor-alpha))
-(package (name tezos-protocol-functor-demo-counter))
-(package (name tezos-protocol-functor-demo-noops))
-(package (name tezos-protocol-functor-genesis))
 (package (name tezos-protocol-genesis))
 (package (name tezos-protocol-plugin-007-PsDELPH1))
 (package (name tezos-protocol-plugin-007-PsDELPH1-registerer))
diff --git a/manifest/main.ml b/manifest/main.ml
index a7dd4811f58915d44950498f3c0b84139e06bb4b..8508aeb207a9b20ddf9ee6301140775cecacf4ed 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -3281,10 +3281,10 @@ include Tezos_raw_protocol_%s.Main
               ]
       in
       let _functor =
-        public_lib
-          (sf "tezos-protocol-functor-%s" name_dash)
-          ~internal_name:(sf "tezos_protocol_%s_functor" name_underscore)
+        private_lib
+          (sf "tezos_protocol_%s_functor" name_underscore)
           ~path:(sf "src/proto_%s/lib_protocol" name_underscore)
+          ~opam:""
           ~synopsis:
             (match number with
             | V _ as number when N.(number <= 003) ->
diff --git a/opam/tezos-protocol-functor-000-Ps9mPmXa.opam b/opam/tezos-protocol-functor-000-Ps9mPmXa.opam
deleted file mode 100644
index abea83d62816efc85f972659d61c4ec8125abafb..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-000-Ps9mPmXa.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-000-Ps9mPmXa"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: 000-Ps9mPmXa (economic-protocol definition parameterized by its environment implementation)"
diff --git a/opam/tezos-protocol-functor-001-PtCJ7pwo.opam b/opam/tezos-protocol-functor-001-PtCJ7pwo.opam
deleted file mode 100644
index 8bf34d0951d46acf132908673c61553410758f45..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-001-PtCJ7pwo.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-001-PtCJ7pwo"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: 001_PtCJ7pwo (economic-protocol definition parameterized by its environment implementation)"
diff --git a/opam/tezos-protocol-functor-002-PsYLVpVv.opam b/opam/tezos-protocol-functor-002-PsYLVpVv.opam
deleted file mode 100644
index 95c4288690084a188bd0849621f1ea2efe19549b..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-002-PsYLVpVv.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-002-PsYLVpVv"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: 002_PsYLVpVv (economic-protocol definition parameterized by its environment implementation)"
diff --git a/opam/tezos-protocol-functor-003-PsddFKi3.opam b/opam/tezos-protocol-functor-003-PsddFKi3.opam
deleted file mode 100644
index 74acfbe1a66c84902bb2d2d3c82d9e9d281493e3..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-003-PsddFKi3.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-003-PsddFKi3"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: 003_PsddFKi3 (economic-protocol definition parameterized by its environment implementation)"
diff --git a/opam/tezos-protocol-functor-004-Pt24m4xi.opam b/opam/tezos-protocol-functor-004-Pt24m4xi.opam
deleted file mode 100644
index 18ba5d9200bcc62ad30c23eff98272eec9559dc7..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-004-Pt24m4xi.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-004-Pt24m4xi"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-005-PsBABY5H.opam b/opam/tezos-protocol-functor-005-PsBABY5H.opam
deleted file mode 100644
index 3917057318fae8ffa3f24aca340040cf878a38a7..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-005-PsBABY5H.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-005-PsBABY5H"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-005-PsBabyM1.opam b/opam/tezos-protocol-functor-005-PsBabyM1.opam
deleted file mode 100644
index 86e2dc83ea4ac66f41332e91b81be118db1bb9c2..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-005-PsBabyM1.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-005-PsBabyM1"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-006-PsCARTHA.opam b/opam/tezos-protocol-functor-006-PsCARTHA.opam
deleted file mode 100644
index 45287cb07e87558104d6e3c9beb8ba9b7017cd8a..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-006-PsCARTHA.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-006-PsCARTHA"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-007-PsDELPH1.opam b/opam/tezos-protocol-functor-007-PsDELPH1.opam
deleted file mode 100644
index ed846ced1edc46e3f1a3004eaffb0387e0ab3a5e..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-007-PsDELPH1.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-007-PsDELPH1"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-008-PtEdo2Zk.opam b/opam/tezos-protocol-functor-008-PtEdo2Zk.opam
deleted file mode 100644
index 3d10263446f728d9a94d9ecbf5b30f703a56f8ac..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-008-PtEdo2Zk.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-008-PtEdo2Zk"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-008-PtEdoTez.opam b/opam/tezos-protocol-functor-008-PtEdoTez.opam
deleted file mode 100644
index 3fb1715d05faa7962621596a8481c2ddd46713e8..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-008-PtEdoTez.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-008-PtEdoTez"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-009-PsFLoren.opam b/opam/tezos-protocol-functor-009-PsFLoren.opam
deleted file mode 100644
index 0c71cb64416308425a84919016ce873f572ca1cc..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-009-PsFLoren.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-009-PsFLoren"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-010-PtGRANAD.opam b/opam/tezos-protocol-functor-010-PtGRANAD.opam
deleted file mode 100644
index f0dc65f259f4fe64946d15df544404887b974f8c..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-010-PtGRANAD.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-010-PtGRANAD"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-011-PtHangz2.opam b/opam/tezos-protocol-functor-011-PtHangz2.opam
deleted file mode 100644
index 94c136e673c51d0a88dac1f83d59ecc6a018c46c..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-011-PtHangz2.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-011-PtHangz2"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-012-Psithaca.opam b/opam/tezos-protocol-functor-012-Psithaca.opam
deleted file mode 100644
index a13dec4535c41d8812406495f752678459dd6fb1..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-012-Psithaca.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-012-Psithaca"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-013-PtJakart.opam b/opam/tezos-protocol-functor-013-PtJakart.opam
deleted file mode 100644
index a546a0fc13b134f6211aae55c4acfb089aa6cafb..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-013-PtJakart.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-013-PtJakart"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-alpha.opam b/opam/tezos-protocol-functor-alpha.opam
deleted file mode 100644
index ed6617ad0fb8becad638640abac2d233df5a659f..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-alpha.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-alpha"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: economic-protocol definition parameterized by its environment implementation"
diff --git a/opam/tezos-protocol-functor-demo-counter.opam b/opam/tezos-protocol-functor-demo-counter.opam
deleted file mode 100644
index 79cdfbeabec181225f92cd285e9c150fe8ae367a..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-demo-counter.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-demo-counter"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: demo_counter (economic-protocol definition parameterized by its environment implementation)"
diff --git a/opam/tezos-protocol-functor-demo-noops.opam b/opam/tezos-protocol-functor-demo-noops.opam
deleted file mode 100644
index 55b6b4c64f01ba5d7409bfe794726371bbea0a73..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-demo-noops.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-demo-noops"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: demo_noops (economic-protocol definition parameterized by its environment implementation)"
diff --git a/opam/tezos-protocol-functor-genesis.opam b/opam/tezos-protocol-functor-genesis.opam
deleted file mode 100644
index 3b0ed6864b8cf9b2b428894dd74d67982a13aec5..0000000000000000000000000000000000000000
--- a/opam/tezos-protocol-functor-genesis.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was automatically generated, do not edit.
-# Edit file manifest/main.ml instead.
-opam-version: "2.0"
-maintainer: "contact@tezos.com"
-authors: ["Tezos devteam"]
-homepage: "https://www.tezos.com/"
-bug-reports: "https://gitlab.com/tezos/tezos/issues"
-dev-repo: "git+https://gitlab.com/tezos/tezos.git"
-license: "MIT"
-depends: [
-  "dune" { >= "2.9" & < "3.0" }
-  "tezos-protocol-environment"
-  "tezos-protocol-genesis"
-  "tezos-protocol-compiler"
-]
-build: [
-  ["rm" "-r" "vendors"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-synopsis: "Tezos/Protocol: genesis (economic-protocol definition parameterized by its environment implementation)"
diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune
index 9eb3c90e31a245c53a21154f468ec2e78d828971..8ce3ef4a951a21578f91fa9062df73497b5491d1 100644
--- a/src/proto_000_Ps9mPmXa/lib_protocol/dune
+++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune
@@ -85,7 +85,6 @@
 
 (library
  (name tezos_protocol_000_Ps9mPmXa_functor)
- (public_name tezos-protocol-functor-000-Ps9mPmXa)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune
index 46ff0d81be288fcf3930c98ff28725cbca4b3d5d..bb9877b72bef0fb84b6f9741e801800bc0b8de02 100644
--- a/src/proto_001_PtCJ7pwo/lib_protocol/dune
+++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune
@@ -283,7 +283,6 @@
 
 (library
  (name tezos_protocol_001_PtCJ7pwo_functor)
- (public_name tezos-protocol-functor-001-PtCJ7pwo)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune
index 96bdb7b974d84efe5f259e243c1b77e55088e901..dbbdab1b90045a9583e1afe481f00deb3179c850 100644
--- a/src/proto_002_PsYLVpVv/lib_protocol/dune
+++ b/src/proto_002_PsYLVpVv/lib_protocol/dune
@@ -283,7 +283,6 @@
 
 (library
  (name tezos_protocol_002_PsYLVpVv_functor)
- (public_name tezos-protocol-functor-002-PsYLVpVv)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune
index cfd31f37331da8325adad820abb28e0ca711c53e..6aa1e078d6cf517fd98af49929c292d3ad7daee8 100644
--- a/src/proto_003_PsddFKi3/lib_protocol/dune
+++ b/src/proto_003_PsddFKi3/lib_protocol/dune
@@ -286,7 +286,6 @@
 
 (library
  (name tezos_protocol_003_PsddFKi3_functor)
- (public_name tezos-protocol-functor-003-PsddFKi3)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune
index b7dc288badc0959a72ff4103e03aa27733cdbe97..4f41b3e45ddaf8e7791739280a4226a3e50cf4b7 100644
--- a/src/proto_004_Pt24m4xi/lib_protocol/dune
+++ b/src/proto_004_Pt24m4xi/lib_protocol/dune
@@ -286,7 +286,6 @@
 
 (library
  (name tezos_protocol_004_Pt24m4xi_functor)
- (public_name tezos-protocol-functor-004-Pt24m4xi)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune
index 7b9c9131c58466d5bda113444129f3c52a1e79ab..4f1ef44c04000a98f02562c39d29bdbddb9689cd 100644
--- a/src/proto_005_PsBABY5H/lib_protocol/dune
+++ b/src/proto_005_PsBABY5H/lib_protocol/dune
@@ -289,7 +289,6 @@
 
 (library
  (name tezos_protocol_005_PsBABY5H_functor)
- (public_name tezos-protocol-functor-005-PsBABY5H)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune
index e2232205a609a8347f3e13f88759c736803069b4..c9f2fc4858e3c8da7399e5091b9e4cb14e89eafc 100644
--- a/src/proto_005_PsBabyM1/lib_protocol/dune
+++ b/src/proto_005_PsBabyM1/lib_protocol/dune
@@ -289,7 +289,6 @@
 
 (library
  (name tezos_protocol_005_PsBabyM1_functor)
- (public_name tezos-protocol-functor-005-PsBabyM1)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune
index 000dbc12be83965124004f2a8b8b29d49a82a583..6281cbffc01d8d4b82ffe320a1ebe7640f0707f4 100644
--- a/src/proto_006_PsCARTHA/lib_protocol/dune
+++ b/src/proto_006_PsCARTHA/lib_protocol/dune
@@ -289,7 +289,6 @@
 
 (library
  (name tezos_protocol_006_PsCARTHA_functor)
- (public_name tezos-protocol-functor-006-PsCARTHA)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune
index cfee261355328dc0ad0ad85425b4ed63f9cf30a1..6e410dc223decc5ae5f086c66e807a2d02bd40b5 100644
--- a/src/proto_007_PsDELPH1/lib_protocol/dune
+++ b/src/proto_007_PsDELPH1/lib_protocol/dune
@@ -295,7 +295,6 @@
 
 (library
  (name tezos_protocol_007_PsDELPH1_functor)
- (public_name tezos-protocol-functor-007-PsDELPH1)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune
index 223f9c00e284135bb2ee1dabc1bdbc706e9e1738..fc601257c5c5be04b0309db29265a82930a88c30 100644
--- a/src/proto_008_PtEdo2Zk/lib_protocol/dune
+++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune
@@ -310,7 +310,6 @@
 
 (library
  (name tezos_protocol_008_PtEdo2Zk_functor)
- (public_name tezos-protocol-functor-008-PtEdo2Zk)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune
index 6cb6796af1604314ab266310f90164950b6df9d7..9034602f3769938af49eeaebe0fabcd06b136078 100644
--- a/src/proto_008_PtEdoTez/lib_protocol/dune
+++ b/src/proto_008_PtEdoTez/lib_protocol/dune
@@ -310,7 +310,6 @@
 
 (library
  (name tezos_protocol_008_PtEdoTez_functor)
- (public_name tezos-protocol-functor-008-PtEdoTez)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune
index 19204c59a756a9192c16ab6412f0392a1a2c6c42..74ae595f594826064b086320e5bb69461ec53edb 100644
--- a/src/proto_009_PsFLoren/lib_protocol/dune
+++ b/src/proto_009_PsFLoren/lib_protocol/dune
@@ -319,7 +319,6 @@
 
 (library
  (name tezos_protocol_009_PsFLoren_functor)
- (public_name tezos-protocol-functor-009-PsFLoren)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune
index b5c8dc85f343f03c0b6ccdea21f28e823c1956c8..41a19845e60c36b116b838d1d991e1fffd339cfb 100644
--- a/src/proto_010_PtGRANAD/lib_protocol/dune
+++ b/src/proto_010_PtGRANAD/lib_protocol/dune
@@ -334,7 +334,6 @@
 
 (library
  (name tezos_protocol_010_PtGRANAD_functor)
- (public_name tezos-protocol-functor-010-PtGRANAD)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune
index 56bb5da9a74e01c0c7c7a76b55637d8568912b6e..4da4e14782eeb88c4d0126b92ce10bdc1540ec1f 100644
--- a/src/proto_011_PtHangz2/lib_protocol/dune
+++ b/src/proto_011_PtHangz2/lib_protocol/dune
@@ -372,7 +372,6 @@
 
 (library
  (name tezos_protocol_011_PtHangz2_functor)
- (public_name tezos-protocol-functor-011-PtHangz2)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune
index 8fc81babf6e967f89beeabc541a64276973d7903..853ec2bf6676e96e4667f118397004d2df21da35 100644
--- a/src/proto_012_Psithaca/lib_protocol/dune
+++ b/src/proto_012_Psithaca/lib_protocol/dune
@@ -423,7 +423,6 @@
 
 (library
  (name tezos_protocol_012_Psithaca_functor)
- (public_name tezos-protocol-functor-012-Psithaca)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune
index 058b19e7770dc4e0f618edc8a7e3cc58ee8fd4ed..a8535c1b78135fca79b9c9d79e10a3940ef4a850 100644
--- a/src/proto_013_PtJakart/lib_protocol/dune
+++ b/src/proto_013_PtJakart/lib_protocol/dune
@@ -620,7 +620,6 @@
 
 (library
  (name tezos_protocol_013_PtJakart_functor)
- (public_name tezos-protocol-functor-013-PtJakart)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune
index 2679c5eea843a06ed8ab7d09af7fa5b09fa7590e..d67ff7c0e3f479d5f68835d2f0344ceb72a85495 100644
--- a/src/proto_alpha/lib_protocol/dune
+++ b/src/proto_alpha/lib_protocol/dune
@@ -651,7 +651,6 @@
 
 (library
  (name tezos_protocol_alpha_functor)
- (public_name tezos-protocol-functor-alpha)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune
index 3ce4bbcfbd4e160534dcaea2791b18d86a02fec4..537397a514961e74726e3ed18050517ca5fb378c 100644
--- a/src/proto_demo_counter/lib_protocol/dune
+++ b/src/proto_demo_counter/lib_protocol/dune
@@ -108,7 +108,6 @@
 
 (library
  (name tezos_protocol_demo_counter_functor)
- (public_name tezos-protocol-functor-demo-counter)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune
index 184d5335cc4208d86a4d8d39eb05103ce5411b6b..64de0c716f550c1385c0a7e944934c50434318ee 100644
--- a/src/proto_demo_noops/lib_protocol/dune
+++ b/src/proto_demo_noops/lib_protocol/dune
@@ -79,7 +79,6 @@
 
 (library
  (name tezos_protocol_demo_noops_functor)
- (public_name tezos-protocol-functor-demo-noops)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs
diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune
index 91a7cd151f2164b1896713676bc2405981355681..d751b1a66f26f9209d977469017bdc4b4c905c57 100644
--- a/src/proto_genesis/lib_protocol/dune
+++ b/src/proto_genesis/lib_protocol/dune
@@ -84,7 +84,6 @@
 
 (library
  (name tezos_protocol_genesis_functor)
- (public_name tezos-protocol-functor-genesis)
  (libraries
   tezos-protocol-environment
   tezos-protocol-environment.sigs