Refactor NamedNode, new NamedExpressionNode