diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c
index 00c8d776190fc2cff077fd9be87e8ac966f4d5cd..d6af2f59dc293ae78f7c2c74f5a5637f5bbf509a 100644
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -209,16 +209,16 @@ void tscKillStream(STscObj *pObj, uint32_t killId) {
 }
 
 char *tscBuildQueryStreamDesc(char *pMsg, STscObj *pObj) {
-  SQqueryList *pQList = (SQqueryList *)pMsg;
+  SCMQqueryList *pQList = (SCMQqueryList *)pMsg;
   char *  pMax = pMsg + TSDB_PAYLOAD_SIZE - 256;
 
-  SQueryDesc *pQdesc = pQList->qdesc;
+  SCMQueryDesc *pQdesc = pQList->qdesc;
   pQList->numOfQueries = 0;
 
   // We extract the lock to tscBuildHeartBeatMsg function.
   /* pthread_mutex_lock (&pObj->mutex); */
 
-  pMsg += sizeof(SQqueryList);
+  pMsg += sizeof(SCMQqueryList);
   SSqlObj *pSql = pObj->sqlList;
   while (pSql) {
     /*
@@ -239,15 +239,15 @@ char *tscBuildQueryStreamDesc(char *pMsg, STscObj *pObj) {
     pQList->numOfQueries++;
     pQdesc++;
     pSql = pSql->next;
-    pMsg += sizeof(SQueryDesc);
+    pMsg += sizeof(SCMQueryDesc);
     if (pMsg > pMax) break;
   }
 
-  SStreamList *pSList = (SStreamList *)pMsg;
-  SStreamDesc *pSdesc = pSList->sdesc;
+  SCMStreamList *pSList = (SCMStreamList *)pMsg;
+  SCMStreamDesc *pSdesc = pSList->sdesc;
   pSList->numOfStreams = 0;
 
-  pMsg += sizeof(SStreamList);
+  pMsg += sizeof(SCMStreamList);
   SSqlStream *pStream = pObj->streamList;
   while (pStream) {
     strncpy(pSdesc->sql, pStream->pSql->sqlstr, TSDB_SHOW_SQL_LEN - 1);
@@ -265,7 +265,7 @@ char *tscBuildQueryStreamDesc(char *pMsg, STscObj *pObj) {
     pSList->numOfStreams++;
     pSdesc++;
     pStream = pStream->next;
-    pMsg += sizeof(SStreamDesc);
+    pMsg += sizeof(SCMStreamDesc);
     if (pMsg > pMax) break;
   }
 
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index e1076eee101513dd2a62d67330eb171abbe715c7..24a6cb61786d4484ff4101278cf621ae92f2518b 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -116,7 +116,7 @@ void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) {
   SSqlRes *pRes = &pSql->res;
 
   if (code == 0) {
-    SHeartBeatRsp *pRsp = (SHeartBeatRsp *)pRes->pRsp;
+    SCMHeartBeatRsp *pRsp = (SCMHeartBeatRsp *)pRes->pRsp;
     SRpcIpSet *      pIpList = &pRsp->ipList;
     tscSetMgmtIpList(pIpList);
 
@@ -1693,13 +1693,13 @@ int32_t tscBuildCreateDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
 int32_t tscBuildAcctMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SSqlCmd *pCmd = &pSql->cmd;
-  pCmd->payloadLen = sizeof(SCreateAcctMsg);
+  pCmd->payloadLen = sizeof(SCMCreateAcctMsg);
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
     tscError("%p failed to malloc for query msg", pSql);
     return TSDB_CODE_CLI_OUT_OF_MEMORY;
   }
 
-  SCreateAcctMsg *pAlterMsg = (SCreateAcctMsg *)pCmd->payload;
+  SCMCreateAcctMsg *pAlterMsg = (SCMCreateAcctMsg *)pCmd->payload;
 
   SSQLToken *pName = &pInfo->pDCLInfo->user.user;
   SSQLToken *pPwd = &pInfo->pDCLInfo->user.passwd;
@@ -1737,13 +1737,13 @@ int32_t tscBuildAcctMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 }
 
 int32_t tscBuildUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SCreateUserMsg *pAlterMsg;
+  SCMCreateUserMsg *pAlterMsg;
   char *         pMsg, *pStart;
 
   SSqlCmd *pCmd = &pSql->cmd;
 
   pMsg = doBuildMsgHeader(pSql, &pStart);
-  pAlterMsg = (SCreateUserMsg *)pMsg;
+  pAlterMsg = (SCMCreateUserMsg *)pMsg;
 
   SUserInfo *pUser = &pInfo->pDCLInfo->user;
   strncpy(pAlterMsg->user, pUser->user.z, pUser->user.n);
@@ -1758,7 +1758,7 @@ int32_t tscBuildUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
     strncpy(pAlterMsg->pass, pUser->passwd.z, pUser->passwd.n);
   }
 
-  pMsg += sizeof(SCreateUserMsg);
+  pMsg += sizeof(SCMCreateUserMsg);
   pCmd->payloadLen = pMsg - pStart;
 
   if (pUser->type == TSDB_ALTER_USER_PASSWD || pUser->type == TSDB_ALTER_USER_PRIVILEGES) {
@@ -1871,18 +1871,18 @@ int32_t tscBuildDropDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 }
 
 int32_t tscBuildDropAcctMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SDropUserMsg *pDropMsg;
+  SCMDropUserMsg *pDropMsg;
   char *        pMsg, *pStart;
 
   SSqlCmd *pCmd = &pSql->cmd;
 
   pMsg = doBuildMsgHeader(pSql, &pStart);
-  pDropMsg = (SDropUserMsg *)pMsg;
+  pDropMsg = (SCMDropUserMsg *)pMsg;
 
   SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
   strcpy(pDropMsg->user, pMeterMetaInfo->name);
 
-  pMsg += sizeof(SDropUserMsg);
+  pMsg += sizeof(SCMDropUserMsg);
 
   pCmd->payloadLen = pMsg - pStart;
   pCmd->msgType = TSDB_MSG_TYPE_DROP_USER;
@@ -2334,14 +2334,14 @@ int tscBuildConnectMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   STscObj *pObj = pSql->pTscObj;
   SSqlCmd *pCmd = &pSql->cmd;
   pCmd->msgType = TSDB_MSG_TYPE_CONNECT;
-  pCmd->payloadLen = sizeof(SConnectMsg);
+  pCmd->payloadLen = sizeof(SCMConnectMsg);
 
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
     tscError("%p failed to malloc for query msg", pSql);
     return TSDB_CODE_CLI_OUT_OF_MEMORY;
   }
 
-  SConnectMsg *pConnect = (SConnectMsg*)pCmd->payload;
+  SCMConnectMsg *pConnect = (SCMConnectMsg*)pCmd->payload;
 
   char *db;  // ugly code to move the space
   db = strstr(pObj->db, TS_PATH_DELIMITER);
@@ -2611,18 +2611,18 @@ int tscEstimateHeartBeatMsgLength(SSqlObj *pSql) {
   STscObj *pObj = pSql->pTscObj;
 
   size += tsRpcHeadSize + sizeof(SMgmtHead);
-  size += sizeof(SQqueryList);
+  size += sizeof(SCMQqueryList);
 
   SSqlObj *tpSql = pObj->sqlList;
   while (tpSql) {
-    size += sizeof(SQueryDesc);
+    size += sizeof(SCMQueryDesc);
     tpSql = tpSql->next;
   }
 
-  size += sizeof(SStreamList);
+  size += sizeof(SCMStreamList);
   SSqlStream *pStream = pObj->streamList;
   while (pStream) {
-    size += sizeof(SStreamDesc);
+    size += sizeof(SCMStreamDesc);
     pStream = pStream->next;
   }
 
@@ -3043,7 +3043,7 @@ int tscProcessConnectRsp(SSqlObj *pSql) {
   STscObj *pObj = pSql->pTscObj;
   SSqlRes *pRes = &pSql->res;
 
-  SConnectRsp *pConnect = (SConnectRsp *)pRes->pRsp;
+  SCMConnectRsp *pConnect = (SCMConnectRsp *)pRes->pRsp;
   strcpy(pObj->acctId, pConnect->acctId);  // copy acctId from response
   int32_t len = sprintf(temp, "%s%s%s", pObj->acctId, TS_PATH_DELIMITER, pObj->db);
 
@@ -3051,7 +3051,7 @@ int tscProcessConnectRsp(SSqlObj *pSql) {
   strncpy(pObj->db, temp, tListLen(pObj->db));
   
 //  SIpList *    pIpList;
-//  char *rsp = pRes->pRsp + sizeof(SConnectRsp);
+//  char *rsp = pRes->pRsp + sizeof(SCMConnectRsp);
 //  pIpList = (SIpList *)rsp;
 //  tscSetMgmtIpList(pIpList);
 
diff --git a/src/inc/mnode.h b/src/inc/mnode.h
index 8fb82b2bfcec815042885f367c3aa3846b9cb51d..b4691de04e962d340862e7b2b99690ca85d069e8 100644
--- a/src/inc/mnode.h
+++ b/src/inc/mnode.h
@@ -257,8 +257,8 @@ typedef struct _user_obj {
   char              updateEnd[1];
   struct _user_obj *prev, *next;
   struct _acctObj * pAcct;
-  SQqueryList *   pQList;  // query list
-  SStreamList *   pSList;  // stream list
+  SCMQqueryList *   pQList;  // query list
+  SCMStreamList *   pSList;  // stream list
 } SUserObj;
 
 typedef struct {
@@ -282,7 +282,7 @@ typedef struct {
 typedef struct _acctObj {
   char      user[TSDB_USER_LEN];
   char      pass[TSDB_KEY_LEN];
-  SAcctCfg  cfg;
+  SCMAcctCfg  cfg;
   int32_t   acctId;
   int64_t   createdTime;
   int8_t    reserved[15];
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 0a0203606b4d71375a5c6489f590d9eccf1a6e65..2138272fc7ea99c23937a1dfa2dc8820e3236618 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -315,7 +315,7 @@ typedef struct {
   char clientVersion[TSDB_VERSION_LEN];
   char msgVersion[TSDB_VERSION_LEN];
   char db[TSDB_TABLE_ID_LEN];
-} SConnectMsg;
+} SCMConnectMsg;
 
 typedef struct {
   char      acctId[TSDB_ACCT_LEN];
@@ -323,7 +323,7 @@ typedef struct {
   int8_t    writeAuth;
   int8_t    superAuth;
   SRpcIpSet ipList;
-} SConnectRsp;
+} SCMConnectRsp;
 
 typedef struct {
   int32_t maxUsers;
@@ -337,24 +337,24 @@ typedef struct {
   int64_t maxInbound;
   int64_t maxOutbound;
   int8_t  accessState;   // Configured only by command
-} SAcctCfg;
+} SCMAcctCfg;
 
 typedef struct {
   char       user[TSDB_USER_LEN];
   char       pass[TSDB_KEY_LEN];
-  SAcctCfg cfg;
-} SCreateAcctMsg, SAlterAcctMsg;
+  SCMAcctCfg cfg;
+} SCMCreateAcctMsg, SCMAlterAcctMsg;
 
 typedef struct {
   char user[TSDB_USER_LEN];
-} SDropUserMsg, SDropAcctMsg;
+} SCMDropUserMsg, SCMDropAcctMsg;
 
 typedef struct {
   char   user[TSDB_USER_LEN];
   char   pass[TSDB_KEY_LEN];
   int8_t privilege;
   int8_t flag;
-} SCreateUserMsg, SAlterUserMsg;
+} SCMCreateUserMsg, SCMAlterUserMsg;
 
 typedef struct {
   char db[TSDB_TABLE_ID_LEN];
@@ -785,7 +785,7 @@ typedef struct {
   uint32_t queryId;
   int64_t  useconds;
   int64_t  stime;
-} SQueryDesc;
+} SCMQueryDesc;
 
 typedef struct {
   char     sql[TSDB_SHOW_SQL_LEN];
@@ -796,29 +796,29 @@ typedef struct {
   int64_t  stime;
   int64_t  slidingTime;
   int64_t  interval;
-} SStreamDesc;
+} SCMStreamDesc;
 
 typedef struct {
   int32_t numOfQueries;
-  SQueryDesc  qdesc[];
-} SQqueryList;
+  SCMQueryDesc  qdesc[];
+} SCMQqueryList;
 
 typedef struct {
   int32_t numOfStreams;
-  SStreamDesc  sdesc[];
-} SStreamList;
+  SCMStreamDesc  sdesc[];
+} SCMStreamList;
 
 typedef struct {
-  SQqueryList qlist;
-  SStreamList slist;
-} SHeartBeatMsg;
+  SCMQqueryList qlist;
+  SCMStreamList slist;
+} SCMHeartBeatMsg;
 
 typedef struct {
   uint32_t  queryId;
   uint32_t  streamId;
   int8_t    killConnection;
   SRpcIpSet ipList;
-} SHeartBeatRsp;
+} SCMHeartBeatRsp;
 
 typedef struct {
   uint64_t handle;
diff --git a/src/mnode/inc/mgmtProfile.h b/src/mnode/inc/mgmtProfile.h
index beeefacffacb4b3d41ac2cc336c10a77cf51b73f..bb5e518cc7e6bc7b3a46e07492fae014dd945a78 100644
--- a/src/mnode/inc/mgmtProfile.h
+++ b/src/mnode/inc/mgmtProfile.h
@@ -30,7 +30,7 @@ int32_t mgmtRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, void *pCo
 
 int32_t mgmtRetrieveStreams(SShowObj *pShow, char *data, int32_t rows, void *pConn);
 
-int32_t mgmtSaveQueryStreamList(SHeartBeatMsg *pHBMsg);
+int32_t mgmtSaveQueryStreamList(SCMHeartBeatMsg *pHBMsg);
 
 int32_t mgmtKillQuery(char *qidstr, void *pConn);
 
diff --git a/src/mnode/src/mgmtProfile.c b/src/mnode/src/mgmtProfile.c
index 82b1429617bb84bec10d531c05c2e2572707a308..64d0c9467ce1c753767b8606b1a08f913bfae439 100644
--- a/src/mnode/src/mgmtProfile.c
+++ b/src/mnode/src/mgmtProfile.c
@@ -32,7 +32,7 @@ typedef struct {
   int32_t      numOfQueries;
   SCDesc * connInfo;
   SCDesc **cdesc;
-  SQueryDesc   qdesc[];
+  SCMQueryDesc   qdesc[];
 } SQueryShow;
 
 typedef struct {
@@ -40,10 +40,10 @@ typedef struct {
   int32_t      numOfStreams;
   SCDesc * connInfo;
   SCDesc **cdesc;
-  SStreamDesc   sdesc[];
+  SCMStreamDesc   sdesc[];
 } SStreamShow;
 
-int32_t  mgmtSaveQueryStreamList(SHeartBeatMsg *pHBMsg) {
+int32_t  mgmtSaveQueryStreamList(SCMHeartBeatMsg *pHBMsg) {
 //  SAcctObj *pAcct = pConn->pAcct;
 //
 //  if (contLen <= 0 || pAcct == NULL) {
@@ -60,7 +60,7 @@ int32_t  mgmtSaveQueryStreamList(SHeartBeatMsg *pHBMsg) {
 //  pConn->pQList = realloc(pConn->pQList, contLen);
 //  memcpy(pConn->pQList, cont, contLen);
 //
-//  pConn->pSList = (SStreamList *)(((char *)pConn->pQList) + pConn->pQList->numOfQueries * sizeof(SQueryDesc) + sizeof(SQqueryList));
+//  pConn->pSList = (SCMStreamList *)(((char *)pConn->pQList) + pConn->pQList->numOfQueries * sizeof(SCMQueryDesc) + sizeof(SCMQqueryList));
 //
 //  pAcct->acctInfo.numOfQueries += pConn->pQList->numOfQueries;
 //  pAcct->acctInfo.numOfStreams += pConn->pSList->numOfStreams;
@@ -76,7 +76,7 @@ int32_t mgmtGetQueries(SShowObj *pShow, void *pConn) {
 //
 //  pthread_mutex_lock(&pAcct->mutex);
 //
-//  pQueryShow = malloc(sizeof(SQueryDesc) * pAcct->acctInfo.numOfQueries + sizeof(SQueryShow));
+//  pQueryShow = malloc(sizeof(SCMQueryDesc) * pAcct->acctInfo.numOfQueries + sizeof(SQueryShow));
 //  pQueryShow->numOfQueries = 0;
 //  pQueryShow->index = 0;
 //  pQueryShow->connInfo = NULL;
@@ -87,7 +87,7 @@ int32_t mgmtGetQueries(SShowObj *pShow, void *pConn) {
 //    pQueryShow->cdesc = (SCDesc **)malloc(pAcct->acctInfo.numOfQueries * sizeof(SCDesc *));
 //
 //    pConn = pAcct->pConn;
-//    SQueryDesc * pQdesc = pQueryShow->qdesc;
+//    SCMQueryDesc * pQdesc = pQueryShow->qdesc;
 //    SCDesc * pCDesc = pQueryShow->connInfo;
 //    SCDesc **ppCDesc = pQueryShow->cdesc;
 //
@@ -97,7 +97,7 @@ int32_t mgmtGetQueries(SShowObj *pShow, void *pConn) {
 //        pCDesc->port = pConn->port;
 //        strcpy(pCDesc->user, pConn->pUser->user);
 //
-//        memcpy(pQdesc, pConn->pQList->qdesc, sizeof(SQueryDesc) * pConn->pQList->numOfQueries);
+//        memcpy(pQdesc, pConn->pQList->qdesc, sizeof(SCMQueryDesc) * pConn->pQList->numOfQueries);
 //        pQdesc += pConn->pQList->numOfQueries;
 //        pQueryShow->numOfQueries += pConn->pQList->numOfQueries;
 //        for (int32_t i = 0; i < pConn->pQList->numOfQueries; ++i, ++ppCDesc) *ppCDesc = pCDesc;
@@ -193,7 +193,7 @@ int32_t mgmtKillQuery(char *qidstr, void *pConn) {
 //  while (pConn) {
 //    if (pConn->ip == ip && pConn->port == port && pConn->pQList) {
 //      int32_t     i;
-//      SQueryDesc *pQDesc = pConn->pQList->qdesc;
+//      SCMQueryDesc *pQDesc = pConn->pQList->qdesc;
 //      for (i = 0; i < pConn->pQList->numOfQueries; ++i, ++pQDesc) {
 //        if (pQDesc->queryId == queryId) break;
 //      }
@@ -229,7 +229,7 @@ int32_t mgmtRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, void *pCo
   if (rows > pQueryShow->numOfQueries - pQueryShow->index) rows = pQueryShow->numOfQueries - pQueryShow->index;
 
   while (numOfRows < rows) {
-    SQueryDesc *pNode = pQueryShow->qdesc + pQueryShow->index;
+    SCMQueryDesc *pNode = pQueryShow->qdesc + pQueryShow->index;
     SCDesc *pCDesc = pQueryShow->cdesc[pQueryShow->index];
     cols = 0;
 
@@ -275,7 +275,7 @@ int32_t mgmtGetStreams(SShowObj *pShow, void *pConn) {
 //
 //  pthread_mutex_lock(&pAcct->mutex);
 //
-//  pStreamShow = malloc(sizeof(SStreamDesc) * pAcct->acctInfo.numOfStreams + sizeof(SQueryShow));
+//  pStreamShow = malloc(sizeof(SCMStreamDesc) * pAcct->acctInfo.numOfStreams + sizeof(SQueryShow));
 //  pStreamShow->numOfStreams = 0;
 //  pStreamShow->index = 0;
 //  pStreamShow->connInfo = NULL;
@@ -286,7 +286,7 @@ int32_t mgmtGetStreams(SShowObj *pShow, void *pConn) {
 //    pStreamShow->cdesc = (SCDesc **)malloc(pAcct->acctInfo.numOfStreams * sizeof(SCDesc *));
 //
 //    pConn = pAcct->pConn;
-//    SStreamDesc * pSdesc = pStreamShow->sdesc;
+//    SCMStreamDesc * pSdesc = pStreamShow->sdesc;
 //    SCDesc * pCDesc = pStreamShow->connInfo;
 //    SCDesc **ppCDesc = pStreamShow->cdesc;
 //
@@ -296,7 +296,7 @@ int32_t mgmtGetStreams(SShowObj *pShow, void *pConn) {
 //        pCDesc->port = pConn->port;
 //        strcpy(pCDesc->user, pConn->pUser->user);
 //
-//        memcpy(pSdesc, pConn->pSList->sdesc, sizeof(SStreamDesc) * pConn->pSList->numOfStreams);
+//        memcpy(pSdesc, pConn->pSList->sdesc, sizeof(SCMStreamDesc) * pConn->pSList->numOfStreams);
 //        pSdesc += pConn->pSList->numOfStreams;
 //        pStreamShow->numOfStreams += pConn->pSList->numOfStreams;
 //        for (int32_t i = 0; i < pConn->pSList->numOfStreams; ++i, ++ppCDesc) *ppCDesc = pCDesc;
@@ -386,7 +386,7 @@ int32_t mgmtRetrieveStreams(SShowObj *pShow, char *data, int32_t rows, void *pCo
   if (rows > pStreamShow->numOfStreams - pStreamShow->index) rows = pStreamShow->numOfStreams - pStreamShow->index;
 
   while (numOfRows < rows) {
-    SStreamDesc *pNode = pStreamShow->sdesc + pStreamShow->index;
+    SCMStreamDesc *pNode = pStreamShow->sdesc + pStreamShow->index;
     SCDesc *pCDesc = pStreamShow->cdesc[pStreamShow->index];
     cols = 0;
 
@@ -461,7 +461,7 @@ int32_t mgmtKillStream(char *qidstr, void *pConn) {
 //  while (pConn) {
 //    if (pConn->ip == ip && pConn->port == port && pConn->pSList) {
 //      int32_t     i;
-//      SStreamDesc *pSDesc = pConn->pSList->sdesc;
+//      SCMStreamDesc *pSDesc = pConn->pSList->sdesc;
 //      for (i = 0; i < pConn->pSList->numOfStreams; ++i, ++pSDesc) {
 //        if (pSDesc->streamId == streamId) break;
 //      }
diff --git a/src/mnode/src/mgmtShell.c b/src/mnode/src/mgmtShell.c
index efe27471ecf572a539be0f1d97aac8847fc39be7..5b7dd6d1cad6216e4a776444d24ce8bcaf82c3b7 100644
--- a/src/mnode/src/mgmtShell.c
+++ b/src/mnode/src/mgmtShell.c
@@ -645,7 +645,7 @@ int32_t mgmtProcessCreateUserMsg(void *pCont, int32_t contLen, void *ahandle) {
 
   int32_t code;
   if (pUser->superAuth) {
-    SCreateUserMsg *pCreate = pCont;
+    SCMCreateUserMsg *pCreate = pCont;
     code = mgmtCreateUser(pUser->pAcct, pCreate->user, pCreate->pass);
     if (code == TSDB_CODE_SUCCESS) {
       mLPrint("user:%s is created by %s", pCreate->user, pUser->user);
@@ -669,7 +669,7 @@ int32_t mgmtProcessAlterUserMsg(void *pCont, int32_t contLen, void *ahandle) {
     return TSDB_CODE_INVALID_USER;
   }
 
-  SAlterUserMsg *pAlter = pCont;
+  SCMAlterUserMsg *pAlter = pCont;
   SUserObj *pUser = mgmtGetUser(pAlter->user);
   if (pUser == NULL) {
     rpcSendResponse(ahandle, TSDB_CODE_INVALID_USER, NULL, 0);
@@ -776,7 +776,7 @@ int32_t mgmtProcessDropUserMsg(void *pCont, int32_t contLen, void *ahandle) {
     return TSDB_CODE_INVALID_USER;
   }
 
-  SDropUserMsg *pDrop = pCont;
+  SCMDropUserMsg *pDrop = pCont;
   SUserObj *pUser = mgmtGetUser(pDrop->user);
   if (pUser == NULL) {
     rpcSendResponse(ahandle, TSDB_CODE_INVALID_USER, NULL, 0);
@@ -1181,10 +1181,10 @@ int32_t mgmtProcessCfgDnodeMsg(void *pCont, int32_t contLen, void *ahandle) {
 }
 
 int32_t mgmtProcessHeartBeatMsg(void *pCont, int32_t contLen, void *ahandle) {
-  SHeartBeatMsg *pHBMsg = (SHeartBeatMsg *) pCont;
+  SCMHeartBeatMsg *pHBMsg = (SCMHeartBeatMsg *) pCont;
   mgmtSaveQueryStreamList(pHBMsg);
 
-  SHeartBeatRsp *pHBRsp = (SHeartBeatRsp *) rpcMallocCont(contLen);
+  SCMHeartBeatRsp *pHBRsp = (SCMHeartBeatRsp *) rpcMallocCont(contLen);
   if (pHBRsp == NULL) {
     rpcSendResponse(ahandle, TSDB_CODE_SERV_OUT_OF_MEMORY, NULL, 0);
     rpcFreeCont(pCont);
@@ -1218,7 +1218,7 @@ int32_t mgmtProcessHeartBeatMsg(void *pCont, int32_t contLen, void *ahandle) {
   pHBRsp->streamId = 0;
   pHBRsp->killConnection = 0;
 
-  rpcSendResponse(ahandle, TSDB_CODE_SUCCESS, pHBRsp, sizeof(SHeartBeatMsg));
+  rpcSendResponse(ahandle, TSDB_CODE_SUCCESS, pHBRsp, sizeof(SCMHeartBeatMsg));
   return TSDB_CODE_SUCCESS;
 }
 
@@ -1238,7 +1238,7 @@ int32_t mgmtRetriveUserAuthInfo(char *user, char *spi, char *encrypt, char *secr
 }
 
 static int32_t mgmtProcessConnectMsg(void *pCont, int32_t contLen, void *thandle) {
-  SConnectMsg *pConnectMsg = (SConnectMsg *) pCont;
+  SCMConnectMsg *pConnectMsg = (SCMConnectMsg *) pCont;
   SRpcConnInfo connInfo;
   rpcGetConnInfo(thandle, &connInfo);
   int32_t code;
@@ -1275,7 +1275,7 @@ static int32_t mgmtProcessConnectMsg(void *pCont, int32_t contLen, void *thandle
     }
   }
 
-  SConnectRsp *pConnectRsp = rpcMallocCont(sizeof(SConnectRsp));
+  SCMConnectRsp *pConnectRsp = rpcMallocCont(sizeof(SCMConnectRsp));
   if (pConnectRsp == NULL) {
     code = TSDB_CODE_SERV_OUT_OF_MEMORY;
     goto connect_over;
@@ -1307,7 +1307,7 @@ connect_over:
     rpcSendResponse(thandle, code, NULL, 0);
   } else {
     mLPrint("user:%s login from %s, code:%d", connInfo.user, taosIpStr(connInfo.clientIp), code);
-    rpcSendResponse(thandle, code, pConnectRsp, sizeof(SConnectRsp));
+    rpcSendResponse(thandle, code, pConnectRsp, sizeof(SCMConnectRsp));
   }
 
   return code;