More renaming.
Removing movetree dependency