Rename {message_id::invalid => invalid_message_id}