diff --git a/src/proto_alpha/lib_client/mockup.ml b/src/proto_alpha/lib_client/mockup.ml
index ea1959ba9f5a4a422b966c73ef444304b84a823d..f5e75274fcb15c479fd0e66adee01893baea0b39 100644
--- a/src/proto_alpha/lib_client/mockup.ml
+++ b/src/proto_alpha/lib_client/mockup.ml
@@ -279,7 +279,7 @@ let genesis_block_hash =
   Block_hash.of_b58check_exn
     "BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU"
 
-let endorsement_branch_data_encoding =
+let attestation_branch_data_encoding =
   let open Data_encoding in
   conv
     (fun (block_hash, block_payload_hash) -> (block_hash, block_payload_hash))
diff --git a/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.ml b/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.ml
index 511f7d4129ff85fc0af5a20f079c834e923a1ef5..cf0e48520431b00c8fb7f2c205f76c21837d7e87 100644
--- a/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.ml
+++ b/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.ml
@@ -70,7 +70,7 @@ let slots_info node_ctxt (Layer1.{hash; _} as head) =
   let lag =
     node_ctxt.Node_context.current_protocol.constants.dal.attestation_lag
   in
-  (* we are downloading endorsemented for slots at level [level], so
+  (* we are downloading attestation for slots at level [level], so
      we need to download the data at level [level - lag].
   *)
   let* published_slots_block_hash =
@@ -90,9 +90,9 @@ let slots_info node_ctxt (Layer1.{hash; _} as head) =
           ~none:(TzTrace.make @@ Layer1_services.Cannot_read_block_metadata hash)
           metadata
       in
-      (* `metadata.protocol_data.dal_attestation` is `None` if we are behind
-          the `Dal feature flag`: in this case we return an empty slot endorsement.
-      *)
+      (* `metadata.protocol_data.dal_attestation` is `None` if we are behind the
+         `Dal feature flag`: in this case we return an empty slot
+         attestation. *)
       let confirmed_slots =
         Option.value
           ~default:Dal.Attestation.empty
@@ -222,7 +222,7 @@ module Confirmed_slots_history = struct
     in
     return @@ Option.value slots_list_opt ~default:Dal.Slots_history.genesis
 
-  (** Depending on the rollup's origination level and on the DAL's endorsement
+  (** Depending on the rollup's origination level and on the DAL's attestation
       lag, the rollup node should start processing confirmed slots and update its
       slots_history and slots_history's cache entries in the store after
       [origination_level + attestation_lag] blocks. This function checks if
diff --git a/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.mli b/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.mli
index c05672d93a0e21dbe29c76bd3f43d7e00ffbf37c..42828705e639c826a8f08e5912c3ff88d7f1ed3b 100644
--- a/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.mli
+++ b/src/proto_alpha/lib_sc_rollup_node/dal_slots_tracker.mli
@@ -33,7 +33,7 @@
 
 (** [process_head node_ctxt head] performs the following operations:
     {ul
-      {li it reads the endorsements for headers published attestation_lag
+      {li it reads the attestations for headers published attestation_lag
       levels preceding [head] from the block metadata, determines which
       ones the rollup node will download, and stores the results in
       [Store.Dal_confirmed_slots].}