diff --git a/include/libdap_chain_net_python.h b/include/libdap_chain_net_python.h
index d74e8eb65bb78535b4463f74b00a4acf978137b9..378d71bf0b0718b99d5027274864ec925330b0a5 100644
--- a/include/libdap_chain_net_python.h
+++ b/include/libdap_chain_net_python.h
@@ -6,7 +6,7 @@
 #include "dap_chain_net.h"
 #include "wrapping_dap_chain_net_state.h"
 //#include "wrapping_dap_chain_net_state.h"
-#include "wrapping_dap_chain_common_objects.h"
+#include "wrapping_dap_chain_common.h"
 #include "wrapping_dap_chain_ledger.h"
 #include "libdap-chain-python.h"
 #include "libdap_chain_type_python.h"
diff --git a/include/wrapping_dap_chain_net_node.h b/include/wrapping_dap_chain_net_node.h
index c75727f5875993003ab597280fadf382a3699ca1..34fbb96260902ebe2ebfc65ce44e44ac2ad9e944 100644
--- a/include/wrapping_dap_chain_net_node.h
+++ b/include/wrapping_dap_chain_net_node.h
@@ -3,7 +3,7 @@
 
 #include <Python.h>
 #include "dap_chain_node.h"
-#include "wrapping_dap_chain_common_objects.h"
+#include "wrapping_dap_chain_common.h"
 #include "libdap_chain_net_python.h"
 
 typedef struct PyDapChainNode{
diff --git a/include/wrapping_dap_chain_net_node_cli.h b/include/wrapping_dap_chain_net_node_cli.h
index 8d027837fee7dd2f761ae180c70b6db1dc743d36..88bffd98fe9e93311aa6bf5ced68284970ae6104 100644
--- a/include/wrapping_dap_chain_net_node_cli.h
+++ b/include/wrapping_dap_chain_net_node_cli.h
@@ -5,7 +5,7 @@
 #include "dap_config.h"
 #include "dap_chain_node_cli.h"
 #include "dap_chain_node_cli_cmd.h"
-#include "wrapping_dap_chain_common_objects.h"
+#include "wrapping_dap_chain_common.h"
 #include "wrapping_dap_chain_net_node.h"
 
 #ifdef __cplusplus
diff --git a/include/wrapping_dap_chain_net_node_info.h b/include/wrapping_dap_chain_net_node_info.h
index 4caec25f837f3ab0f1f4fd61c4e3a4731e9f775f..aa49697ed63a7c97a3372da74c5d4dc4447dbe59 100644
--- a/include/wrapping_dap_chain_net_node_info.h
+++ b/include/wrapping_dap_chain_net_node_info.h
@@ -3,7 +3,7 @@
 #include <Python.h>
 #include "dap_chain_node.h"
 #include "libdap_chain_net_python.h"
-#include "wrapping_dap_chain_common_objects.h"
+#include "wrapping_dap_chain_common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/libdap_chain_net_python.c b/src/libdap_chain_net_python.c
index 80085f91bd30d99297a4ceb0166688e898848d97..147ed9358cbb6f5d71db4f4f968d02455c2ec623 100644
--- a/src/libdap_chain_net_python.c
+++ b/src/libdap_chain_net_python.c
@@ -98,7 +98,7 @@ PyObject *dap_chain_net_get_cur_addr_py(PyObject *self, PyObject *args){
 }
 PyObject *dap_chain_net_get_cur_cell_py(PyObject *self, PyObject *args){
     PyObject *obj_cell_id = _PyObject_New(&DapChainNodeAddrObject_DapChainNodeAddrObjectType);
-    ((PyDapChainCellIdObject*)obj_cell_id)->id = *(dap_chain_net_get_cur_cell(((PyDapChainNetObject*)self)->chain_net));
+    ((PyDapChainCellIDObject*)obj_cell_id)->cell_id = dap_chain_net_get_cur_cell(((PyDapChainNetObject*)self)->chain_net);
     return Py_BuildValue("O", obj_cell_id);
 }
 PyObject *dap_chain_net_get_cur_addr_int_py(PyObject *self, PyObject *args){
diff --git a/src/wrapping_dap_chain_net_node.c b/src/wrapping_dap_chain_net_node.c
index 8f7eeaa083e2da6c3025af87cc181a01172edc45..6dbd5e98a32e34a1e0c8aa63645cd62adad44ffd 100644
--- a/src/wrapping_dap_chain_net_node.c
+++ b/src/wrapping_dap_chain_net_node.c
@@ -6,7 +6,7 @@ PyObject *dap_chain_node_gen_addr_py(PyObject *self, PyObject *args){
     if (!PyArg_ParseTuple(args, "O|O", &obj_net, &obj_cell_id))
         return NULL;
     PyObject *obj_node_addr = _PyObject_New(&DapChainNodeAddrObject_DapChainNodeAddrObjectType);
-    ((PyDapChainNodeAddrObject*)obj_node_addr)->node_addr = dap_chain_node_gen_addr(((PyDapChainNetObject*)obj_net)->chain_net, &(((PyDapChainCellIdObject*)obj_cell_id)->id));
+    ((PyDapChainNodeAddrObject*)obj_node_addr)->node_addr = dap_chain_node_gen_addr(((PyDapChainNetObject*)obj_net)->chain_net, &(((PyDapChainCellIDObject*)obj_cell_id)->cell_id));
     return Py_BuildValue("O", obj_node_addr);
 }
 PyObject *dap_chain_node_check_addr_py(PyObject *self, PyObject *args){
@@ -15,7 +15,7 @@ PyObject *dap_chain_node_check_addr_py(PyObject *self, PyObject *args){
     PyObject *obj_cell_id;
     if (!PyArg_ParseTuple(args, "O|O|O", &obj_chain_net, &obj_node_addr, &obj_cell_id))
         return NULL;
-    bool ret = dap_chain_node_check_addr(((PyDapChainNetObject*)obj_chain_net)->chain_net, ((PyDapChainNodeAddrObject*)obj_node_addr)->node_addr, &(((PyDapChainCellIdObject*)obj_cell_id)->id));
+    bool ret = dap_chain_node_check_addr(((PyDapChainNetObject*)obj_chain_net)->chain_net, ((PyDapChainNodeAddrObject*)obj_node_addr)->node_addr, &(((PyDapChainCellIDObject*)obj_cell_id)->cell_id));
     if (ret)
         return Py_BuildValue("O", Py_True);
     else