diff --git a/daemon/daemon.go b/daemon/daemon.go
index 5b6c32221..03a4d26be 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -151,10 +151,10 @@ func (n *Node) DialSeed() {
 }
 
 func (n *Node) StartRpc() {
-	core.SetPipeBlockStore(n.blockStore)
-	core.SetPipeConsensusState(n.consensusState)
-	core.SetPipeMempoolReactor(n.mempoolReactor)
-	core.SetPipeSwitch(n.sw)
+	core.SetBlockStore(n.blockStore)
+	core.SetConsensusState(n.consensusState)
+	core.SetMempoolReactor(n.mempoolReactor)
+	core.SetSwitch(n.sw)
 	rpc.StartHTTPServer()
 }
 
diff --git a/rpc/core/pipe.go b/rpc/core/pipe.go
index c82783c82..ca2d9db20 100644
--- a/rpc/core/pipe.go
+++ b/rpc/core/pipe.go
@@ -12,18 +12,18 @@ var consensusState *consensus.ConsensusState
 var mempoolReactor *mempl.MempoolReactor
 var p2pSwitch *p2p.Switch
 
-func SetRPCBlockStore(bs *bc.BlockStore) {
+func SetBlockStore(bs *bc.BlockStore) {
 	blockStore = bs
 }
 
-func SetPipeConsensusState(cs *consensus.ConsensusState) {
+func SetConsensusState(cs *consensus.ConsensusState) {
 	consensusState = cs
 }
 
-func SetPipeMempoolReactor(mr *mempl.MempoolReactor) {
+func SetMempoolReactor(mr *mempl.MempoolReactor) {
 	mempoolReactor = mr
 }
 
-func SetPipeSwitch(sw *p2p.Switch) {
+func SetSwitch(sw *p2p.Switch) {
 	p2pSwitch = sw
 }