diff --git a/src/bin_signer/handler.ml b/src/bin_signer/handler.ml
index b5e261b670ee63c3d9030f79eab0cc97a33056dc..e243ca0ba51754b8be24041f0b79ee588b92201c 100644
--- a/src/bin_signer/handler.ml
+++ b/src/bin_signer/handler.ml
@@ -67,7 +67,7 @@ module High_watermark = struct
         "Failed to retrieve level and round of a Tenderbake block: %s"
         (Printexc.to_string exn)
 
-  let get_level_and_round_for_tenderbake_endorsement bytes =
+  let get_level_and_round_for_tenderbake_attestation bytes =
     (* <watermark(1)><chain_id(4)><branch(32)><kind(1)><slot(2)><level(4)><round(4)>... *)
     let open Lwt_result_syntax in
     try
@@ -77,8 +77,8 @@ module High_watermark = struct
       return (level, Some round)
     with exn ->
       failwith
-        "Failed to retrieve level and round of an endorsement or \
-         preendorsement (%s)"
+        "Failed to retrieve level and round of an attestation or \
+         preattestation (%s)"
         (Printexc.to_string exn)
 
   let check_mark name
@@ -153,7 +153,7 @@ module High_watermark = struct
           else return_none
         else return_none
 
-  let mark_if_block_or_endorsement (cctxt : #Client_context.wallet) pkh bytes
+  let mark_if_block_or_attestation (cctxt : #Client_context.wallet) pkh bytes
       sign =
     let open Lwt_result_syntax in
     let mark art name get_level_and_round =
@@ -213,13 +213,13 @@ module High_watermark = struct
               (* tenderbake block *)
               get_level_and_round_for_tenderbake_block bytes)
       | 0x12 ->
-          (* tenderbake preendorsement *)
-          mark "a" "preendorsement" (fun () ->
-              get_level_and_round_for_tenderbake_endorsement bytes)
+          (* tenderbake preattestation *)
+          mark "a" "attestation" (fun () ->
+              get_level_and_round_for_tenderbake_attestation bytes)
       | 0x13 ->
-          (* tenderbake endorsement *)
-          mark "a" "endorsement" (fun () ->
-              get_level_and_round_for_tenderbake_endorsement bytes)
+          (* tenderbake attestation *)
+          mark "a" "attestation" (fun () ->
+              get_level_and_round_for_tenderbake_attestation bytes)
       | _ -> sign bytes
 end
 
@@ -278,7 +278,7 @@ let sign ?magic_bytes ~check_high_watermark ~require_auth
   let*! () = Events.(emit signing_data) name in
   let sign = Client_keys.sign cctxt sk_uri in
   if check_high_watermark then
-    High_watermark.mark_if_block_or_endorsement cctxt pkh data sign
+    High_watermark.mark_if_block_or_attestation cctxt pkh data sign
   else sign data
 
 let deterministic_nonce (cctxt : #Client_context.wallet)
diff --git a/src/bin_signer/main_signer.ml b/src/bin_signer/main_signer.ml
index 3cd1f8ce5b86a87239d400d4d9b62c0f36d9d10b..c96cae01eb4689620695a1ff97865bb845196519 100644
--- a/src/bin_signer/main_signer.ml
+++ b/src/bin_signer/main_signer.ml
@@ -26,7 +26,10 @@
 
 let default_tcp_host =
   match Sys.getenv_opt "TEZOS_SIGNER_TCP_HOST" with
-  | None -> "localhost"
+  | None -> (
+      match Sys.getenv_opt "OCTEZ_SIGNER_TCP_HOST" with
+      | None -> "localhost"
+      | Some host -> host)
   | Some host -> host
 
 let default_tcp_port =
@@ -307,7 +310,7 @@ let commands base_dir require_auth : Client_context.full Tezos_clic.command list
 
 let home = try Sys.getenv "HOME" with Not_found -> "/root"
 
-let default_base_dir = Filename.concat home ".tezos-signer"
+let default_base_dir = Filename.concat home ".octez-signer"
 
 let string_parameter () : (string, _) Tezos_clic.parameter =
   Tezos_clic.parameter (fun _ x -> Lwt.return_ok x)