Rename EncounterState to EncounterStatus to be consistent with property
name.