renaming, optimize tree