Changed event name scheme for ease of use in UI