Renamed EventType to Event.
Added Ids for events.
Tidy.