Update messages for events so that they actually make sense