diff --git a/beacon_node/beacon_chain/src/fork_choice.rs b/beacon_node/beacon_chain/src/fork_choice.rs
index 0e117f2069..22cbff6621 100644
--- a/beacon_node/beacon_chain/src/fork_choice.rs
+++ b/beacon_node/beacon_chain/src/fork_choice.rs
@@ -1,7 +1,7 @@
 mod checkpoint_manager;
 
 use crate::{errors::BeaconChainError, metrics, BeaconChain, BeaconChainTypes};
-use checkpoint_manager::{CheckpointBalances, CheckpointManager};
+use checkpoint_manager::{CheckpointManager, CheckpointWithBalances};
 use parking_lot::RwLock;
 use proto_array_fork_choice::ProtoArrayForkChoice;
 use ssz_derive::{Decode, Encode};
@@ -59,7 +59,7 @@ impl<T: BeaconChainTypes> ForkChoice<T> {
         genesis_block_root: Hash256,
         genesis_state: &BeaconState<T::EthSpec>,
     ) -> Self {
-        let genesis_checkpoint = CheckpointBalances {
+        let genesis_checkpoint = CheckpointWithBalances {
             epoch: genesis_state.current_epoch(),
             root: genesis_block_root,
             balances: genesis_state.balances.clone().into(),
diff --git a/beacon_node/beacon_chain/src/fork_choice/checkpoint_manager.rs b/beacon_node/beacon_chain/src/fork_choice/checkpoint_manager.rs
index e8065c8ae2..9e59da6ea4 100644
--- a/beacon_node/beacon_chain/src/fork_choice/checkpoint_manager.rs
+++ b/beacon_node/beacon_chain/src/fork_choice/checkpoint_manager.rs
@@ -5,13 +5,13 @@ use ssz_derive::{Decode, Encode};
 use types::{BeaconState, Checkpoint, Epoch, EthSpec, Hash256, Slot};
 
 #[derive(PartialEq, Clone, Encode, Decode)]
-pub struct CheckpointBalances {
+pub struct CheckpointWithBalances {
     pub epoch: Epoch,
     pub root: Hash256,
     pub balances: Vec<u64>,
 }
 
-impl Into<Checkpoint> for CheckpointBalances {
+impl Into<Checkpoint> for CheckpointWithBalances {
     fn into(self) -> Checkpoint {
         Checkpoint {
             epoch: self.epoch,
@@ -22,7 +22,7 @@ impl Into<Checkpoint> for CheckpointBalances {
 
 #[derive(PartialEq, Clone, Encode, Decode)]
 pub struct FFGCheckpoints {
-    pub justified: CheckpointBalances,
+    pub justified: CheckpointWithBalances,
     pub finalized: Checkpoint,
 }
 
@@ -34,7 +34,7 @@ pub struct CheckpointManager {
 }
 
 impl CheckpointManager {
-    pub fn new(genesis_checkpoint: CheckpointBalances) -> Self {
+    pub fn new(genesis_checkpoint: CheckpointWithBalances) -> Self {
         let ffg_checkpoint = FFGCheckpoints {
             justified: genesis_checkpoint.clone(),
             finalized: genesis_checkpoint.into(),
@@ -87,7 +87,7 @@ impl CheckpointManager {
             && state.finalized_checkpoint.epoch >= self.current.finalized.epoch
         {
             let candidate = FFGCheckpoints {
-                justified: CheckpointBalances {
+                justified: CheckpointWithBalances {
                     epoch: state.current_justified_checkpoint.epoch,
                     root: state.current_justified_checkpoint.root,
                     balances: state.balances.clone().into(),