changed names to sort ordering of events  and to be consistent across events