Removing Sink from all Event subclass names