Rename event context to follow the discussion of #10