diff --git a/etherlink/bin_node/lib_dev/services.ml b/etherlink/bin_node/lib_dev/services.ml
index 80e9a9f18501355ce5b06c66d7e7dfee9fc176fb..eece963eddb98211e4c2380a4e76c2d4fd70d7ff 100644
--- a/etherlink/bin_node/lib_dev/services.ml
+++ b/etherlink/bin_node/lib_dev/services.ml
@@ -40,7 +40,7 @@ let client_version =
     "%s/%s-%s/%s/ocamlc.%s"
     "octez-evm-node"
     (Tezos_version.Version.to_string
-       Tezos_version_value.Current_git_info.etherlink_version)
+       Tezos_version_value.Current_git_info.octez_evm_node_version)
     Tezos_version_value.Current_git_info.abbreviated_commit_hash
     Stdlib.Sys.os_type
     Stdlib.Sys.ocaml_version
diff --git a/etherlink/bin_node/main.ml b/etherlink/bin_node/main.ml
index 13639653e689baa2d8bd6fa763463e92538b1781..9884da7f176dfa03db928210220f6fae2a7e9c79 100644
--- a/etherlink/bin_node/main.ml
+++ b/etherlink/bin_node/main.ml
@@ -2270,7 +2270,9 @@ let dispatch args =
 let handle_error = function
   | Ok _ -> ()
   | Error [Tezos_clic.Version] ->
-      let devmode = Tezos_version_value.Bin_version.etherlink_version_string in
+      let devmode =
+        Tezos_version_value.Bin_version.octez_evm_node_version_string
+      in
       Format.printf "%s\n" devmode ;
       exit 0
   | Error [Tezos_clic.Help command] ->
diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml
index a94f9c8637f9011a3110807f8569106c28c28a24..245692a9e53c8b41cb871290314079cb18f36eab 100644
--- a/manifest/product_octez.ml
+++ b/manifest/product_octez.ml
@@ -2142,10 +2142,10 @@ let _octez_webassembly_test =
     ~dune:Dune.[[S "include_subdirs"; S "no"]]
     ~deps:[octez_webassembly_interpreter |> open_; alcotezt]
 
-let _etherlink_print_version_exe =
+let _octez_evm_node_print_version_exe =
   public_exe
-    "etherlink-version"
-    ~internal_name:"etherlink_print_version"
+    "octez-evm-node-version"
+    ~internal_name:"octez_evm_node_print_version"
     ~path:"src/lib_version/exe"
     ~opam:"octez-version"
     ~deps:
@@ -2155,7 +2155,7 @@ let _etherlink_print_version_exe =
         octez_base_unix;
         octez_print_version |> open_;
       ]
-    ~modules:["etherlink_print_version"]
+    ~modules:["octez_evm_node_print_version"]
     ~bisect_ppx:No
 
 let _octez_version_tests =
diff --git a/scripts/test_octez_release_version.sh b/scripts/test_octez_release_version.sh
index 52d790cf22c3f5b39af30c9181c833b7e946e206..888758bccf5b93e882c24af22e2d60b8f9ee6487 100755
--- a/scripts/test_octez_release_version.sh
+++ b/scripts/test_octez_release_version.sh
@@ -24,7 +24,6 @@ test_version() {
 
 cleanup() {
   set +e
-  git tag -d "octez-$VERSION" > /dev/null 2>&1
   git tag -d "octez-v$VERSION" > /dev/null 2>&1
   git tag -d "octez-v$VERSION"+rc1 > /dev/null 2>&1
   git tag -d "octez-v$VERSION"-rc1 > /dev/null 2>&1
@@ -39,9 +38,6 @@ cleanup
 
 git checkout -b "$TESTBRANCH"
 
-git tag "octez-$VERSION" -m "test"
-test_version "Octez $VERSION" "$VERSION"
-
 git tag "octez-v$VERSION" -m "test"
 test_version "Octez $VERSION" "octez-v$VERSION"
 
diff --git a/src/lib_version/exe/dune b/src/lib_version/exe/dune
index 1c7f1d3f566bc5ea22fece9c0c645535b17b4e8d..2948a3ea69333334cadf3e810396193bb76cb8cf 100644
--- a/src/lib_version/exe/dune
+++ b/src/lib_version/exe/dune
@@ -28,8 +28,8 @@
  (modules octez_print_version))
 
 (executable
- (name etherlink_print_version)
- (public_name etherlink-version)
+ (name octez_evm_node_print_version)
+ (public_name octez-evm-node-version)
  (package octez-version)
  (libraries
   octez-version.value
@@ -44,4 +44,4 @@
   -open Tezos_version_value
   -open Tezos_version
   -open Octez_version_print)
- (modules etherlink_print_version))
+ (modules octez_evm_node_print_version))
diff --git a/src/lib_version/exe/get_git_info.ml b/src/lib_version/exe/get_git_info.ml
index 14a9874ca3892fb0361d5d1378b005cc500af043..07f1367752b7e03e174e643ed875c0f35334557c 100644
--- a/src/lib_version/exe/get_git_info.ml
+++ b/src/lib_version/exe/get_git_info.ml
@@ -99,11 +99,11 @@ let lines =
     Format.asprintf
       "let git_describe_octez = %a"
       Tezos_version_parser.pp
-      (git_describe "octez-*");
+      (git_describe "octez-v*");
     Format.asprintf
-      "let git_describe_etherlink = %a"
+      "let git_describe_octez_evm_node = %a"
       Tezos_version_parser.pp
-      (git_describe "etherlink-*");
+      (git_describe "octez-evm-node-v*");
   ]
 
 let () =
diff --git a/src/lib_version/exe/etherlink_print_version.ml b/src/lib_version/exe/octez_evm_node_print_version.ml
similarity index 90%
rename from src/lib_version/exe/etherlink_print_version.ml
rename to src/lib_version/exe/octez_evm_node_print_version.ml
index 2de43f75ceb5c9de464edc3fd5db0680a60cd640..fea8be2fa0551b04363f6f36eca42f45e06504ba 100644
--- a/src/lib_version/exe/etherlink_print_version.ml
+++ b/src/lib_version/exe/octez_evm_node_print_version.ml
@@ -9,4 +9,4 @@
 
 open Current_git_info
 
-let () = Print_version.print_version etherlink_version
+let () = Print_version.print_version octez_evm_node_version
diff --git a/src/lib_version/parser/tezos_version_parser.mll b/src/lib_version/parser/tezos_version_parser.mll
index f4704829525bb9a212a0738536948022b44dc79e..a35752a3ccd6a8e153582bc51475d7de1fb5d64f 100644
--- a/src/lib_version/parser/tezos_version_parser.mll
+++ b/src/lib_version/parser/tezos_version_parser.mll
@@ -27,11 +27,11 @@
     | RC_dev of int
     | Release [@@deriving show]
 
-  type product = Octez | Etherlink
+  type product = Octez | Octez_evm_node
 
   let pp_product ppf = function
   | Octez -> Format.fprintf ppf "Octez"
-  | Etherlink -> Format.fprintf ppf "Etherlink"
+  | Octez_evm_node -> Format.fprintf ppf "Octez_evm_node"
 
   type t = {
     product: product;
@@ -49,10 +49,10 @@ let num = ['0'-'9']+
 let hexa = ['0'-'9' 'A'-'F' 'a'-'f']+
 
 rule version_tag = parse
-  | ("octez" | "etherlink" as product) "-" 'v'? (num as major) '.' (num as minor) ".0"?
+  | ("octez" | "octez-evm-node" as product) "-" 'v'? (num as major) '.' (num as minor) ".0"?
       {
         let product = match product with 
-          | "etherlink" -> Etherlink
+          | "octez-evm-node" -> Octez_evm_node
           | "octez" -> Octez
           | _ -> (* this case cannot happen, see pattern above *)  
                  assert false
@@ -81,10 +81,10 @@ and extra = parse
       { Dev }
 
 and version_commit = parse 
-  | ("octez" | "etherlink" as product) "-" 'v'? (num as major) '.' (num as minor) ".0"?
+  | ("octez" | "octez-evm-node" as product) "-" 'v'? (num as major) '.' (num as minor) ".0"?
       {
         let product = match product with 
-          | "etherlink" -> Etherlink
+          | "octez-evm-node" -> Octez_evm_node
           | "octez" -> Octez
           | _ -> (* this case cannot happen, see pattern above *)  
                  assert false
diff --git a/src/lib_version/test/test_octez_node_version.ml b/src/lib_version/test/test_octez_node_version.ml
index 8bf18b71366f5cf03a6e91331041c3c66331eaf4..6d2fb26abc3e1c79fcf7452fc557662e191eef57 100644
--- a/src/lib_version/test/test_octez_node_version.ml
+++ b/src/lib_version/test/test_octez_node_version.ml
@@ -12,7 +12,8 @@
                   -- --file test_octez_node_version.ml
     Subject: Test versions
 *)
-let all_products : Tezos_version_parser.product array = [|Octez; Etherlink|]
+let all_products : Tezos_version_parser.product array =
+  [|Octez; Octez_evm_node|]
 
 (* Values of Beta x, Beta_dev x, RC x or RC_dev x in additional_info are
    ignored. *)
diff --git a/src/lib_version/test/test_parser.ml b/src/lib_version/test/test_parser.ml
index f1cd5c6c4a10d403c4a0b74d527986539cb19f88..32f7f321009b13f0a553703881c24de238a1fb0d 100644
--- a/src/lib_version/test/test_parser.ml
+++ b/src/lib_version/test/test_parser.ml
@@ -16,13 +16,6 @@
 
 let octez_legal_versions =
   [
-    ( "octez-10.93",
-      {
-        product = Octez;
-        Version.major = 10;
-        minor = 93;
-        additional_info = Release;
-      } );
     ( "octez-v10.93",
       {
         product = Octez;
@@ -30,27 +23,27 @@ let octez_legal_versions =
         minor = 93;
         additional_info = Release;
       } );
-    ( "octez-10.93+dev",
+    ( "octez-v10.93+dev",
       {product = Octez; Version.major = 10; minor = 93; additional_info = Dev}
     );
-    ( "octez-10.93-rc1",
+    ( "octez-v10.93-rc1",
       {product = Octez; Version.major = 10; minor = 93; additional_info = RC 1}
     );
-    ( "octez-10.93-rc1+dev",
+    ( "octez-v10.93-rc1+dev",
       {
         product = Octez;
         Version.major = 10;
         minor = 93;
         additional_info = RC_dev 1;
       } );
-    ( "octez-10.93-beta1",
+    ( "octez-v10.93-beta1",
       {
         product = Octez;
         Version.major = 10;
         minor = 93;
         additional_info = Beta 1;
       } );
-    ( "octez-10.93-beta1+dev",
+    ( "octez-v10.93-beta1+dev",
       {
         product = Octez;
         Version.major = 10;
@@ -59,53 +52,53 @@ let octez_legal_versions =
       } );
   ]
 
-let etherlink_legal_versions =
+let octez_evm_node_legal_versions =
   [
-    ( "etherlink-10.93",
+    ( "octez-evm-node-v10.93",
       {
-        product = Etherlink;
+        product = Octez_evm_node;
         Version.major = 10;
         minor = 93;
         additional_info = Release;
       } );
-    ( "etherlink-v10.93",
+    ( "octez-evm-node-v10.93",
       {
-        product = Etherlink;
+        product = Octez_evm_node;
         Version.major = 10;
         minor = 93;
         additional_info = Release;
       } );
-    ( "etherlink-10.93+dev",
+    ( "octez-evm-node-v10.93+dev",
       {
-        product = Etherlink;
+        product = Octez_evm_node;
         Version.major = 10;
         minor = 93;
         additional_info = Dev;
       } );
-    ( "etherlink-10.93-rc1",
+    ( "octez-evm-node-v10.93-rc1",
       {
-        product = Etherlink;
+        product = Octez_evm_node;
         Version.major = 10;
         minor = 93;
         additional_info = RC 1;
       } );
-    ( "etherlink-10.93-rc1+dev",
+    ( "octez-evm-node-v10.93-rc1+dev",
       {
-        product = Etherlink;
+        product = Octez_evm_node;
         Version.major = 10;
         minor = 93;
         additional_info = RC_dev 1;
       } );
-    ( "etherlink-10.93-beta1",
+    ( "octez-evm-node-v10.93-beta1",
       {
-        product = Etherlink;
+        product = Octez_evm_node;
         Version.major = 10;
         minor = 93;
         additional_info = Beta 1;
       } );
-    ( "etherlink-10.93-beta1+dev",
+    ( "octez-evm-node-v10.93-beta1+dev",
       {
-        product = Etherlink;
+        product = Octez_evm_node;
         Version.major = 10;
         minor = 93;
         additional_info = Beta_dev 1;
@@ -157,10 +150,10 @@ let () =
 let () =
   Test.register
     ~__FILE__
-    ~title:"Version: Test Etherlink versions parser"
-    ~tags:["version"; "etherlink"]
+    ~title:"Version: Test octez-evm-node versions parser"
+    ~tags:["version"; "octez_evm_node"]
   @@ fun () ->
-  ( Fun.flip List.iter etherlink_legal_versions @@ fun (x, e) ->
+  ( Fun.flip List.iter octez_evm_node_legal_versions @@ fun (x, e) ->
     Check.(
       (Some e = parse_version x)
         version_typ
diff --git a/src/lib_version/value/bin_version.ml b/src/lib_version/value/bin_version.ml
index a5ba9e9a4e51a8e1f481b07d9ad546fb9319c2ea..87556d9fb93210c781f24b006044e2ee209d809b 100644
--- a/src/lib_version/value/bin_version.ml
+++ b/src/lib_version/value/bin_version.ml
@@ -40,7 +40,8 @@ let octez_version_string = version_string Current_git_info.octez_version
 let octez_simple_version_string =
   simple_version_string Current_git_info.octez_version
 
-let etherlink_version_string = version_string Current_git_info.etherlink_version
+let octez_evm_node_version_string =
+  version_string Current_git_info.octez_evm_node_version
 
-let etherlink_simple_version_string =
-  simple_version_string Current_git_info.etherlink_version
+let octez_evm_node_simple_version_string =
+  simple_version_string Current_git_info.octez_evm_node_version
diff --git a/src/lib_version/value/bin_version.mli b/src/lib_version/value/bin_version.mli
index b55692715b3f61498f782415b1fdc7c2b9e9db21..54514b6078638b4429bd832d1463c7e368832df2 100644
--- a/src/lib_version/value/bin_version.mli
+++ b/src/lib_version/value/bin_version.mli
@@ -38,8 +38,8 @@ val octez_version_string : string
 (** [simple_version_string] applied to the Version of Octez. *)
 val octez_simple_version_string : string
 
-(** [version_string] applied to the Version of Etherlink. *)
-val etherlink_version_string : string
+(** [version_string] applied to the Version of the Octez EVM node. *)
+val octez_evm_node_version_string : string
 
-(** [simple_version_string] applied to the Version of Etherlink. *)
-val etherlink_simple_version_string : string
+(** [simple_version_string] applied to the Version of Octez EVM node. *)
+val octez_evm_node_simple_version_string : string
diff --git a/src/lib_version/value/current_git_info.ml b/src/lib_version/value/current_git_info.ml
index 369639db9192adc6a6ba228172e70fd422847a3a..23aec146752a93fc25b60804724654cc4c69823b 100644
--- a/src/lib_version/value/current_git_info.ml
+++ b/src/lib_version/value/current_git_info.ml
@@ -52,4 +52,4 @@ let committer_date =
 
 let octez_version = Generated_git_info.git_describe_octez
 
-let etherlink_version = Generated_git_info.git_describe_etherlink
+let octez_evm_node_version = Generated_git_info.git_describe_octez_evm_node
diff --git a/src/lib_version/value/current_git_info.mli b/src/lib_version/value/current_git_info.mli
index 172beff1eecd47ddbd0ed93e6f2a601626fc71c3..c8654136823d0a762c862f469f45ff7e39b12e6f 100644
--- a/src/lib_version/value/current_git_info.mli
+++ b/src/lib_version/value/current_git_info.mli
@@ -33,6 +33,6 @@ val committer_date : string
     it uses either the git tag or a default version *)
 val octez_version : Tezos_version.Version.t
 
-(** Current version of Etherlink.
+(** Current version of the Octez EVM node.
     it uses either the git tag or a default version *)
-val etherlink_version : Tezos_version.Version.t
+val octez_evm_node_version : Tezos_version.Version.t
diff --git a/src/lib_version/value/generated_git_info.mli b/src/lib_version/value/generated_git_info.mli
index b32068356344be0be2ece2cd1c21fe4b0617ec6a..f0ed8ad52ed1acc61274aaf6937e6d367c23cd5b 100644
--- a/src/lib_version/value/generated_git_info.mli
+++ b/src/lib_version/value/generated_git_info.mli
@@ -28,4 +28,4 @@ val committer_date : string
 
 val git_describe_octez : Tezos_version_parser.t
 
-val git_describe_etherlink : Tezos_version_parser.t
+val git_describe_octez_evm_node : Tezos_version_parser.t
diff --git a/src/lib_version/version.ml b/src/lib_version/version.ml
index 607c6e7fc8728f4e7ec20227b8697016af31ae28..2f0cd195720c0100c32af102d050e42fc235f16d 100644
--- a/src/lib_version/version.ml
+++ b/src/lib_version/version.ml
@@ -31,7 +31,7 @@ type additional_info = Tezos_version_parser.additional_info =
   | RC_dev of int
   | Release
 
-type product = Tezos_version_parser.product = Octez | Etherlink
+type product = Tezos_version_parser.product = Octez | Octez_evm_node
 
 type t = Tezos_version_parser.t = {
   product : product;
@@ -50,7 +50,9 @@ let string_of_additional_info = function
   | RC_dev n -> Format.asprintf "~rc%d+dev" n
   | Release -> ""
 
-let string_of_product = function Octez -> "Octez" | Etherlink -> "Etherlink"
+let string_of_product = function
+  | Octez -> "Octez"
+  | Octez_evm_node -> "octez-evm-node"
 
 let pp f {product; major; minor; additional_info} =
   Format.fprintf
diff --git a/src/lib_version/version.mli b/src/lib_version/version.mli
index 23912a92476814878f4b5234a5090714bcbca0dc..a269e3a2b6822fc64a8dfca5f71430127d271b5a 100644
--- a/src/lib_version/version.mli
+++ b/src/lib_version/version.mli
@@ -65,7 +65,7 @@ type additional_info = Tezos_version_parser.additional_info =
 val string_of_additional_info : additional_info -> string
 
 (** Product information. *)
-type product = Tezos_version_parser.product = Octez | Etherlink
+type product = Tezos_version_parser.product = Octez | Octez_evm_node
 
 (** Convert the product information to a string. *)
 val string_of_product : product -> string