diff --git a/src/compiler/embedded_cmis.mli b/src/compiler/embedded_cmis.mli
index 3d6c8780d..c0db76d03 100644
--- a/src/compiler/embedded_cmis.mli
+++ b/src/compiler/embedded_cmis.mli
@@ -8,5 +8,6 @@
 (**************************************************************************)
 
 val camlinternalFormatBasics_cmi: string
-val tezos_protocol_environment_sigs_v1_cmi: string
+val tezos_protocol_environment_sigs_cmi: string
+val tezos_protocol_environment_sigs__V1_cmi: string
 val tezos_protocol_compiler__Registerer_cmi: string
diff --git a/src/compiler/jbuild b/src/compiler/jbuild
index 5e451063f..4a2718edc 100644
--- a/src/compiler/jbuild
+++ b/src/compiler/jbuild
@@ -6,7 +6,8 @@
     (run ${bin:ocp-ocamlres} -format ocaml -o ${@}
            ${lib:stdlib:camlinternalFormatBasics.cmi}
            ${path:tezos_protocol_compiler__Registerer.cmi}
-           ${path:../environment/tezos_protocol_environment_sigs_v1.cmi}))))
+           ${path:../environment/tezos_protocol_environment_sigs.cmi}
+           ${path:../environment/tezos_protocol_environment_sigs__V1.cmi}))))
 
 (library
  ((name tezos_protocol_compiler)
diff --git a/src/compiler/native.ml b/src/compiler/native.ml
index e260ffa7c..ab0426234 100644
--- a/src/compiler/native.ml
+++ b/src/compiler/native.ml
@@ -109,7 +109,8 @@ let tezos_protocol_env =
   let open Embedded_cmis in
   [
     "CamlinternalFormatBasics", camlinternalFormatBasics_cmi ;
-    "Tezos_protocol_environment_sigs_v1", tezos_protocol_environment_sigs_v1_cmi ;
+    "Tezos_protocol_environment_sigs", tezos_protocol_environment_sigs_cmi ;
+    "Tezos_protocol_environment_sigs__V1", tezos_protocol_environment_sigs__V1_cmi ;
   ]
 
 let register_env =
diff --git a/src/compiler/packer.ml b/src/compiler/packer.ml
index 25848343f..3232b2968 100644
--- a/src/compiler/packer.ml
+++ b/src/compiler/packer.ml
@@ -50,7 +50,7 @@ let opened_modules = [
 
 let dump oc files =
   Printf.fprintf oc
-    "module Make (Tezos_protocol_environment : Tezos_protocol_environment_sigs_v1.T) = struct\n" ;
+    "module Make (Tezos_protocol_environment : Tezos_protocol_environment_sigs__V1.T) = struct\n" ;
   Printf.fprintf oc "[@@@ocaml.warning \"-33\"]\n" ;
   List.iter (Printf.fprintf oc "open %s\n") opened_modules ;
   Printf.fprintf oc "[@@@ocaml.warning \"+33\"]\n" ;
diff --git a/src/compiler/registerer.ml b/src/compiler/registerer.ml
index 688902d96..eea3fb387 100644
--- a/src/compiler/registerer.ml
+++ b/src/compiler/registerer.ml
@@ -8,7 +8,7 @@
 (**************************************************************************)
 
 module type PROTOCOL_V1 =
-  functor (Env : Tezos_protocol_environment_sigs_v1.T) -> Env.Updater.PROTOCOL
+  functor (Env : Tezos_protocol_environment_sigs.V1.T) -> Env.Updater.PROTOCOL
 
 module VersionTable = Protocol_hash.Table
 
diff --git a/src/compiler/registerer.mli b/src/compiler/registerer.mli
index 50da9582b..ff6e44a4b 100644
--- a/src/compiler/registerer.mli
+++ b/src/compiler/registerer.mli
@@ -8,7 +8,7 @@
 (**************************************************************************)
 
 module type PROTOCOL_V1 =
-  functor (Env : Tezos_protocol_environment_sigs_v1.T) -> Env.Updater.PROTOCOL
+  functor (Env : Tezos_protocol_environment_sigs.V1.T) -> Env.Updater.PROTOCOL
 
 val register: string -> (module PROTOCOL_V1) -> unit
 
diff --git a/src/environment/jbuild b/src/environment/jbuild
index ce02f7d31..4056d7409 100644
--- a/src/environment/jbuild
+++ b/src/environment/jbuild
@@ -1,7 +1,7 @@
 (jbuild_version 1)
 
 (rule
- ((targets (tezos_protocol_environment_sigs_v1.ml))
+ ((targets (v1.ml))
   (deps
    (
     ;; Part of OCaml stdlib
@@ -51,5 +51,4 @@
 (library
  ((name tezos_protocol_environment_sigs)
   (flags (:standard -nopervasives))
-  (wrapped false)
-  (modules ("Tezos_protocol_environment_sigs_v1"))))
+  (modules ("V1"))))
diff --git a/src/node/updater/updater.ml b/src/node/updater/updater.ml
index 68ec1f27d..576f3fee6 100644
--- a/src/node/updater/updater.ml
+++ b/src/node/updater/updater.ml
@@ -117,7 +117,7 @@ module Node_protocol_environment_sigs = struct
 
   module type V1 = sig
 
-    include Tezos_protocol_environment_sigs_v1.T
+    include Tezos_protocol_environment_sigs.V1.T
       with type Format.formatter = Format.formatter
        and type 'a Data_encoding.t = 'a Data_encoding.t
        and type 'a Lwt.t = 'a Lwt.t
diff --git a/src/node/updater/updater.mli b/src/node/updater/updater.mli
index 0dcd13fd8..c4b3e3fa8 100644
--- a/src/node/updater/updater.mli
+++ b/src/node/updater/updater.mli
@@ -83,7 +83,7 @@ module Node_protocol_environment_sigs : sig
 
   module type V1 = sig
 
-    include Tezos_protocol_environment_sigs_v1.T
+    include Tezos_protocol_environment_sigs.V1.T
       with type Format.formatter = Format.formatter
        and type 'a Data_encoding.t = 'a Data_encoding.t
        and type 'a Lwt.t = 'a Lwt.t