diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
index 698159b535..d8a546257b 100644
--- a/beacon_node/beacon_chain/src/beacon_chain.rs
+++ b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -1917,7 +1917,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             };
         drop(cache_timer);
 
-        // TODO(eip7549) implement electra variant
+        // TODO(electra) implement electra variant
         Ok(Attestation::Base(AttestationBase {
             aggregation_bits: BitList::with_capacity(committee_len)?,
             data: AttestationData {
diff --git a/beacon_node/beacon_chain/src/early_attester_cache.rs b/beacon_node/beacon_chain/src/early_attester_cache.rs
index d7135d94aa..595f941235 100644
--- a/beacon_node/beacon_chain/src/early_attester_cache.rs
+++ b/beacon_node/beacon_chain/src/early_attester_cache.rs
@@ -123,6 +123,7 @@ impl<E: EthSpec> EarlyAttesterCache<E> {
             item.committee_lengths
                 .get_committee_length::<E>(request_slot, request_index, spec)?;
 
+        // TODO(electra) make fork-agnostic
         let attestation = Attestation::Base(AttestationBase {
             aggregation_bits: BitList::with_capacity(committee_len)
                 .map_err(BeaconStateError::from)?,
diff --git a/beacon_node/beacon_chain/src/observed_aggregates.rs b/beacon_node/beacon_chain/src/observed_aggregates.rs
index d1e9b12e27..a83eb62078 100644
--- a/beacon_node/beacon_chain/src/observed_aggregates.rs
+++ b/beacon_node/beacon_chain/src/observed_aggregates.rs
@@ -107,7 +107,7 @@ impl<E: EthSpec> SubsetItem for Attestation<E> {
     fn is_subset(&self, other: &Self::Item) -> bool {
         match self {
             Attestation::Base(att) => att.aggregation_bits.is_subset(other),
-            // TODO(eip7549) implement electra variant
+            // TODO(electra) implement electra variant
             Attestation::Electra(_) => todo!(),
         }
     }
@@ -115,7 +115,7 @@ impl<E: EthSpec> SubsetItem for Attestation<E> {
     fn is_superset(&self, other: &Self::Item) -> bool {
         match self {
             Attestation::Base(att) => other.is_subset(&att.aggregation_bits),
-            // TODO(eip7549) implement electra variant
+            // TODO(electra) implement electra variant
             Attestation::Electra(_) => todo!(),
         }
     }
@@ -124,7 +124,7 @@ impl<E: EthSpec> SubsetItem for Attestation<E> {
     fn get_item(&self) -> Self::Item {
         match self {
             Attestation::Base(att) => att.aggregation_bits.clone(),
-            // TODO(eip7549) implement electra variant
+            // TODO(electra) implement electra variant
             Attestation::Electra(_) => todo!(),
         }
     }
diff --git a/beacon_node/beacon_chain/src/test_utils.rs b/beacon_node/beacon_chain/src/test_utils.rs
index 190c3eac74..4a53f64fca 100644
--- a/beacon_node/beacon_chain/src/test_utils.rs
+++ b/beacon_node/beacon_chain/src/test_utils.rs
@@ -1032,6 +1032,7 @@ where
             *state.get_block_root(target_slot)?
         };
 
+        // TODO(electra) make test fork-agnostic
         Ok(Attestation::Base(AttestationBase {
             aggregation_bits: BitList::with_capacity(committee_len)?,
             data: AttestationData {
@@ -1515,7 +1516,7 @@ where
         attestation_2.data_mut().target.epoch = target2.unwrap_or(fork.epoch);
 
         for attestation in &mut [&mut attestation_1, &mut attestation_2] {
-            // TODO(eip7549) we could explore iter mut here
+            // TODO(electra) we could explore iter mut here
             for i in attestation.attesting_indices_to_vec() {
                 let sk = &self.validator_keypairs[i as usize].sk;
 
diff --git a/beacon_node/http_api/src/block_packing_efficiency.rs b/beacon_node/http_api/src/block_packing_efficiency.rs
index b990ee8297..3e511c25df 100644
--- a/beacon_node/http_api/src/block_packing_efficiency.rs
+++ b/beacon_node/http_api/src/block_packing_efficiency.rs
@@ -132,7 +132,7 @@ impl<E: EthSpec> PackingEfficiencyHandler<E> {
                         }
                     }
                 }
-                // TODO(eip7549) implement electra variant
+                // TODO(electra) implement electra variant
                 Attestation::Electra(_) => {
                     todo!()
                 }
diff --git a/beacon_node/operation_pool/src/attestation.rs b/beacon_node/operation_pool/src/attestation.rs
index 91c628e08d..60074cde74 100644
--- a/beacon_node/operation_pool/src/attestation.rs
+++ b/beacon_node/operation_pool/src/attestation.rs
@@ -177,7 +177,7 @@ pub fn earliest_attestation_validators<E: EthSpec>(
     // Bitfield of validators whose attestations are new/fresh.
     let mut new_validators = match attestation.indexed {
         CompactIndexedAttestation::Base(indexed_att) => indexed_att.aggregation_bits.clone(),
-        // TODO(eip7549) per the comments above, this code path is obsolete post altair fork, so maybe we should just return an empty bitlist here?
+        // TODO(electra) per the comments above, this code path is obsolete post altair fork, so maybe we should just return an empty bitlist here?
         CompactIndexedAttestation::Electra(_) => todo!(),
     };
 
diff --git a/beacon_node/operation_pool/src/attestation_storage.rs b/beacon_node/operation_pool/src/attestation_storage.rs
index e9b9f01af7..90fdf3cdb8 100644
--- a/beacon_node/operation_pool/src/attestation_storage.rs
+++ b/beacon_node/operation_pool/src/attestation_storage.rs
@@ -80,7 +80,7 @@ impl<E: EthSpec> SplitAttestation<E> {
                     index: data.index,
                 })
             }
-            // TODO(eip7549) implement electra variant
+            // TODO(electra) implement electra variant
             Attestation::Electra(_) => todo!(),
         };
 
@@ -157,7 +157,7 @@ impl<E: EthSpec> CompactIndexedAttestation<E> {
             (CompactIndexedAttestation::Electra(_), CompactIndexedAttestation::Electra(_)) => {
                 todo!()
             }
-            // TODO(eip7549) is a mix of electra and base compact indexed attestations an edge case we need to deal with?
+            // TODO(electra) is a mix of electra and base compact indexed attestations an edge case we need to deal with?
             _ => false,
         }
     }
@@ -170,7 +170,7 @@ impl<E: EthSpec> CompactIndexedAttestation<E> {
             (CompactIndexedAttestation::Electra(_), CompactIndexedAttestation::Electra(_)) => {
                 todo!()
             }
-            // TODO(eip7549) is a mix of electra and base compact indexed attestations an edge case we need to deal with?
+            // TODO(electra) is a mix of electra and base compact indexed attestations an edge case we need to deal with?
             _ => (),
         }
     }
diff --git a/consensus/state_processing/src/common/get_attesting_indices.rs b/consensus/state_processing/src/common/get_attesting_indices.rs
index 7a1f9f3f48..6b8ce6f937 100644
--- a/consensus/state_processing/src/common/get_attesting_indices.rs
+++ b/consensus/state_processing/src/common/get_attesting_indices.rs
@@ -32,7 +32,7 @@ pub fn get_attesting_indices_from_state<E: EthSpec>(
         Attestation::Base(att) => {
             get_attesting_indices::<E>(committee.committee, &att.aggregation_bits)
         }
-        // TODO(eip7549) implement get_attesting_indices for electra
+        // TODO(electra) implement get_attesting_indices for electra
         Attestation::Electra(_) => todo!(),
     }
 }
diff --git a/consensus/state_processing/src/common/get_indexed_attestation.rs b/consensus/state_processing/src/common/get_indexed_attestation.rs
index b68d5ab61e..d6c7512961 100644
--- a/consensus/state_processing/src/common/get_indexed_attestation.rs
+++ b/consensus/state_processing/src/common/get_indexed_attestation.rs
@@ -13,7 +13,7 @@ pub fn get_indexed_attestation<E: EthSpec>(
 ) -> Result<IndexedAttestation<E>> {
     let attesting_indices = match attestation {
         Attestation::Base(att) => get_attesting_indices::<E>(committee, &att.aggregation_bits)?,
-        // TODO(eip7549) implement get_attesting_indices for electra
+        // TODO(electra) implement get_attesting_indices for electra
         Attestation::Electra(_) => todo!(),
     };
 
diff --git a/consensus/state_processing/src/per_block_processing/process_operations.rs b/consensus/state_processing/src/per_block_processing/process_operations.rs
index 48b2676c15..cb677f5514 100644
--- a/consensus/state_processing/src/per_block_processing/process_operations.rs
+++ b/consensus/state_processing/src/per_block_processing/process_operations.rs
@@ -95,7 +95,7 @@ pub mod base {
                     }
                 }
                 Attestation::Electra(_) => {
-                    // TODO(eip7549) pending attestations are only phase 0
+                    // TODO(electra) pending attestations are only phase 0
                     // so we should just raise a relevant error here
                     todo!()
                 }
diff --git a/slasher/src/test_utils.rs b/slasher/src/test_utils.rs
index 7ec50ab5ef..c46b2f3949 100644
--- a/slasher/src/test_utils.rs
+++ b/slasher/src/test_utils.rs
@@ -13,6 +13,7 @@ pub fn indexed_att(
     target_epoch: u64,
     target_root: u64,
 ) -> IndexedAttestation<E> {
+    // TODO(electra) make fork-agnostic
     IndexedAttestation::Base(IndexedAttestationBase {
         attesting_indices: attesting_indices.as_ref().to_vec().into(),
         data: AttestationData {
@@ -85,7 +86,7 @@ pub fn slashed_validators_from_attestations(
                 continue;
             }
 
-            // TODO(eip7549) in a nested loop, copying to vecs feels bad
+            // TODO(electra) in a nested loop, copying to vecs feels bad
             let attesting_indices_1 = att1.attesting_indices_to_vec();
             let attesting_indices_2 = att2.attesting_indices_to_vec();