tree.h: name changes