Some tidying { Matt, Rebecca, Nate } noticed.

Renamed hdr -> header
        pol -> policy
        Set -> Mod

throughout.