refactor tree names