diff --git a/src/fullnode.rs b/src/fullnode.rs
index 6598c43d66..02450e18d2 100644
--- a/src/fullnode.rs
+++ b/src/fullnode.rs
@@ -11,8 +11,8 @@ use crate::rpc_service::JsonRpcService;
 use crate::rpc_subscriptions::RpcSubscriptions;
 use crate::service::Service;
 use crate::storage_stage::StorageState;
-use crate::tpu::{Tpu, TpuRotationReceiver};
-use crate::tvu::{Sockets, Tvu};
+use crate::tpu::Tpu;
+use crate::tvu::{Sockets, Tvu, TvuRotationReceiver};
 use crate::voting_keypair::VotingKeypair;
 use log::Level;
 use solana_metrics::counter::Counter;
@@ -104,7 +104,7 @@ pub struct Fullnode {
     tpu_sockets: Vec<UdpSocket>,
     broadcast_socket: UdpSocket,
     node_services: NodeServices,
-    rotation_receiver: TpuRotationReceiver,
+    rotation_receiver: TvuRotationReceiver,
     blocktree: Arc<Blocktree>,
     leader_scheduler: Arc<RwLock<LeaderScheduler>>,
 }
diff --git a/src/tpu.rs b/src/tpu.rs
index 5df7af75d5..0274b96fd8 100644
--- a/src/tpu.rs
+++ b/src/tpu.rs
@@ -17,14 +17,10 @@ use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::mpsc::{channel, Receiver, Sender};
+use std::sync::mpsc::channel;
 use std::sync::{Arc, RwLock};
 use std::thread;
 
-pub type TpuReturnType = u64; // tick_height to initiate a rotation
-pub type TpuRotationSender = Sender<TpuReturnType>;
-pub type TpuRotationReceiver = Receiver<TpuReturnType>;
-
 pub enum TpuMode {
     Leader(LeaderServices),
     Forwarder(ForwarderServices),
diff --git a/src/tvu.rs b/src/tvu.rs
index 83ee3a2019..707669deab 100644
--- a/src/tvu.rs
+++ b/src/tvu.rs
@@ -22,20 +22,19 @@ use crate::retransmit_stage::RetransmitStage;
 use crate::rpc_subscriptions::RpcSubscriptions;
 use crate::service::Service;
 use crate::storage_stage::{StorageStage, StorageState};
-use crate::tpu::{TpuReturnType, TpuRotationReceiver, TpuRotationSender};
 use crate::voting_keypair::VotingKeypair;
 use solana_runtime::bank::Bank;
 use solana_sdk::hash::Hash;
 use solana_sdk::signature::{Keypair, KeypairUtil};
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::mpsc::{channel, Receiver};
+use std::sync::mpsc::{channel, Receiver, Sender};
 use std::sync::{Arc, RwLock};
 use std::thread;
 
-pub type TvuReturnType = TpuReturnType;
-pub type TvuRotationSender = TpuRotationSender;
-pub type TvuRotationReceiver = TpuRotationReceiver;
+pub type TvuReturnType = u64; // tick_height to initiate a rotation
+pub type TvuRotationSender = Sender<TvuReturnType>;
+pub type TvuRotationReceiver = Receiver<TvuReturnType>;
 
 pub struct Tvu {
     fetch_stage: BlobFetchStage,