Use better names for message components