Refactor tree header define names