diff --git a/src/notification/notification_parser.cc b/src/notification/notification_parser.cc
index 0a27f1c..d7c4f48 100644
--- a/src/notification/notification_parser.cc
+++ b/src/notification/notification_parser.cc
@@ -46,9 +46,9 @@
 
   std::string kind;
   if (!notification.GetString("kind", &kind) ||
-      kind != "clouddevices#notification") {
+      kind != "weave#notification") {
     LOG(WARNING) << "Push notification should have 'kind' property set to "
-                    "clouddevices#notification";
+                    "weave#notification";
     return false;
   }
 
diff --git a/src/notification/notification_parser_unittest.cc b/src/notification/notification_parser_unittest.cc
index 6b3916d..c69f9dd 100644
--- a/src/notification/notification_parser_unittest.cc
+++ b/src/notification/notification_parser_unittest.cc
@@ -37,11 +37,11 @@
 
 TEST_F(NotificationParserTest, CommandCreated) {
   auto json = CreateDictionaryValue(R"({
-    "kind": "clouddevices#notification",
+    "kind": "weave#notification",
     "type": "COMMAND_CREATED",
     "deviceId": "device_id",
     "command": {
-      "kind": "clouddevices#command",
+      "kind": "weave#command",
       "deviceId": "device_id",
       "state": "queued",
       "name": "storage.list",
@@ -56,7 +56,7 @@
   })");
 
   const char expected_json[] = R"({
-      "kind": "clouddevices#command",
+      "kind": "weave#command",
       "deviceId": "device_id",
       "state": "queued",
       "name": "storage.list",
@@ -75,7 +75,7 @@
 
 TEST_F(NotificationParserTest, DeviceDeleted) {
   auto json = CreateDictionaryValue(R"({
-    "kind":"clouddevices#notification",
+    "kind":"weave#notification",
     "type":"DEVICE_DELETED",
     "deviceId":"some_device_id"
   })");
@@ -91,7 +91,7 @@
     "type": "COMMAND_CREATED",
     "deviceId": "device_id",
     "command": {
-      "kind": "clouddevices#command",
+      "kind": "weave#command",
       "deviceId": "device_id",
       "state": "queued",
       "name": "storage.list",
@@ -110,10 +110,10 @@
 
 TEST_F(NotificationParserTest, Failure_NoType) {
   auto json = CreateDictionaryValue(R"({
-    "kind": "clouddevices#notification",
+    "kind": "weave#notification",
     "deviceId": "device_id",
     "command": {
-      "kind": "clouddevices#command",
+      "kind": "weave#command",
       "deviceId": "device_id",
       "state": "queued",
       "name": "storage.list",
@@ -132,11 +132,11 @@
 
 TEST_F(NotificationParserTest, IgnoredNotificationType) {
   auto json = CreateDictionaryValue(R"({
-    "kind": "clouddevices#notification",
+    "kind": "weave#notification",
     "type": "COMMAND_EXPIRED",
     "deviceId": "device_id",
     "command": {
-      "kind": "clouddevices#command",
+      "kind": "weave#command",
       "deviceId": "device_id",
       "state": "queued",
       "name": "storage.list",