Message cleanup

Replace one with a core MW message, reorder messages in definition

Change-Id: Ief4fdcadd52ba4dcfcee451ecb0e1a67d91277c6