changed Event id and type to message_id and event_type to work with stackdistiller