diff --git a/crates/mempool_node/src/components.rs b/crates/mempool_node/src/components.rs
index 228883ac8d..111fbbce78 100644
--- a/crates/mempool_node/src/components.rs
+++ b/crates/mempool_node/src/components.rs
@@ -5,7 +5,7 @@ use starknet_consensus_manager::consensus_manager::ConsensusManager;
 use starknet_gateway::gateway::{create_gateway, Gateway};
 use starknet_http_server::http_server::{create_http_server, HttpServer};
 use starknet_mempool::communication::{create_mempool, MempoolCommunicationWrapper};
-use starknet_mempool_p2p::sender::EmptyMempoolP2pPropagatorClient;
+use starknet_mempool_p2p::propagator::EmptyMempoolP2pPropagatorClient;
 use starknet_monitoring_endpoint::monitoring_endpoint::{
     create_monitoring_endpoint,
     MonitoringEndpoint,
diff --git a/crates/mempool_p2p/src/lib.rs b/crates/mempool_p2p/src/lib.rs
index a00e9ee38f..109d78801e 100644
--- a/crates/mempool_p2p/src/lib.rs
+++ b/crates/mempool_p2p/src/lib.rs
@@ -1,14 +1,14 @@
 pub mod config;
-pub mod receiver;
-pub mod sender;
+pub mod propagator;
+pub mod runner;
 
 use papyrus_network::gossipsub_impl::Topic;
 use papyrus_network::network_manager::{BroadcastTopicChannels, NetworkManager};
 use starknet_gateway_types::communication::SharedGatewayClient;
 
 use crate::config::MempoolP2pConfig;
-use crate::receiver::MempoolP2pRunner;
-use crate::sender::MempoolP2pPropagator;
+use crate::propagator::MempoolP2pPropagator;
+use crate::runner::MempoolP2pRunner;
 
 const MEMPOOL_TOPIC: &str = "starknet_mempool_transaction_propagation/0.1.0";
 
diff --git a/crates/mempool_p2p/src/sender/mod.rs b/crates/mempool_p2p/src/propagator/mod.rs
similarity index 100%
rename from crates/mempool_p2p/src/sender/mod.rs
rename to crates/mempool_p2p/src/propagator/mod.rs
diff --git a/crates/mempool_p2p/src/sender/test.rs b/crates/mempool_p2p/src/propagator/test.rs
similarity index 98%
rename from crates/mempool_p2p/src/sender/test.rs
rename to crates/mempool_p2p/src/propagator/test.rs
index e207e655f4..155e832060 100644
--- a/crates/mempool_p2p/src/sender/test.rs
+++ b/crates/mempool_p2p/src/propagator/test.rs
@@ -13,7 +13,7 @@ use starknet_mempool_p2p_types::communication::MempoolP2pPropagatorRequest;
 use starknet_sequencer_infra::component_definitions::ComponentRequestHandler;
 use tokio::time::timeout;
 
-use crate::sender::MempoolP2pPropagator;
+use super::MempoolP2pPropagator;
 
 const TIMEOUT: std::time::Duration = std::time::Duration::from_secs(1);
 
diff --git a/crates/mempool_p2p/src/receiver/mod.rs b/crates/mempool_p2p/src/runner/mod.rs
similarity index 100%
rename from crates/mempool_p2p/src/receiver/mod.rs
rename to crates/mempool_p2p/src/runner/mod.rs
diff --git a/crates/mempool_p2p/src/receiver/test.rs b/crates/mempool_p2p/src/runner/test.rs
similarity index 98%
rename from crates/mempool_p2p/src/receiver/test.rs
rename to crates/mempool_p2p/src/runner/test.rs
index b44ecbb015..e64f272c32 100644
--- a/crates/mempool_p2p/src/receiver/test.rs
+++ b/crates/mempool_p2p/src/runner/test.rs
@@ -22,7 +22,7 @@ use starknet_gateway_types::gateway_types::GatewayInput;
 use starknet_sequencer_infra::component_definitions::ComponentStarter;
 use tokio::time::sleep;
 
-use crate::receiver::MempoolP2pRunner;
+use super::MempoolP2pRunner;
 
 // TODO(eitan): Make it an automock
 #[derive(Clone)]