TRUNK-2894: Renamed a few messages as requested
Merge pull request #1022 from geoff-wasilwa/TRUNK-2894

TRUNK-2894: Renamed a few messages as requested