r25710: Finally fix subtree renames. Untested code is broken code and in this