Renamed Event to Incident and moved Subscription to its own namespace.