Rename two ChatMessage classes