Rename JSON fields to match new pickett

This change gets me to the point where I can run "picket -debug candidate" with the new pickett JSON schema.