[MOD] Adjust all headers to match