diff --git a/source/server/dnode/inc/dnodeCheck.h b/source/server/dnode/inc/dnodeCheck.h
index b6fbf1eabd5f2322c0b31192c2b11c7b976f28fc..97ac524b3f5d8cc38c7918d48a678f0cfabefbb4 100644
--- a/source/server/dnode/inc/dnodeCheck.h
+++ b/source/server/dnode/inc/dnodeCheck.h
@@ -21,7 +21,6 @@ extern "C" {
 #endif
 #include "dnodeInt.h"
 
-
 int32_t dnodeInitCheck();
 void    dnodeCleanupCheck();
 
diff --git a/source/server/dnode/inc/dnodeEps.h b/source/server/dnode/inc/dnodeDnodeEps.h
similarity index 81%
rename from source/server/dnode/inc/dnodeEps.h
rename to source/server/dnode/inc/dnodeDnodeEps.h
index 4f25884021648377392016fe7daced6e9b0b4a00..01023da7fc8e246bc19a2b66fae7a3cb93951168 100644
--- a/source/server/dnode/inc/dnodeEps.h
+++ b/source/server/dnode/inc/dnodeDnodeEps.h
@@ -13,17 +13,17 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_DNODE_EPS_H_
-#define _TD_DNODE_EPS_H_
+#ifndef _TD_DNODE_DNODE_EPS_H_
+#define _TD_DNODE_DNODE_EPS_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 #include "dnodeInt.h"
 
-int32_t dnodeInitEps();
-void    dnodeCleanupEps();
-void    dnodeUpdateEps(SDnodeEps *data);
+int32_t dnodeInitDnodeEps();
+void    dnodeCleanupDnodeEps();
+void    dnodeUpdateDnodeEps(SDnodeEps *data);
 bool    dnodeIsDnodeEpChanged(int32_t dnodeId, char *epstr);
 void    dnodeGetDnodeEp(int32_t dnodeId, char *epstr, char *fqdn, uint16_t *port);
 
@@ -31,4 +31,4 @@ void    dnodeGetDnodeEp(int32_t dnodeId, char *epstr, char *fqdn, uint16_t *port
 }
 #endif
 
-#endif /*_TD_DNODE_EPS_H_*/
\ No newline at end of file
+#endif /*_TD_DNODE_DNODE_EPS_H_*/
\ No newline at end of file
diff --git a/source/server/dnode/inc/dnodeMain.h b/source/server/dnode/inc/dnodeMain.h
index 325136caa6cfe158bc90ce918dc15270ca51fae9..b3aeeceb443f5bf7e57f94e4b9100f541c30b656 100644
--- a/source/server/dnode/inc/dnodeMain.h
+++ b/source/server/dnode/inc/dnodeMain.h
@@ -25,7 +25,7 @@ typedef enum {
   DN_RUN_STAT_INIT,
   DN_RUN_STAT_RUNNING,
   DN_RUN_STAT_STOPPED
-} EDnRunStat;
+} EDnStat;
 
 int32_t dnodeInitMain();
 void    dnodeCleanupMain();
@@ -36,7 +36,7 @@ void    dnodeReportStartupFinished(char *name, char *desc);
 void    dnodeProcessStartupReq(SRpcMsg *pMsg);
 void    dnodeProcessCreateMnodeReq(SRpcMsg *pMsg);
 void    dnodeProcessConfigDnodeReq(SRpcMsg *pMsg);
-EDnRunStat dnodeGetRunStat();
+EDnStat dnodeGetRunStat();
 void    dnodeSetRunStat();
 void*   dnodeGetTimer();
 
diff --git a/source/server/dnode/src/dnodeEps.c b/source/server/dnode/src/dnodeDnodeEps.c
similarity index 98%
rename from source/server/dnode/src/dnodeEps.c
rename to source/server/dnode/src/dnodeDnodeEps.c
index d5bb77bde674325d59ba4443b66c457aefb8493b..15c084439fe742515311193943140cbf73c6cf60 100644
--- a/source/server/dnode/src/dnodeEps.c
+++ b/source/server/dnode/src/dnodeDnodeEps.c
@@ -18,7 +18,7 @@
 #include "cJSON.h"
 #include "thash.h"
 #include "tglobal.h"
-#include "dnodeEps.h"
+#include "dnodeDnodeEps.h"
 #include "dnodeCfg.h"
 
 static struct {
@@ -192,7 +192,7 @@ static int32_t dnodeWriteEps() {
   return 0;
 }
 
-int32_t dnodeInitEps() {
+int32_t dnodeInitDnodeEps() {
   tsDeps.dnodeHash = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, HASH_ENTRY_LOCK);
   if (tsDeps.dnodeHash == NULL) return -1;
 
@@ -209,7 +209,7 @@ int32_t dnodeInitEps() {
   return ret;
 }
 
-void dnodeCleanupEps() {
+void dnodeCleanupDnodeEps() {
   pthread_mutex_lock(&tsDeps.mutex);
 
   if (tsDeps.dnodeList != NULL) {
@@ -227,7 +227,7 @@ void dnodeCleanupEps() {
   pthread_mutex_destroy(&tsDeps.mutex);
 }
 
-void dnodeUpdateEps(SDnodeEps *data) {
+void dnodeUpdateDnodeEps(SDnodeEps *data) {
   if (data == NULL || data->dnodeNum <= 0) return;
 
   data->dnodeNum = htonl(data->dnodeNum);
diff --git a/source/server/dnode/src/dnodeInt.c b/source/server/dnode/src/dnodeInt.c
index 4dbf02a868197541bb3a8fe7b2e843cca12755cb..5f0dcc630ba06561e0b2a25923e3cee3d04d1507 100644
--- a/source/server/dnode/src/dnodeInt.c
+++ b/source/server/dnode/src/dnodeInt.c
@@ -24,7 +24,7 @@
 #include "tstep.h"
 #include "dnodeCfg.h"
 #include "dnodeCheck.h"
-#include "dnodeEps.h"
+#include "dnodeDnodeEps.h"
 #include "dnodeMain.h"
 #include "dnodeMnodeEps.h"
 #include "dnodeStatus.h"
@@ -64,7 +64,7 @@ int32_t dnodeInit() {
   taosStepAdd(tsSteps, "dnode-rpc", rpcInit, rpcCleanup);
   taosStepAdd(tsSteps, "dnode-check", dnodeInitCheck, dnodeCleanupCheck);
   taosStepAdd(tsSteps, "dnode-cfg", dnodeInitCfg, dnodeCleanupCfg);
-  taosStepAdd(tsSteps, "dnode-deps", dnodeInitEps, dnodeCleanupEps);
+  taosStepAdd(tsSteps, "dnode-deps", dnodeInitDnodeEps, dnodeCleanupDnodeEps);
   taosStepAdd(tsSteps, "dnode-meps", dnodeInitMnodeEps, dnodeCleanupMnodeEps);
   //taosStepAdd(tsSteps, "dnode-wal", walInit, walCleanUp);
   //taosStepAdd(tsSteps, "dnode-sync", syncInit, syncCleanUp);
diff --git a/source/server/dnode/src/dnodeMain.c b/source/server/dnode/src/dnodeMain.c
index 50702823f1d32b6f602bfaf6959374f89e7e54c2..74309dda69ab5122480a1b75f7fa7b6e4c56d3c8 100644
--- a/source/server/dnode/src/dnodeMain.c
+++ b/source/server/dnode/src/dnodeMain.c
@@ -29,7 +29,7 @@
 #include "mnode.h"
 
 static struct {
-  EDnRunStat      runStatus;
+  EDnStat      runStatus;
   void *       dnodeTimer;
   SStartupStep startup;
 } tsDmain;
@@ -260,8 +260,8 @@ void dnodeProcessConfigDnodeReq(SRpcMsg *pMsg) {
   rpcFreeCont(pMsg->pCont);
 }
 
-EDnRunStat dnodeGetRunStat() { return tsDmain.runStatus; }
+EDnStat dnodeGetRunStat() { return tsDmain.runStatus; }
 
-void dnodeSetRunStat(EDnRunStat stat) { tsDmain.runStatus = stat; }
+void dnodeSetRunStat(EDnStat stat) { tsDmain.runStatus = stat; }
 
 void* dnodeGetTimer() { return tsDmain.dnodeTimer; }
\ No newline at end of file
diff --git a/source/server/dnode/src/dnodeMnodeEps.c b/source/server/dnode/src/dnodeMnodeEps.c
index 5646fd5363984d63097b0b099fe9bbd9437bcbc2..f34ee482386b6438dfe263f07edad325c0cfd5f5 100644
--- a/source/server/dnode/src/dnodeMnodeEps.c
+++ b/source/server/dnode/src/dnodeMnodeEps.c
@@ -18,7 +18,7 @@
 #include "cJSON.h"
 #include "tglobal.h"
 #include "dnodeCfg.h"
-#include "dnodeEps.h"
+#include "dnodeDnodeEps.h"
 #include "dnodeMnodeEps.h"
 #include "mnode.h"
 
diff --git a/source/server/dnode/src/dnodeStatus.c b/source/server/dnode/src/dnodeStatus.c
index 38b685c1fb3d11915fed28d5c1621b83ed4376c9..4edcc2e8c2dea5e39f54e72ab0b1e5a6dba45ea9 100644
--- a/source/server/dnode/src/dnodeStatus.c
+++ b/source/server/dnode/src/dnodeStatus.c
@@ -19,7 +19,7 @@
 #include "ttimer.h"
 #include "tglobal.h"
 #include "dnodeCfg.h"
-#include "dnodeEps.h"
+#include "dnodeDnodeEps.h"
 #include "dnodeMnodeEps.h"
 #include "dnodeStatus.h"
 #include "dnodeMain.h"
@@ -114,7 +114,7 @@ void dnodeProcessStatusRsp(SRpcMsg *pMsg) {
   vnodeSetAccess(pStatusRsp->vgAccess, pCfg->numOfVnodes);
 
   SDnodeEps *pEps = (SDnodeEps *)((char *)pStatusRsp->vgAccess + pCfg->numOfVnodes * sizeof(SVgroupAccess));
-  dnodeUpdateEps(pEps);
+  dnodeUpdateDnodeEps(pEps);
 
   taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsStatus.dnodeTimer, &tsStatus.statusTimer);
 }