Fix message key names

Probably copy&paste error

Change-Id: I7c55c325f1b2d6536448be88a9fe7f9d53b2b51a