diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bb362d30..02ec37916 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -307,10 +307,10 @@ opam:24:tezos-client-alpha:
   variables:
     package: tezos-client-alpha
 
-opam:25:tezos-client-environment:
+opam:25:tezos-protocol-environment-client:
   <<: *opam_definition
   variables:
-    package: tezos-client-environment
+    package: tezos-protocol-environment-client
 
 opam:26:tezos-protocol-genesis:
   <<: *opam_definition
diff --git a/src/lib_client_environment/environment.ml b/src/lib_protocol_environment_client/fake.ml
similarity index 100%
rename from src/lib_client_environment/environment.ml
rename to src/lib_protocol_environment_client/fake.ml
diff --git a/src/lib_client_environment/fake_context.ml b/src/lib_protocol_environment_client/fake_context.ml
similarity index 100%
rename from src/lib_client_environment/fake_context.ml
rename to src/lib_protocol_environment_client/fake_context.ml
diff --git a/src/lib_client_environment/fake_updater.ml b/src/lib_protocol_environment_client/fake_updater.ml
similarity index 100%
rename from src/lib_client_environment/fake_updater.ml
rename to src/lib_protocol_environment_client/fake_updater.ml
diff --git a/src/lib_client_environment/jbuild b/src/lib_protocol_environment_client/jbuild
similarity index 82%
rename from src/lib_client_environment/jbuild
rename to src/lib_protocol_environment_client/jbuild
index 846c512b7..aaf7a0d62 100644
--- a/src/lib_client_environment/jbuild
+++ b/src/lib_protocol_environment_client/jbuild
@@ -1,8 +1,8 @@
 (jbuild_version 1)
 
 (library
- ((name tezos_client_environment)
-  (public_name tezos-client-environment)
+ ((name tezos_protocol_environment_client)
+  (public_name tezos-protocol-environment-client)
   (libraries (tezos-base
               tezos-protocol-environment-sigs
               tezos-micheline))
diff --git a/src/lib_client_environment/tezos-client-environment.opam b/src/lib_protocol_environment_client/tezos-protocol-environment-client.opam
similarity index 100%
rename from src/lib_client_environment/tezos-client-environment.opam
rename to src/lib_protocol_environment_client/tezos-protocol-environment-client.opam
diff --git a/src/proto_alpha/lib_client/jbuild b/src/proto_alpha/lib_client/jbuild
index 1275f14f0..5fe7d777e 100644
--- a/src/proto_alpha/lib_client/jbuild
+++ b/src/proto_alpha/lib_client/jbuild
@@ -5,7 +5,7 @@
   (public_name tezos-client-alpha)
   (libraries (tezos-base
               tezos-protocol-alpha
-              tezos-client-environment
+              tezos-protocol-environment-client
               tezos-shell-services
               tezos-client-base))
   (library_flags (:standard -linkall))
diff --git a/src/proto_alpha/lib_client/proto_alpha.ml b/src/proto_alpha/lib_client/proto_alpha.ml
index 3c424168f..834d427a8 100644
--- a/src/proto_alpha/lib_client/proto_alpha.ml
+++ b/src/proto_alpha/lib_client/proto_alpha.ml
@@ -8,5 +8,5 @@
 (**************************************************************************)
 
 module Name = struct let name = "alpha" end
-module Environment = Tezos_client_environment.Environment.Make(Name)()
+module Environment = Tezos_protocol_environment_client.Fake.Make(Name)()
 include Tezos_protocol_alpha.Functor.Make(Environment)
diff --git a/src/proto_alpha/lib_client/tezos-client-alpha.opam b/src/proto_alpha/lib_client/tezos-client-alpha.opam
index 3a7af083a..7bbe4715a 100644
--- a/src/proto_alpha/lib_client/tezos-client-alpha.opam
+++ b/src/proto_alpha/lib_client/tezos-client-alpha.opam
@@ -10,7 +10,8 @@ depends: [
   "ocamlfind" { build }
   "jbuilder" { build & >= "1.0+beta15" }
   "tezos-base"
-  "tezos-embedded-protocol-alpha"
+  "tezos-protocol-environment-client"
+  "tezos-protocol-alpha"
   "tezos-shell-services"
   "tezos-client-base"
 ]
diff --git a/src/proto_genesis/lib_client/jbuild b/src/proto_genesis/lib_client/jbuild
index 99235ca6a..cda296533 100644
--- a/src/proto_genesis/lib_client/jbuild
+++ b/src/proto_genesis/lib_client/jbuild
@@ -6,7 +6,7 @@
   (libraries (tezos-base
               tezos-shell-services
               tezos-client-base
-              tezos-client-environment
+              tezos-protocol-environment-client
               tezos-client-alpha
               tezos-protocol-genesis))
   (library_flags (:standard -linkall))
diff --git a/src/proto_genesis/lib_client/proto_genesis.ml b/src/proto_genesis/lib_client/proto_genesis.ml
index 38e52e123..74a5b6950 100644
--- a/src/proto_genesis/lib_client/proto_genesis.ml
+++ b/src/proto_genesis/lib_client/proto_genesis.ml
@@ -8,5 +8,5 @@
 (**************************************************************************)
 
 module Name = struct let name = "genesis" end
-module Environment = Tezos_client_environment.Environment.Make(Name)()
+module Environment = Tezos_protocol_environment_client.Fake.Make(Name)()
 include Tezos_protocol_genesis.Functor.Make(Environment)
diff --git a/src/proto_genesis/lib_client/tezos-client-genesis.opam b/src/proto_genesis/lib_client/tezos-client-genesis.opam
index 0edf22148..cceaeedf0 100644
--- a/src/proto_genesis/lib_client/tezos-client-genesis.opam
+++ b/src/proto_genesis/lib_client/tezos-client-genesis.opam
@@ -12,7 +12,7 @@ depends: [
   "tezos-base"
   "tezos-shell-services"
   "tezos-client-base"
-  "tezos-client-environment"
+  "tezos-protocol-environment-client"
   "tezos-client-alpha"
   "tezos-protocol-genesis"
 ]