diff --git a/validator_client/src/block_producer_service/grpc.rs b/validator_client/src/block_producer_service/beacon_block_grpc_client.rs
similarity index 100%
rename from validator_client/src/block_producer_service/grpc.rs
rename to validator_client/src/block_producer_service/beacon_block_grpc_client.rs
diff --git a/validator_client/src/block_producer_service/service.rs b/validator_client/src/block_producer_service/block_producer_service.rs
similarity index 100%
rename from validator_client/src/block_producer_service/service.rs
rename to validator_client/src/block_producer_service/block_producer_service.rs
diff --git a/validator_client/src/block_producer_service/mod.rs b/validator_client/src/block_producer_service/mod.rs
index a4ddf760a4..52aac688ba 100644
--- a/validator_client/src/block_producer_service/mod.rs
+++ b/validator_client/src/block_producer_service/mod.rs
@@ -1,5 +1,5 @@
-mod grpc;
-mod service;
+mod beacon_block_grpc_client;
+mod block_producer_service;
 
-pub use self::grpc::BeaconBlockGrpcClient;
-pub use self::service::BlockProducerService;
+pub use self::beacon_block_grpc_client::BeaconBlockGrpcClient;
+pub use self::block_producer_service::BlockProducerService;
diff --git a/validator_client/src/duties/duties_map.rs b/validator_client/src/duties/epoch_duties.rs
similarity index 100%
rename from validator_client/src/duties/duties_map.rs
rename to validator_client/src/duties/epoch_duties.rs
diff --git a/validator_client/src/duties/mod.rs b/validator_client/src/duties/mod.rs
index c9ebda249b..711a1e29c6 100644
--- a/validator_client/src/duties/mod.rs
+++ b/validator_client/src/duties/mod.rs
@@ -1,12 +1,12 @@
-mod duties_map;
+mod epoch_duties;
 mod grpc;
 mod service;
 #[cfg(test)]
 mod test_node;
 mod traits;
 
-pub use self::duties_map::EpochDutiesMap;
-use self::duties_map::{EpochDuties, EpochDutiesMapError};
+pub use self::epoch_duties::EpochDutiesMap;
+use self::epoch_duties::{EpochDuties, EpochDutiesMapError};
 pub use self::service::DutiesManagerService;
 use self::traits::{BeaconNode, BeaconNodeError};
 use bls::PublicKey;