Upgrade to 3.5, added safestring for event name