Fixed pluralization to allow more flexibility around the pubsub/socket api