#630, #640: Add event name options, thanks to @roryprimrose