diff --git a/consensus/fork_choice/src/fork_choice.rs b/consensus/fork_choice/src/fork_choice.rs
index 85e43945c..590e151a8 100644
--- a/consensus/fork_choice/src/fork_choice.rs
+++ b/consensus/fork_choice/src/fork_choice.rs
@@ -857,8 +857,8 @@ where
                     (parent_justified, parent_finalized)
                 } else {
                     let justification_and_finalization_state = match block {
-                        // FIXME: verify this is correct for Capella/Eip4844 because
-                        //        epoch processing changes in Capella..
+                        // TODO(eip4844): Ensure that the final specification
+                        // does not substantially modify per epoch processing.
                         BeaconBlockRef::Eip4844(_)
                         | BeaconBlockRef::Capella(_)
                         | BeaconBlockRef::Merge(_)
diff --git a/consensus/state_processing/src/per_block_processing/verify_bls_to_execution_change.rs b/consensus/state_processing/src/per_block_processing/verify_bls_to_execution_change.rs
index 15a856c40..bb2679925 100644
--- a/consensus/state_processing/src/per_block_processing/verify_bls_to_execution_change.rs
+++ b/consensus/state_processing/src/per_block_processing/verify_bls_to_execution_change.rs
@@ -10,8 +10,8 @@ fn error(reason: Invalid) -> BlockOperationError<Invalid> {
     BlockOperationError::invalid(reason)
 }
 
-/// Indicates if a `BlsToExecutionChange` is valid to be included in a block in the current epoch of the given
-/// state.
+/// Indicates if a `BlsToExecutionChange` is valid to be included in a block,
+/// where the block is being applied to the given `state`.
 ///
 /// Returns `Ok(())` if the `SignedBlsToExecutionChange` is valid, otherwise indicates the reason for invalidity.
 pub fn verify_bls_to_execution_change<T: EthSpec>(