update header field names to new standard
add todo