Changed Event class name to clarify its use.
Merge branch 'events'