diff --git a/source/dnode/mgmt/exe/dndMain.c b/source/dnode/mgmt/exe/dmMain.c
similarity index 99%
rename from source/dnode/mgmt/exe/dndMain.c
rename to source/dnode/mgmt/exe/dmMain.c
index 2454375d46..9213090a4e 100644
--- a/source/dnode/mgmt/exe/dndMain.c
+++ b/source/dnode/mgmt/exe/dmMain.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndImp.h"
+#include "dmImp.h"
 #include "tconfig.h"
 
 static struct {
diff --git a/source/dnode/mgmt/implement/inc/dndImp.h b/source/dnode/mgmt/implement/inc/dmImp.h
similarity index 99%
rename from source/dnode/mgmt/implement/inc/dndImp.h
rename to source/dnode/mgmt/implement/inc/dmImp.h
index 804cc43d56..d001c7be98 100644
--- a/source/dnode/mgmt/implement/inc/dndImp.h
+++ b/source/dnode/mgmt/implement/inc/dmImp.h
@@ -16,7 +16,7 @@
 #ifndef _TD_DND_IMP_H_
 #define _TD_DND_IMP_H_
 
-#include "dndInt.h"
+#include "dmInt.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/dnode/mgmt/implement/src/dndEps.c b/source/dnode/mgmt/implement/src/dmEps.c
similarity index 99%
rename from source/dnode/mgmt/implement/src/dndEps.c
rename to source/dnode/mgmt/implement/src/dmEps.c
index 04de19d6a8..31ebb9955f 100644
--- a/source/dnode/mgmt/implement/src/dndEps.c
+++ b/source/dnode/mgmt/implement/src/dmEps.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndImp.h"
+#include "dmImp.h"
 
 static void dmPrintDnodes(SDnodeData *pMgmt);
 static bool dmIsEpChanged(SDnodeData *pMgmt, int32_t dnodeId, const char *ep);
diff --git a/source/dnode/mgmt/implement/src/dndExec.c b/source/dnode/mgmt/implement/src/dmExec.c
similarity index 99%
rename from source/dnode/mgmt/implement/src/dndExec.c
rename to source/dnode/mgmt/implement/src/dmExec.c
index 6e49c588c6..c73e79a2da 100644
--- a/source/dnode/mgmt/implement/src/dndExec.c
+++ b/source/dnode/mgmt/implement/src/dmExec.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndImp.h"
+#include "dmImp.h"
 
 static bool dndRequireNode(SMgmtWrapper *pWrapper) {
   bool    required = false;
diff --git a/source/dnode/mgmt/implement/src/dndHandle.c b/source/dnode/mgmt/implement/src/dmHandle.c
similarity index 99%
rename from source/dnode/mgmt/implement/src/dndHandle.c
rename to source/dnode/mgmt/implement/src/dmHandle.c
index f8e3cc5c0c..1beb36054b 100644
--- a/source/dnode/mgmt/implement/src/dndHandle.c
+++ b/source/dnode/mgmt/implement/src/dmHandle.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndImp.h"
+#include "dmImp.h"
 
 static int32_t dmProcessStatusRsp(SDnode *pDnode, SRpcMsg *pRsp) {
   SDnode *pDnode = pMgmt->pDnode;
diff --git a/source/dnode/mgmt/implement/src/dndMonitor.c b/source/dnode/mgmt/implement/src/dmMonitor.c
similarity index 99%
rename from source/dnode/mgmt/implement/src/dndMonitor.c
rename to source/dnode/mgmt/implement/src/dmMonitor.c
index 73aa8d9424..467aab112b 100644
--- a/source/dnode/mgmt/implement/src/dndMonitor.c
+++ b/source/dnode/mgmt/implement/src/dmMonitor.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndImp.h"
+#include "dmImp.h"
 
 static void dmGetMonitorBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) {
   pInfo->protocol = 1;
diff --git a/source/dnode/mgmt/implement/src/dndObj.c b/source/dnode/mgmt/implement/src/dmObj.c
similarity index 99%
rename from source/dnode/mgmt/implement/src/dndObj.c
rename to source/dnode/mgmt/implement/src/dmObj.c
index 8b20a446db..3e9877292f 100644
--- a/source/dnode/mgmt/implement/src/dndObj.c
+++ b/source/dnode/mgmt/implement/src/dmObj.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndImp.h"
+#include "dmImp.h"
 
 
 static int32_t dndInitVars(SDnode *pDnode, const SDnodeOpt *pOption) {
diff --git a/source/dnode/mgmt/implement/src/dndTransport.c b/source/dnode/mgmt/implement/src/dmTransport.c
similarity index 99%
rename from source/dnode/mgmt/implement/src/dndTransport.c
rename to source/dnode/mgmt/implement/src/dmTransport.c
index bf330b0f7b..a0251a69f5 100644
--- a/source/dnode/mgmt/implement/src/dndTransport.c
+++ b/source/dnode/mgmt/implement/src/dmTransport.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndImp.h"
+#include "dmImp.h"
 
 #define INTERNAL_USER   "_dnd"
 #define INTERNAL_CKEY   "_key"
diff --git a/source/dnode/mgmt/implement/src/dndWorker.c b/source/dnode/mgmt/implement/src/dmWorker.c
similarity index 99%
rename from source/dnode/mgmt/implement/src/dndWorker.c
rename to source/dnode/mgmt/implement/src/dmWorker.c
index 975150e230..9c32d0bda6 100644
--- a/source/dnode/mgmt/implement/src/dndWorker.c
+++ b/source/dnode/mgmt/implement/src/dmWorker.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndImp.h"
+#include "dmImp.h"
 
 static void *dmStatusThreadFp(void *param) {
   SDnode *pDnode = param;
diff --git a/source/dnode/mgmt/interface/inc/dndDef.h b/source/dnode/mgmt/interface/inc/dmDef.h
similarity index 99%
rename from source/dnode/mgmt/interface/inc/dndDef.h
rename to source/dnode/mgmt/interface/inc/dmDef.h
index 077b15d021..26d7d42af9 100644
--- a/source/dnode/mgmt/interface/inc/dndDef.h
+++ b/source/dnode/mgmt/interface/inc/dmDef.h
@@ -16,7 +16,7 @@
 #ifndef _TD_DND_DEF_H_
 #define _TD_DND_DEF_H_
 
-#include "dndLog.h"
+#include "dmLog.h"
 
 #include "cJSON.h"
 #include "tcache.h"
diff --git a/source/dnode/mgmt/interface/inc/dndInt.h b/source/dnode/mgmt/interface/inc/dmInt.h
similarity index 98%
rename from source/dnode/mgmt/interface/inc/dndInt.h
rename to source/dnode/mgmt/interface/inc/dmInt.h
index b178a64d35..7b633671f8 100644
--- a/source/dnode/mgmt/interface/inc/dndInt.h
+++ b/source/dnode/mgmt/interface/inc/dmInt.h
@@ -16,7 +16,7 @@
 #ifndef _TD_DND_INT_H_
 #define _TD_DND_INT_H_
 
-#include "dndDef.h"
+#include "dmDef.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/dnode/mgmt/interface/inc/dndLog.h b/source/dnode/mgmt/interface/inc/dmLog.h
similarity index 100%
rename from source/dnode/mgmt/interface/inc/dndLog.h
rename to source/dnode/mgmt/interface/inc/dmLog.h
diff --git a/source/dnode/mgmt/interface/src/dndEnv.c b/source/dnode/mgmt/interface/src/dmEnv.c
similarity index 98%
rename from source/dnode/mgmt/interface/src/dndEnv.c
rename to source/dnode/mgmt/interface/src/dmEnv.c
index 9f75594335..e7dc0e3e77 100644
--- a/source/dnode/mgmt/interface/src/dndEnv.c
+++ b/source/dnode/mgmt/interface/src/dmEnv.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndInt.h"
+#include "dmInt.h"
 #include "wal.h"
 
 static int8_t once = DND_ENV_INIT;
diff --git a/source/dnode/mgmt/interface/src/dndFile.c b/source/dnode/mgmt/interface/src/dmFile.c
similarity index 99%
rename from source/dnode/mgmt/interface/src/dndFile.c
rename to source/dnode/mgmt/interface/src/dmFile.c
index 0358e90fb3..70dbcc009f 100644
--- a/source/dnode/mgmt/interface/src/dndFile.c
+++ b/source/dnode/mgmt/interface/src/dmFile.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndInt.h"
+#include "dmInt.h"
 
 #define MAXLEN 1024
 
diff --git a/source/dnode/mgmt/interface/src/dndInt.c b/source/dnode/mgmt/interface/src/dmInt.c
similarity index 99%
rename from source/dnode/mgmt/interface/src/dndInt.c
rename to source/dnode/mgmt/interface/src/dmInt.c
index 88312202b6..eab6c074b6 100644
--- a/source/dnode/mgmt/interface/src/dndInt.c
+++ b/source/dnode/mgmt/interface/src/dmInt.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dndInt.h"
+#include "dmInt.h"
 
 const char *dndStatName(EDndRunStatus status) {
   switch (status) {
diff --git a/source/dnode/mgmt/mgmt_bnode/inc/bmInt.h b/source/dnode/mgmt/mgmt_bnode/inc/bmInt.h
index 3158fe7d34..8a7442efc3 100644
--- a/source/dnode/mgmt/mgmt_bnode/inc/bmInt.h
+++ b/source/dnode/mgmt/mgmt_bnode/inc/bmInt.h
@@ -16,7 +16,7 @@
 #ifndef _TD_DND_BNODE_INT_H_
 #define _TD_DND_BNODE_INT_H_
 
-#include "dndInt.h"
+#include "dmInt.h"
 
 #include "bnode.h"
 
diff --git a/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h b/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h
index d744d981bf..0742d2b9f9 100644
--- a/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h
+++ b/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h
@@ -16,7 +16,7 @@
 #ifndef _TD_DND_MNODE_INT_H_
 #define _TD_DND_MNODE_INT_H_
 
-#include "dndInt.h"
+#include "dmInt.h"
 
 #include "mnode.h"
 
diff --git a/source/dnode/mgmt/mgmt_qnode/inc/qmInt.h b/source/dnode/mgmt/mgmt_qnode/inc/qmInt.h
index 2bf2509b07..c0ed6599bd 100644
--- a/source/dnode/mgmt/mgmt_qnode/inc/qmInt.h
+++ b/source/dnode/mgmt/mgmt_qnode/inc/qmInt.h
@@ -16,7 +16,7 @@
 #ifndef _TD_DND_QNODE_INT_H_
 #define _TD_DND_QNODE_INT_H_
 
-#include "dndInt.h"
+#include "dmInt.h"
 
 #include "qnode.h"
 
diff --git a/source/dnode/mgmt/mgmt_snode/inc/smInt.h b/source/dnode/mgmt/mgmt_snode/inc/smInt.h
index 697477ef42..5045f21272 100644
--- a/source/dnode/mgmt/mgmt_snode/inc/smInt.h
+++ b/source/dnode/mgmt/mgmt_snode/inc/smInt.h
@@ -16,7 +16,7 @@
 #ifndef _TD_DND_SNODE_INT_H_
 #define _TD_DND_SNODE_INT_H_
 
-#include "dndInt.h"
+#include "dmInt.h"
 
 #include "snode.h"
 
diff --git a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
index 00cd0e2b86..ab8328d038 100644
--- a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
+++ b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
@@ -16,7 +16,7 @@
 #ifndef _TD_DND_VNODES_INT_H_
 #define _TD_DND_VNODES_INT_H_
 
-#include "dndInt.h"
+#include "dmInt.h"
 
 #include "sync.h"
 #include "vnode.h"