Improve naming for chat messages