cleanup header names to make them easy to parse