Singularize event type urn. Update events to reflect changes in base class