Clean up the names of tree node attributes and their usage