Rename eventId to eventToken, adjust#340