Renaming 'event' to 'event identifier' where it makes sense.