diff --git a/Cargo.toml b/Cargo.toml
index 5ab0ba8471..302c041549 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
 	"eth2/attester",
-	"eth2/block_producer",
+	"eth2/block_proposer",
 	"eth2/fork_choice",
 	"eth2/state_processing",
 	"eth2/types",
diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml
index 36d7b37211..4ce894477d 100644
--- a/beacon_node/beacon_chain/Cargo.toml
+++ b/beacon_node/beacon_chain/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
 [dependencies]
-block_producer = { path = "../../eth2/block_producer" }
+block_proposer = { path = "../../eth2/block_proposer" }
 bls = { path = "../../eth2/utils/bls" }
 boolean-bitfield = { path = "../../eth2/utils/boolean-bitfield" }
 db = { path = "../db" }
diff --git a/beacon_node/beacon_chain/test_harness/Cargo.toml b/beacon_node/beacon_chain/test_harness/Cargo.toml
index bb335c1526..77b52ccf67 100644
--- a/beacon_node/beacon_chain/test_harness/Cargo.toml
+++ b/beacon_node/beacon_chain/test_harness/Cargo.toml
@@ -14,7 +14,7 @@ criterion = "0.2"
 [dependencies]
 attester = { path = "../../../eth2/attester" }
 beacon_chain = { path = "../../beacon_chain" }
-block_producer = { path = "../../../eth2/block_producer" }
+block_proposer = { path = "../../../eth2/block_proposer" }
 bls = { path = "../../../eth2/utils/bls" }
 boolean-bitfield = { path = "../../../eth2/utils/boolean-bitfield" }
 db = { path = "../../db" }
diff --git a/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_beacon_node.rs b/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_beacon_node.rs
index be71b9abd8..06d3e7c72d 100644
--- a/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_beacon_node.rs
+++ b/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_beacon_node.rs
@@ -3,7 +3,7 @@ use attester::{
     PublishOutcome as AttestationPublishOutcome,
 };
 use beacon_chain::BeaconChain;
-use block_producer::{
+use block_proposer::{
     BeaconNode as BeaconBlockNode, BeaconNodeError as BeaconBlockNodeError,
     PublishOutcome as BlockPublishOutcome,
 };
diff --git a/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_duties.rs b/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_duties.rs
index 66b9d650c2..5bed595311 100644
--- a/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_duties.rs
+++ b/beacon_node/beacon_chain/test_harness/src/validator_harness/direct_duties.rs
@@ -2,7 +2,7 @@ use attester::{
     DutiesReader as AttesterDutiesReader, DutiesReaderError as AttesterDutiesReaderError,
 };
 use beacon_chain::BeaconChain;
-use block_producer::{
+use block_proposer::{
     DutiesReader as ProducerDutiesReader, DutiesReaderError as ProducerDutiesReaderError,
 };
 use db::ClientDB;
diff --git a/beacon_node/beacon_chain/test_harness/src/validator_harness/local_signer.rs b/beacon_node/beacon_chain/test_harness/src/validator_harness/local_signer.rs
index 8e901b057b..aa46a1c9a4 100644
--- a/beacon_node/beacon_chain/test_harness/src/validator_harness/local_signer.rs
+++ b/beacon_node/beacon_chain/test_harness/src/validator_harness/local_signer.rs
@@ -1,5 +1,5 @@
 use attester::Signer as AttesterSigner;
-use block_producer::Signer as BlockProposerSigner;
+use block_proposer::Signer as BlockProposerSigner;
 use std::sync::RwLock;
 use types::{Keypair, Signature};
 
diff --git a/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs b/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs
index 3df32fa643..f483095415 100644
--- a/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs
+++ b/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs
@@ -5,8 +5,8 @@ mod local_signer;
 use attester::PollOutcome as AttestationPollOutcome;
 use attester::{Attester, Error as AttestationPollError};
 use beacon_chain::BeaconChain;
-use block_producer::PollOutcome as BlockPollOutcome;
-use block_producer::{BlockProducer, Error as BlockPollError};
+use block_proposer::PollOutcome as BlockPollOutcome;
+use block_proposer::{BlockProducer, Error as BlockPollError};
 use db::MemoryDB;
 use direct_beacon_node::DirectBeaconNode;
 use direct_duties::DirectDuties;
diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml
index 8ab515e15d..f76772f28f 100644
--- a/validator_client/Cargo.toml
+++ b/validator_client/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
 [dependencies]
-block_producer = { path = "../eth2/block_producer" }
+block_proposer = { path = "../eth2/block_proposer" }
 bls = { path = "../eth2/utils/bls" }
 clap = "2.32.0"
 dirs = "1.0.3"
diff --git a/validator_client/src/block_producer_service/beacon_block_grpc_client.rs b/validator_client/src/block_producer_service/beacon_block_grpc_client.rs
index 39ef7fcdc9..6bf3005d45 100644
--- a/validator_client/src/block_producer_service/beacon_block_grpc_client.rs
+++ b/validator_client/src/block_producer_service/beacon_block_grpc_client.rs
@@ -1,4 +1,4 @@
-use block_producer::{BeaconNode, BeaconNodeError, PublishOutcome};
+use block_proposer::{BeaconNode, BeaconNodeError, PublishOutcome};
 use protos::services::{
     BeaconBlock as GrpcBeaconBlock, ProduceBeaconBlockRequest, PublishBeaconBlockRequest,
 };
diff --git a/validator_client/src/block_producer_service/mod.rs b/validator_client/src/block_producer_service/mod.rs
index 82c3f2537f..bd1e691cbb 100644
--- a/validator_client/src/block_producer_service/mod.rs
+++ b/validator_client/src/block_producer_service/mod.rs
@@ -1,7 +1,7 @@
 mod beacon_block_grpc_client;
 // mod block_producer_service;
 
-use block_producer::{
+use block_proposer::{
     BeaconNode, BlockProducer, DutiesReader, PollOutcome as BlockProducerPollOutcome, Signer,
 };
 use slog::{error, info, warn, Logger};
diff --git a/validator_client/src/duties/epoch_duties.rs b/validator_client/src/duties/epoch_duties.rs
index b555eee28c..54a882f8d4 100644
--- a/validator_client/src/duties/epoch_duties.rs
+++ b/validator_client/src/duties/epoch_duties.rs
@@ -1,4 +1,4 @@
-use block_producer::{DutiesReader, DutiesReaderError};
+use block_proposer::{DutiesReader, DutiesReaderError};
 use std::collections::HashMap;
 use std::sync::RwLock;
 use types::{Epoch, Slot};
diff --git a/validator_client/src/main.rs b/validator_client/src/main.rs
index 98be9159a8..c835300b56 100644
--- a/validator_client/src/main.rs
+++ b/validator_client/src/main.rs
@@ -1,7 +1,7 @@
 use self::block_producer_service::{BeaconBlockGrpcClient, BlockProducerService};
 use self::duties::{DutiesManager, DutiesManagerService, EpochDutiesMap};
 use crate::config::ClientConfig;
-use block_producer::{test_utils::LocalSigner, BlockProducer};
+use block_proposer::{test_utils::LocalSigner, BlockProducer};
 use bls::Keypair;
 use clap::{App, Arg};
 use grpcio::{ChannelBuilder, EnvBuilder};