diff --git a/chain/messagepool/messagepool.go b/chain/messagepool/messagepool.go
index 7cd1aaa26..125a83e52 100644
--- a/chain/messagepool/messagepool.go
+++ b/chain/messagepool/messagepool.go
@@ -45,7 +45,7 @@ var (
 )
 
 const (
-	msgTopic = "/fil/messages"
+	msgTopic = "/fil/msgs"
 
 	localMsgsDs = "/mpool/local"
 
diff --git a/node/modules/lp2p/host.go b/node/modules/lp2p/host.go
index af02fdba1..b399618e0 100644
--- a/node/modules/lp2p/host.go
+++ b/node/modules/lp2p/host.go
@@ -21,6 +21,8 @@ import (
 	"github.com/filecoin-project/lotus/node/modules/helpers"
 )
 
+const KadProtocolID = "/fil/kad/1.0.0"
+
 type P2PHostIn struct {
 	fx.In
 
@@ -80,7 +82,7 @@ func DHTRouting(client bool) interface{} {
 			dhtopts.Client(client),
 			dhtopts.Datastore(dstore),
 			dhtopts.Validator(validator),
-			dhtopts.Protocols("/lotus/kad/1.0.0"),
+			dhtopts.Protocols(KadProtocolID),
 		)
 
 		if err != nil {
diff --git a/node/modules/services.go b/node/modules/services.go
index d87058b5d..2969cac37 100644
--- a/node/modules/services.go
+++ b/node/modules/services.go
@@ -24,7 +24,7 @@ import (
 )
 
 const BlocksTopic = "/fil/blocks"
-const MessagesTopic = "/fil/messages"
+const MessagesTopic = "/fil/msgs"
 
 func RunHello(mctx helpers.MetricsCtx, lc fx.Lifecycle, h host.Host, svc *hello.Service) {
 	h.SetStreamHandler(hello.ProtocolID, svc.HandleStream)