File tree rename issues fix, part 1

This fixes:

* #9264 
* #9217 
* #9228 
* #9227 

cc @ingorichter 
Yeah, I hadn't seen that. Our React build does have the add-ons. Apparently, @ingorichter has been adding `classSet` in another PR (the one to do with styling).