Use more consistent messages

Change-Id: I309ee691c5a80b0a524c39c3e6d22fbd7d078400