fix naming of cnode/context-node