Changing pubsub naming and adding events wrapper