Tree rebuild so no long name