move headers to be consistent