use new naming convention and clean up header