diff --git a/include/libdap_chain_atom_iter_python.h b/include/libdap_chain_atom_iter_python.h
index 8d5a29f9b608c1bc0f5814ef6dd768cfaa2ff30a..0f09dd345b26de1c2a188d6d3615061acaa34407 100644
--- a/include/libdap_chain_atom_iter_python.h
+++ b/include/libdap_chain_atom_iter_python.h
@@ -16,7 +16,7 @@ static PyMethodDef DapChainAtomIterMethods[] = {
 
 static PyTypeObject dapChainAtomPtr_dapChainAtomPtrType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainAtomIter",     /* tp_name */
+    "CellFrame.Chain.AtomIter",     /* tp_name */
     sizeof(PyChainAtomIterObject),       /* tp_basicsize */
     0,                                  /* tp_itemsize */
     0,                                  /* tp_dealloc */
diff --git a/include/libdap_chain_type_python.h b/include/libdap_chain_type_python.h
index 9693dc8ffb1830cb78c7e69d73f893b6c9f1d157..029b9f916912825794a3f797671be99a165e5545 100644
--- a/include/libdap_chain_type_python.h
+++ b/include/libdap_chain_type_python.h
@@ -22,7 +22,7 @@ static PyMethodDef DapChainTypeMethods[] = {
 
 static PyTypeObject dapChainTypeObject_dapChainTypeType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainType",         /* tp_name */
+    "CellFrame.Chain.Type",         /* tp_name */
     sizeof(PyChainTypeObject),  /* tp_basicsize */
     0,                         /* tp_itemsize */
     0,                         /* tp_dealloc */
diff --git a/include/wrapping_dap_chain_cell.h b/include/wrapping_dap_chain_cell.h
index 8584e31b2bf29faf4811ab1c2bf193f7adb13fa6..f25d82973055a3a12c537d5a76a1bf627ab58ca1 100644
--- a/include/wrapping_dap_chain_cell.h
+++ b/include/wrapping_dap_chain_cell.h
@@ -32,7 +32,7 @@ static PyMethodDef PyDapChainCellObjectMethods[] ={
 
 static PyTypeObject DapChainCell_DapChainCellObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.DapChainCell",       /* tp_name */
+    "CellFrame.Chain.Cell",       /* tp_name */
     sizeof(PyDapChainCellObject),      /* tp_basicsize */
     0,                                       /* tp_itemsize */
     0,                                       /* tp_dealloc */
diff --git a/include/wrapping_dap_chain_common.h b/include/wrapping_dap_chain_common.h
index 968c6d48895267c3a9bf4ac0b7622ddb48853378..1783327d3f3da74e446163982ba864fa59813d83 100644
--- a/include/wrapping_dap_chain_common.h
+++ b/include/wrapping_dap_chain_common.h
@@ -30,7 +30,7 @@ static PyMethodDef PyDapChainCommonObjectMethods[] ={
 
 static PyTypeObject ChainCommonObject_ChainCommonType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainCommon",                                      /* tp_name */
+    "CellFrame.Chain.Common",                                      /* tp_name */
     sizeof(PyDapChainCommonObject),                               /* tp_basicsize */
     0,                                                            /* tp_itemsize */
     0,                                                            /* tp_dealloc */
diff --git a/include/wrapping_dap_chain_common_objects.h b/include/wrapping_dap_chain_common_objects.h
index 30630b5bcef24138ff186ab30c6d29b349c81b70..d54516bdd6db36f6509d1c156538cea3e920ce18 100644
--- a/include/wrapping_dap_chain_common_objects.h
+++ b/include/wrapping_dap_chain_common_objects.h
@@ -16,7 +16,7 @@ typedef struct PyDapChainId{
 
 static PyTypeObject DapChainIdObject_DapChainIdObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainID",             /* tp_name */
+    "CellFrame.Chain.ID",             /* tp_name */
     sizeof(PyDapChainIdObject),      /* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -67,7 +67,7 @@ typedef struct PyDapChainCellId{
 
 static PyTypeObject DapChainCellIdObject_DapChainCellIdObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainCellID",             /* tp_name */
+    "CellFrame.Chain.CellID",             /* tp_name */
     sizeof(PyDapChainCellIdObject),      /* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -118,7 +118,7 @@ typedef struct PyDapChainNodeAddr{
 
 static PyTypeObject DapChainNodeAddrObject_DapChainNodeAddrObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainNodeAddr",             /* tp_name */
+    "CellFrame.Chain.NodeAddr",             /* tp_name */
     sizeof(PyDapChainNodeAddrObject),      /* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -174,7 +174,7 @@ typedef struct PyDapChainNetId{
 
 static PyTypeObject DapChainNetIdObject_DapChainNetIdObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainNetID",          /* tp_name */
+    "CellFrame.Chain.NetID",          /* tp_name */
     sizeof(PyDapChainNetIdObject),   /* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -224,7 +224,7 @@ typedef struct PyDapChainHashSlow{
 
 static PyTypeObject DapChainHashSlowObject_DapChainHashSlowObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainHashSlow",       /* tp_name */
+    "CellFrame.Chain.HashSlow",       /* tp_name */
     sizeof(PyDapChainHashSlowObject),/* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -275,7 +275,7 @@ typedef struct PyDapChainHashFast{
 
 static PyTypeObject DapChainHashFastObject_DapChainHashFastObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainHashFast",       /* tp_name */
+    "CellFrame.Chain.HashFast",       /* tp_name */
     sizeof(PyDapChainHashFastObject),/* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -324,7 +324,7 @@ typedef struct PyDapChainHashSlowKind{
 
 static PyTypeObject DapChainHashSlowKindObject_DapChainHashSlowKindObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainHashSlowKind",       /* tp_name */
+    "CellFrame.Chain.HashSlowKind",       /* tp_name */
     sizeof(PyDapChainHashSlowKindObject),/* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -373,7 +373,7 @@ typedef struct PyDapChainPkeyType{
 
 static PyTypeObject DapChainPkeyTypeObject_DapChainPkeyTypeObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainPkeyType",       /* tp_name */
+    "CellFrame.Chain.PkeyType",       /* tp_name */
     sizeof(PyDapChainPkeyTypeObject),/* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -422,7 +422,7 @@ typedef struct PyDapChainPkey{
 
 static PyTypeObject DapChainPkeyObject_DapChainPkeyObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainPkey",       /* tp_name */
+    "CellFrame.Chain.Pkey",       /* tp_name */
     sizeof(PyDapChainPkeyObject),/* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -471,7 +471,7 @@ typedef struct PyDapChainSignType{
 
 static PyTypeObject DapChainSignTypeObject_DapChainSignTypeObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainSignType",       /* tp_name */
+    "CellFrame.Chain.SignType",       /* tp_name */
     sizeof(PyDapChainSignTypeObject),/* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -521,7 +521,7 @@ typedef struct PyDapChainAddr{
 
 static PyTypeObject DapChainAddrObject_DapChainAddrObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainAddr",       /* tp_name */
+    "CellFrame.Chain.Addr",       /* tp_name */
     sizeof(PyDapChainAddrObject),/* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
diff --git a/include/wrapping_dap_chain_cs.h b/include/wrapping_dap_chain_cs.h
index 31e4d1e12fa049d530bd3f63a2440be09803a997..2ddf02f33d16a31b6829c21a04fd49c3bb9979bb 100644
--- a/include/wrapping_dap_chain_cs.h
+++ b/include/wrapping_dap_chain_cs.h
@@ -37,7 +37,7 @@ static PyMethodDef DapChainCSMethods[] = {
 
 static PyTypeObject DapChainCsObject_DapChainCsObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainCS",             /* tp_name */
+    "CellFrame.Chain.CS",             /* tp_name */
     sizeof(PyDapChainCsObject),      /* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
diff --git a/include/wrapping_dap_chain_datum.h b/include/wrapping_dap_chain_datum.h
index fd25630dd74d4512b77b4dacc9a08f5bfb2293fd..784bd6979ab84d497fc6451828f61f8db4dbfea8 100644
--- a/include/wrapping_dap_chain_datum.h
+++ b/include/wrapping_dap_chain_datum.h
@@ -15,7 +15,7 @@ typedef struct PyDapChainDatumTypeId{
 
 static PyTypeObject DapChainDatumTypeIdObject_DapChainDatumTypeIdObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainDatumTypeId",          /* tp_name */
+    "CellFrame.Chain.DatumTypeId",          /* tp_name */
     sizeof(PyDapChainDatumTypeIdObject),   /* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -66,7 +66,7 @@ PyObject *DapChainDatumObject_new(PyTypeObject *type_object, PyObject *args, PyO
 
 static PyTypeObject DapChainDatumObject_DapChainDatumObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainDatum",          /* tp_name */
+    "CellFrame.Chain.Datum",          /* tp_name */
     sizeof(PyDapChainDatumObject),   /* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -115,7 +115,7 @@ typedef struct PyDapChainDatumIter{
 
 static PyTypeObject DapChainDatumIterObject_DapChainDatumIterObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainDatumIter",          /* tp_name */
+    "CellFrame.Chain.DatumIter",          /* tp_name */
     sizeof(PyDapChainDatumIterObject),   /* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
diff --git a/include/wrapping_dap_chain_datum_token.h b/include/wrapping_dap_chain_datum_token.h
index afb306ce7e9a071252913dd450d5168d90b19007..82f667748f3a7bde9a7eb6c7faa35f97e357f1f0 100644
--- a/include/wrapping_dap_chain_datum_token.h
+++ b/include/wrapping_dap_chain_datum_token.h
@@ -10,7 +10,7 @@ typedef struct PyDapChainDatumToken{
 
 static PyTypeObject DapChainDatumToken_DapChainDatumTokenObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainDatumTokenObject",       /* tp_name */
+    "CellFrame.Chain.DatumTokenObject",       /* tp_name */
     sizeof(PyDapChainDatumTokenObject),      /* tp_basicsize */
     0,                                       /* tp_itemsize */
     0,                                       /* tp_dealloc */
@@ -61,7 +61,7 @@ typedef struct PyDapChainDatumTokenEmission{
 
 static PyTypeObject DapChainDatumTokenEmission_DapChainDatumTokenEmissionObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainDatumTokenEmission",             /* tp_name */
+    "CellFrame.Chain.DatumTokenEmission",             /* tp_name */
     sizeof(PyDapChainDatumTokenEmissionObject),      /* tp_basicsize */
     0,                                               /* tp_itemsize */
     0,                                               /* tp_dealloc */
diff --git a/include/wrapping_dap_chain_datum_tx.h b/include/wrapping_dap_chain_datum_tx.h
index fae87f1bba74186ec050b70ae1137431ba6397f7..1b2564ec1d6ccd6eee9a2668edf92e5b421d9eda 100644
--- a/include/wrapping_dap_chain_datum_tx.h
+++ b/include/wrapping_dap_chain_datum_tx.h
@@ -40,7 +40,7 @@ static PyMethodDef PyDapChainTxItemTypeObjectMethods[] ={
 
 static PyTypeObject DapChainTxItemObject_DapChainTxItemTypeObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainTxItemType",        /* tp_name */
+    "CellFrame.Chain.TxItemType",        /* tp_name */
     sizeof(PyDapChainTxItemTypeObject), /* tp_basicsize */
     0,                                  /* tp_itemsize */
     0,                                  /* tp_dealloc */
@@ -90,7 +90,7 @@ typedef struct PyDapChainTxCondType{
 
 static PyTypeObject DapChainTxType_DapChainTxCondTypeObject = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainTxCondType",       /* tp_name */
+    "CellFrame.Chain.TxCondType",       /* tp_name */
     sizeof(PyDapChainTxCondTypeObject),/* tp_basicsize */
     0,                               /* tp_itemsize */
     0,                               /* tp_dealloc */
@@ -165,7 +165,7 @@ static PyMethodDef PyDapChainDatumTxObjectMethods[] ={
 
 static PyTypeObject DapChainDatumTx_DapChainDatumTxObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainDatumTx",                      /* tp_name */
+    "CellFrame.Chain.DatumTx",                      /* tp_name */
     sizeof(PyDapChainDatumTxObject),               /* tp_basicsize */
     0,                                             /* tp_itemsize */
     (destructor)PyDapChainDatumTxObject_delete,    /* tp_dealloc */
@@ -214,7 +214,7 @@ typedef struct PyDapChainTxOutCond{
 
 static PyTypeObject DapChainTxOutCond_DapChainTxOutCondObjectType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainTxOutCond",                      /* tp_name */
+    "CellFrame.Chain.TxOutCond",                      /* tp_name */
     sizeof(PyDapChainTxOutCondObject),               /* tp_basicsize */
     0,                                             /* tp_itemsize */
     0,                                             /* tp_dealloc */
diff --git a/include/wrapping_dap_chain_ledger.h b/include/wrapping_dap_chain_ledger.h
index 616fbc79eda729db28bd52d57139868f6f3601ea..f020aea901cb99d486f41f8bf076f36bb96fc354 100644
--- a/include/wrapping_dap_chain_ledger.h
+++ b/include/wrapping_dap_chain_ledger.h
@@ -74,7 +74,7 @@ static PyMethodDef DapChainLedgerMethods[] = {
 
 PyTypeObject DapChainLedger_DapChainLedgerType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "CellFrame.ChainLedger",                                      /* tp_name */
+    "CellFrame.Chain.Ledger",                                      /* tp_name */
     sizeof(PyDapChainLedgerObject),                               /* tp_basicsize */
     0,                                                            /* tp_itemsize */
     0,                                                            /* tp_dealloc */