NameEntry -> entry_t, add class CodeBlockId
working