Messages: Reorder and rename key