Make messaging more consistent

Follow up of Change-Id: I2b76b163dcb1d68216eadb397452714557b34c5c.
Apparently I missed a few instances.

Change-Id: Idbfe1d81f514377ddb43a8392168e4d82a969952
Merge "Make messaging more consistent"