diff --git a/source/dnode/mgmt/bnode/inc/bmHandle.h b/source/dnode/mgmt/bnode/inc/bmMsg.h
similarity index 100%
rename from source/dnode/mgmt/bnode/inc/bmHandle.h
rename to source/dnode/mgmt/bnode/inc/bmMsg.h
diff --git a/source/dnode/mgmt/bnode/src/bmInt.c b/source/dnode/mgmt/bnode/src/bmInt.c
index a9beff5756fb2bfbc754b93265a7c4d7fc952223..6241b2e8b21db1653b8266492737b89ce5724909 100644
--- a/source/dnode/mgmt/bnode/src/bmInt.c
+++ b/source/dnode/mgmt/bnode/src/bmInt.c
@@ -15,7 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "bmInt.h"
-#include "bmHandle.h"
+#include "bmMsg.h"
 
 bool bmRequireNode(SMgmtWrapper *pWrapper) { return false; }
 
diff --git a/source/dnode/mgmt/bnode/src/bmHandle.c b/source/dnode/mgmt/bnode/src/bmMsg.c
similarity index 97%
rename from source/dnode/mgmt/bnode/src/bmHandle.c
rename to source/dnode/mgmt/bnode/src/bmMsg.c
index 0c656398a15be6f685e15701f1d8ddc8ead0f4ea..5cf19016561d01fd341929c3ce96461139891458 100644
--- a/source/dnode/mgmt/bnode/src/bmHandle.c
+++ b/source/dnode/mgmt/bnode/src/bmMsg.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "bmHandle.h"
+#include "bmMsg.h"
 #include "bmWorker.h"
 
 int32_t bmProcessCreateReq(SDnode *pDnode, SRpcMsg *pRpcMsg) {return 0;}
diff --git a/source/dnode/mgmt/mnode/inc/mmInt.h b/source/dnode/mgmt/mnode/inc/mmInt.h
index fee2b6512655e06f4a9cc1d8738f030cc0b719c1..1f7d94aa2768b9604352f7c640dc3c7e436dcddd 100644
--- a/source/dnode/mgmt/mnode/inc/mmInt.h
+++ b/source/dnode/mgmt/mnode/inc/mmInt.h
@@ -22,30 +22,26 @@
 extern "C" {
 #endif
 
-
-
 typedef struct SMnodeMgmt {
   int32_t      refCount;
   int8_t       deployed;
   int8_t       dropped;
+  int8_t       replica;
+  int8_t       selfIndex;
+  SReplica     replicas[TSDB_MAX_REPLICA];
   SMnode      *pMnode;
+  SProcObj    *pProcess;
+  bool         singleProc;
   SRWLatch     latch;
   SDnodeWorker readWorker;
   SDnodeWorker writeWorker;
   SDnodeWorker syncWorker;
-  int8_t       replica;
-  int8_t       selfIndex;
-  SReplica     replicas[TSDB_MAX_REPLICA];
-
-  //
-  SProcObj *pProcess;
-  bool      singleProc;
 } SMnodeMgmt;
 
-
-// interface
+// mmInt.h
 void mmGetMgmtFp(SMgmtWrapper *pMgmt);
 
+// mmMgmt.h
 int32_t mmInit(SDnode *pDnode);
 void    mmCleanup(SDnode *pDnode);
 
diff --git a/source/dnode/mgmt/mnode/inc/mmHandle.h b/source/dnode/mgmt/mnode/inc/mmMsg.h
similarity index 92%
rename from source/dnode/mgmt/mnode/inc/mmHandle.h
rename to source/dnode/mgmt/mnode/inc/mmMsg.h
index 2206e382ce876c0c79001df18b4505caec9ac108..620d2903e4c8525031934838db00f9f24eabc32f 100644
--- a/source/dnode/mgmt/mnode/inc/mmHandle.h
+++ b/source/dnode/mgmt/mnode/inc/mmMsg.h
@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_DND_MNODE_HANDLE_H_
-#define _TD_DND_MNODE_HANDLE_H_
+#ifndef _TD_DND_MNODE_MSG_H_
+#define _TD_DND_MNODE_MSG_H_
 
 #include "mmInt.h"
 
@@ -36,4 +36,4 @@ int32_t mmGetMonitorInfo(SDnode *pDnode, SMonClusterInfo *pClusterInfo, SMonVgro
 }
 #endif
 
-#endif /*_TD_DND_MNODE_HANDLE_H_*/
\ No newline at end of file
+#endif /*_TD_DND_MNODE_MSG_H_*/
\ No newline at end of file
diff --git a/source/dnode/mgmt/mnode/src/mmInt.c b/source/dnode/mgmt/mnode/src/mmInt.c
index a2118c4d44386f53973ee9c79e2c2026c456821d..77d94ffef5c4b6ec1167a0d85834431056792bf8 100644
--- a/source/dnode/mgmt/mnode/src/mmInt.c
+++ b/source/dnode/mgmt/mnode/src/mmInt.c
@@ -15,7 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "mmInt.h"
-#include "mmHandle.h"
+#include "mmMsg.h"
 
 bool mmRequireNode(SMgmtWrapper *pWrapper) { return false; }
 
diff --git a/source/dnode/mgmt/mnode/src/mmHandle.c b/source/dnode/mgmt/mnode/src/mmMsg.c
similarity index 99%
rename from source/dnode/mgmt/mnode/src/mmHandle.c
rename to source/dnode/mgmt/mnode/src/mmMsg.c
index 9ad4a7937b0fb14ccbb9e1916c79d625c5e94a60..389ebfe8535383b86a86661cc92546cb930095d1 100644
--- a/source/dnode/mgmt/mnode/src/mmHandle.c
+++ b/source/dnode/mgmt/mnode/src/mmMsg.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "mmHandle.h"
+#include "mmMsg.h"
 #include "mmWorker.h"
 
 #if 0
diff --git a/source/dnode/mgmt/qnode/inc/qmHandle.h b/source/dnode/mgmt/qnode/inc/qmMsg.h
similarity index 100%
rename from source/dnode/mgmt/qnode/inc/qmHandle.h
rename to source/dnode/mgmt/qnode/inc/qmMsg.h
diff --git a/source/dnode/mgmt/qnode/src/qmInt.c b/source/dnode/mgmt/qnode/src/qmInt.c
index 9059942a3a4a07ce0fb84afbae0ee04363b779b0..ae7fce26cfcaef29729b9caa636f057cb72fc771 100644
--- a/source/dnode/mgmt/qnode/src/qmInt.c
+++ b/source/dnode/mgmt/qnode/src/qmInt.c
@@ -15,7 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "qmInt.h"
-#include "qmHandle.h"
+#include "qmMsg.h"
 
 bool qmRequireNode(SMgmtWrapper *pWrapper) { return false; }
 
diff --git a/source/dnode/mgmt/qnode/src/qmHandle.c b/source/dnode/mgmt/qnode/src/qmMsg.c
similarity index 97%
rename from source/dnode/mgmt/qnode/src/qmHandle.c
rename to source/dnode/mgmt/qnode/src/qmMsg.c
index d04650913ab3bc2c16365e7a00ca1c65eca4b149..af0747a357834142440532c8622c2188f114ef8b 100644
--- a/source/dnode/mgmt/qnode/src/qmHandle.c
+++ b/source/dnode/mgmt/qnode/src/qmMsg.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "qmHandle.h"
+#include "qmMsg.h"
 #include "qmWorker.h"
 
 int32_t qmProcessCreateReq(SDnode *pDnode, SRpcMsg *pRpcMsg) {return 0;}
diff --git a/source/dnode/mgmt/snode/inc/smHandle.h b/source/dnode/mgmt/snode/inc/smMsg.h
similarity index 100%
rename from source/dnode/mgmt/snode/inc/smHandle.h
rename to source/dnode/mgmt/snode/inc/smMsg.h
diff --git a/source/dnode/mgmt/snode/src/smInt.c b/source/dnode/mgmt/snode/src/smInt.c
index eb0db21f031e9dd1b58400a1704e194f5dfc6ea7..0b367d26609c8a871d426d736c34700fa1faa2db 100644
--- a/source/dnode/mgmt/snode/src/smInt.c
+++ b/source/dnode/mgmt/snode/src/smInt.c
@@ -15,7 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "smInt.h"
-#include "smHandle.h"
+#include "smMsg.h"
 
 bool smRequireNode(SMgmtWrapper *pWrapper) { return false; }
 
diff --git a/source/dnode/mgmt/snode/src/smHandle.c b/source/dnode/mgmt/snode/src/smMsg.c
similarity index 97%
rename from source/dnode/mgmt/snode/src/smHandle.c
rename to source/dnode/mgmt/snode/src/smMsg.c
index a9a73199fbf6257367ac6c053d5ddb221d32ff30..44bc8fe329ab694622bff845cf82f6de6d3a6174 100644
--- a/source/dnode/mgmt/snode/src/smHandle.c
+++ b/source/dnode/mgmt/snode/src/smMsg.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "smHandle.h"
+#include "smMsg.h"
 #include "smWorker.h"
 
 int32_t smProcessCreateReq(SDnode *pDnode, SRpcMsg *pRpcMsg) {return 0;}
diff --git a/source/dnode/mgmt/vnode/inc/vmHandle.h b/source/dnode/mgmt/vnode/inc/vmMsg.h
similarity index 100%
rename from source/dnode/mgmt/vnode/inc/vmHandle.h
rename to source/dnode/mgmt/vnode/inc/vmMsg.h
diff --git a/source/dnode/mgmt/vnode/src/vmInt.c b/source/dnode/mgmt/vnode/src/vmInt.c
index 6be4e877441c07097f020177658f17577405ea3f..966b06c85c61d7a5916cd6bd0fa1966e0afabab8 100644
--- a/source/dnode/mgmt/vnode/src/vmInt.c
+++ b/source/dnode/mgmt/vnode/src/vmInt.c
@@ -15,7 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "vmInt.h"
-#include "vmHandle.h"
+#include "vmMsg.h"
 #include "vmMgmt.h"
 
 static int32_t vmInit(SMgmtWrapper *pWrapper) {
diff --git a/source/dnode/mgmt/vnode/src/vmHandle.c b/source/dnode/mgmt/vnode/src/vmMsg.c
similarity index 99%
rename from source/dnode/mgmt/vnode/src/vmHandle.c
rename to source/dnode/mgmt/vnode/src/vmMsg.c
index 629b2c086ef0658feefbfa63af800902ab70800d..2bdd44b50396f768a17d86de0b253abdf353c333 100644
--- a/source/dnode/mgmt/vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/vnode/src/vmMsg.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "vmHandle.h"
+#include "vmMsg.h"
 #include "vmWorker.h"