Reformat headers in ADT and Support partially.