update the event hook naming system to be more robust