updated the event name scheme and adjusted views accordingly.