File tree rename issues fix, part 1

This fixes:

* #9264 
* #9217 
* #9228 

cc @ingorichter