Message improvements

* Correct spelling in one message.
* Make GENDER usage clearer.

Change-Id: Id2e318c224dd29bff7e17fed1a95c9e7dd4d3f9a