Update remaining variable names for new "tree" terminology