Fix file reloading strategy
Fix tree naming strategy