update naming for token_node_t