diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
index 3f5d9a4bc5..77a252b9e2 100644
--- a/beacon_node/beacon_chain/src/beacon_chain.rs
+++ b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -3354,11 +3354,9 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                 }
             }
             // TODO(gloas) handle data column reconstruction for gloas.
-            ReconstructionOutcome::Payload(_data_column_reconstruction_result) => {
-                return Err(BlockError::InternalError(
-                    "Not yet implemented for gloas".to_owned(),
-                ));
-            }
+            ReconstructionOutcome::Payload(_data_column_reconstruction_result) => Err(
+                BlockError::InternalError("Not yet implemented for gloas".to_owned()),
+            ),
         }
     }
 
diff --git a/beacon_node/beacon_chain/src/data_availability_checker_v2.rs b/beacon_node/beacon_chain/src/data_availability_checker_v2/mod.rs
similarity index 99%
rename from beacon_node/beacon_chain/src/data_availability_checker_v2.rs
rename to beacon_node/beacon_chain/src/data_availability_checker_v2/mod.rs
index d499ef35ce..65e22d0a2f 100644
--- a/beacon_node/beacon_chain/src/data_availability_checker_v2.rs
+++ b/beacon_node/beacon_chain/src/data_availability_checker_v2/mod.rs
@@ -1,4 +1,4 @@
-use crate::data_availability_checker_v2::overflow_lru_cache::{
+use crate::data_availability_checker_v2::pending_components_cache::{
     DataAvailabilityCheckerInner, ReconstructColumnsDecision,
 };
 
@@ -18,7 +18,7 @@ use types::{
     SignedExecutionPayloadBid, Slot,
 };
 
-mod overflow_lru_cache;
+mod pending_components_cache;
 
 use crate::data_column_verification::{
     GossipVerifiedDataColumn, KzgVerifiedCustodyDataColumn, KzgVerifiedDataColumn,
diff --git a/beacon_node/beacon_chain/src/data_availability_checker_v2/overflow_lru_cache.rs b/beacon_node/beacon_chain/src/data_availability_checker_v2/pending_components_cache.rs
similarity index 100%
rename from beacon_node/beacon_chain/src/data_availability_checker_v2/overflow_lru_cache.rs
rename to beacon_node/beacon_chain/src/data_availability_checker_v2/pending_components_cache.rs
diff --git a/beacon_node/beacon_chain/src/test_utils.rs b/beacon_node/beacon_chain/src/test_utils.rs
index d9d5a2f289..2bf04a8401 100644
--- a/beacon_node/beacon_chain/src/test_utils.rs
+++ b/beacon_node/beacon_chain/src/test_utils.rs
@@ -24,7 +24,7 @@ use bls::get_withdrawal_credentials;
 use bls::{
     AggregateSignature, Keypair, PublicKey, PublicKeyBytes, SecretKey, Signature, SignatureBytes,
 };
-use eth2::types::{GraffitiPolicy, SignedBlockContentsTuple, SignedPayloadEnvelopeContentsTuple};
+use eth2::types::{GraffitiPolicy, SignedBlockContentsTuple};
 use execution_layer::test_utils::generate_genesis_header;
 use execution_layer::{
     ExecutionLayer,