diff --git a/eth2/block_producer/Cargo.toml b/eth2/block_proposer/Cargo.toml
similarity index 91%
rename from eth2/block_producer/Cargo.toml
rename to eth2/block_proposer/Cargo.toml
index 15d1343cc1..81f1ccc286 100644
--- a/eth2/block_producer/Cargo.toml
+++ b/eth2/block_proposer/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "block_producer"
+name = "block_proposer"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
diff --git a/eth2/block_producer/src/lib.rs b/eth2/block_proposer/src/lib.rs
similarity index 97%
rename from eth2/block_producer/src/lib.rs
rename to eth2/block_proposer/src/lib.rs
index 7b15eb4e9e..cf71edd99f 100644
--- a/eth2/block_producer/src/lib.rs
+++ b/eth2/block_proposer/src/lib.rs
@@ -236,7 +236,7 @@ mod tests {
         epoch_map.map.insert(produce_epoch, produce_slot);
         let epoch_map = Arc::new(epoch_map);
 
-        let mut block_producer = BlockProducer::new(
+        let mut block_proposer = BlockProducer::new(
             spec.clone(),
             epoch_map.clone(),
             slot_clock.clone(),
@@ -251,28 +251,28 @@ mod tests {
         // One slot before production slot...
         slot_clock.set_slot(produce_slot.as_u64() - 1);
         assert_eq!(
-            block_producer.poll(),
+            block_proposer.poll(),
             Ok(PollOutcome::BlockProductionNotRequired(produce_slot - 1))
         );
 
         // On the produce slot...
         slot_clock.set_slot(produce_slot.as_u64());
         assert_eq!(
-            block_producer.poll(),
+            block_proposer.poll(),
             Ok(PollOutcome::BlockProduced(produce_slot.into()))
         );
 
         // Trying the same produce slot again...
         slot_clock.set_slot(produce_slot.as_u64());
         assert_eq!(
-            block_producer.poll(),
+            block_proposer.poll(),
             Ok(PollOutcome::SlotAlreadyProcessed(produce_slot))
         );
 
         // One slot after the produce slot...
         slot_clock.set_slot(produce_slot.as_u64() + 1);
         assert_eq!(
-            block_producer.poll(),
+            block_proposer.poll(),
             Ok(PollOutcome::BlockProductionNotRequired(produce_slot + 1))
         );
 
@@ -280,7 +280,7 @@ mod tests {
         let slot = (produce_epoch.as_u64() + 1) * spec.epoch_length;
         slot_clock.set_slot(slot);
         assert_eq!(
-            block_producer.poll(),
+            block_proposer.poll(),
             Ok(PollOutcome::ProducerDutiesUnknown(Slot::new(slot)))
         );
     }
diff --git a/eth2/block_producer/src/test_utils/epoch_map.rs b/eth2/block_proposer/src/test_utils/epoch_map.rs
similarity index 100%
rename from eth2/block_producer/src/test_utils/epoch_map.rs
rename to eth2/block_proposer/src/test_utils/epoch_map.rs
diff --git a/eth2/block_producer/src/test_utils/local_signer.rs b/eth2/block_proposer/src/test_utils/local_signer.rs
similarity index 100%
rename from eth2/block_producer/src/test_utils/local_signer.rs
rename to eth2/block_proposer/src/test_utils/local_signer.rs
diff --git a/eth2/block_producer/src/test_utils/mod.rs b/eth2/block_proposer/src/test_utils/mod.rs
similarity index 100%
rename from eth2/block_producer/src/test_utils/mod.rs
rename to eth2/block_proposer/src/test_utils/mod.rs
diff --git a/eth2/block_producer/src/test_utils/simulated_beacon_node.rs b/eth2/block_proposer/src/test_utils/simulated_beacon_node.rs
similarity index 100%
rename from eth2/block_producer/src/test_utils/simulated_beacon_node.rs
rename to eth2/block_proposer/src/test_utils/simulated_beacon_node.rs
diff --git a/eth2/block_producer/src/traits.rs b/eth2/block_proposer/src/traits.rs
similarity index 100%
rename from eth2/block_producer/src/traits.rs
rename to eth2/block_proposer/src/traits.rs