Update field names in header rows

Also comment out the header rows from display - not required.