File tree rename issues fix, part 1

This fixes:

* #9264 
* #9217 
* #9228 
* #9227 

cc @ingorichter 
I think we should do some _cleanup_ after we are done with resolving all the remaining issues.