Rename headers

Rename most of the header for better mapping