Refactor method names. At this point using TreeRepositoryTrait is DEPRECATED