header cleanup
rename headers w underscores