event name fixes