Aligned the Event classes to match those of the ORM