Made the tops of the header follow the same layout and grought the TreeWalker in line with our naming conventions