Previously we were looping over Update, when we should instead have been looping over UpdateSubTree.
Taiko fixes
Also brings some naming up-to-date.
Note that this isn't a full "as intended" fix, because the full fix is quite big. I'll be saving it for a separate branch/pull-req.