update parser to new field namings