Add Event suffix to Event subclasses