diff --git a/include/wrapping_dap_chain_net_node_cli.h b/include/wrapping_dap_app_cli_server.h
similarity index 88%
rename from include/wrapping_dap_chain_net_node_cli.h
rename to include/wrapping_dap_app_cli_server.h
index 9dd1d53fb3e72f8d965172949da707bdf4f7b5a5..75ae0a4e575b75ba641e7d0df1954e772878ada7 100644
--- a/include/wrapping_dap_chain_net_node_cli.h
+++ b/include/wrapping_dap_app_cli_server.h
@@ -1,5 +1,4 @@
-#ifndef _WRAPPING_DAP_CHAIN_NET_NODE_CLI_
-#define _WRAPPING_DAP_CHAIN_NET_NODE_CLI_
+#pragma once
 
 #include <Python.h>
 #include "dap_config.h"
@@ -8,14 +7,10 @@
 #include "wrapping_dap_chain_common.h"
 #include "wrapping_dap_chain_net_node.h"
 
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-typedef struct PyDapChainNodeCli{
+typedef struct PyDapAppCliServer{
     PyObject_HEAD
     cmdfunc_t *func;
-}PyDapChainNodeCliObject;
+}PyDapAppCliServerObject;
 static PyObject *binded_object_cmdfunc = NULL;
 
 int dap_chain_node_cli_init_py(dap_config_t *g_config);
@@ -29,16 +24,16 @@ PyObject *dap_chain_node_cli_set_reply_text_py(PyObject *self, PyObject *args);
 PyObject *dap_chain_node_addr_get_by_alias_py(PyObject *self, PyObject *args);
 
 static PyMethodDef DapChainNodeCliMethods[] = {
-    {"cmdItemCreate", dap_chain_node_cli_cmd_item_create_py, METH_VARARGS, ""},
-    {"setReplyText", dap_chain_node_cli_set_reply_text_py, METH_VARARGS, ""},
+    {"cmdItemCreate", dap_chain_node_cli_cmd_item_create_py, METH_VARARGS| METH_STATIC, ""},
+    {"setReplyText", dap_chain_node_cli_set_reply_text_py, METH_VARARGS| METH_STATIC, ""},
     {"getByAlias", dap_chain_node_addr_get_by_alias_py, METH_VARARGS | METH_STATIC, ""},
     {NULL, NULL, 0, NULL}
 };
 
 static PyTypeObject DapChainNodeCliObject_DapChainNodeCliObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.Chain.Node.cli",            /* tp_name */
-    sizeof(PyDapChainNodeCliObject),     /* tp_basicsize */
+    "AppCliServer",            /* tp_name */
+    sizeof(PyDapAppCliServerObject),     /* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
     0,                               /* tp_print */
@@ -79,9 +74,3 @@ static PyTypeObject DapChainNodeCliObject_DapChainNodeCliObjectType = {
 
 char **PyListToString(PyObject *list);
 PyObject *stringToPyList(char **list);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //_WRAPPING_DAP_CHAIN_NET_NODE_CLI_
diff --git a/src/wrapping_dap_chain_net_node_cli.c b/src/wrapping_dap_app_cli_server.c
similarity index 88%
rename from src/wrapping_dap_chain_net_node_cli.c
rename to src/wrapping_dap_app_cli_server.c
index 80e0c61b22fa9d0ef84c2cf89eb21a2240faabe8..fbed113ab0ee1286c493c4440a50781d15891334 100644
--- a/src/wrapping_dap_chain_net_node_cli.c
+++ b/src/wrapping_dap_app_cli_server.c
@@ -1,6 +1,9 @@
-#include "wrapping_dap_chain_net_node_cli.h"
+#include "wrapping_dap_app_cli_server.h"
+
+#define LOG_TAG "wrapping_dap_app_cli_server"
 
 int dap_chain_node_cli_init_py(dap_config_t *g_config){
+    log_it(L_DEBUG, "Init app cli server");
     dap_chain_node_cli_init(g_config);
 }
 void dap_chain_node_cli_delete_py(void){
@@ -26,7 +29,7 @@ static int wrapping_cmdfunc(int argc, char **argv, char **str_reply){
 }
 
 PyObject *DapChainNodeCliObject_new(PyTypeObject *type_object, PyObject *args, PyObject *kwds){
-    PyDapChainNodeCliObject *obj = (PyDapChainNodeCliObject*)PyType_GenericNew(type_object, args, kwds);
+    PyDapAppCliServerObject *obj = (PyDapAppCliServerObject*)PyType_GenericNew(type_object, args, kwds);
     obj->func = wrapping_cmdfunc;
     return (PyObject *)obj;
 }
@@ -35,7 +38,7 @@ PyObject *dap_chain_node_cli_cmd_item_create_py(PyObject *a_self, PyObject *a_ar
     (void) a_self;
     const char *name, *doc, *doc_ex;
     PyObject *obj_cmdfunc;
-    if (!PyArg_ParseTuple(a_args, "s|O:set_callback|s|s", &name, &obj_cmdfunc, &doc, &doc_ex)){
+    if (!PyArg_ParseTuple(a_args, "s|O:cmdCallback|s|s", &name, &obj_cmdfunc, &doc, &doc_ex)){
         return NULL;
     } else {
         if (!PyCallable_Check(obj_cmdfunc)){
@@ -46,11 +49,12 @@ PyObject *dap_chain_node_cli_cmd_item_create_py(PyObject *a_self, PyObject *a_ar
     Py_XINCREF(obj_cmdfunc);
     Py_XDECREF(binded_object_cmdfunc);
     binded_object_cmdfunc = obj_cmdfunc;
-    dap_chain_node_cli_cmd_item_create(name, ((PyDapChainNodeCliObject*)obj_cmdfunc)->func, doc, doc_ex);
+    dap_chain_node_cli_cmd_item_create(name, ((PyDapAppCliServerObject*)obj_cmdfunc)->func, doc, doc_ex);
     return PyLong_FromLong(0);
 }
 
 PyObject *dap_chain_node_cli_set_reply_text_py(PyObject *self, PyObject *args){
+    (void) self;
     PyObject *obj_str_reply_list;
     const char *str_list;
     if (!PyArg_ParseTuple(args, "O|O", &obj_str_reply_list))
@@ -61,6 +65,7 @@ PyObject *dap_chain_node_cli_set_reply_text_py(PyObject *self, PyObject *args){
 }
 
 PyObject *dap_chain_node_addr_get_by_alias_py(PyObject *self, PyObject *args){
+    (void) self;
     PyObject *chain_net;
     const char *alias;
     if (!PyArg_ParseTuple(args, "O|s", &chain_net, &alias))