Revert "Remove name from header and correct active header shadow"

This reverts commit 207963ff0dad7dc017c76ac3ef6d8f7389f77e8d.
Revert back to working version