Fix naming conflicts with the node class.