TRUNK-2894: Renamed a few messages as requested

https://issues.openmrs.org/browse/TRUNK-2894.

Looks okay from the UI end.