Renaming pubsub to mediator