Fixing name clash with tree and treetable.