Update to new event.h naming