Rename to more tree-like names