1 files changed, 9 insertions, 9 deletions
diff --git a/doc/protocol.md b/doc/protocol.md
index 29391c6..e960506 100644
--- a/doc/protocol.md
+++ b/doc/protocol.md
@@ -9,13 +9,13 @@ defaults which will be used if the corresponding value is missing in subsequent
 update messages.
 
 {
-  "version": 1,
+  "version": 2,
   "SourceHubUuid": "f7df89b4-171e-4b2f-a8a4-e58ac99e5dc5",
-  "SourceHubDataUpdateId": 23,
+  "SourceHubUpdateId": 23,
   "ForwardHubUuid": "b041315e-5039-4c75-81e8-9fd42250b011",
-  "ForwardHubDataUpdateId": 42,
+  "ForwardHubUpdateId": 42,
   "hostname": "myhostname",
-  "streamer-id": { "content-id": "av-orig", "format": "flash", "quality": "medium" },
+  "stream": { "content": "av-orig", "format": "flash", "quality": "medium" },
   "tags": [ "elevate", "2014", "discourse" ]
 }
 
@@ -26,19 +26,19 @@ data-update
 All values which have been defined by the init message are optional. In any case the
 values from data updates override values from init. Stateless interfaces will not use
 init messages and therefore all values must be defined here.
-"SourceHubUuid", "SourceHubDataUpdateId", "ForwardHubUuid", "ForwardHubDataUpdateId",
+"SourceHubUuid", "SourceHubUpdateId", "ForwardHubUuid", "ForwardHubUpdateId",
 "user-agent", "bytes-received", "tags" and "clients" might be omitted and are treated
 as an empty string, 0 or empty array respectively.
 The start-time will be processesd and stored with millisecond precision.
 
 {
-  "version": 1,
+  "version": 2,
   "SourceHubUuid": "f7df89b4-171e-4b2f-a8a4-e58ac99e5dc5",
-  "SourceHubDataUpdateId": 23,
+  "SourceHubUpdateId": 23,
   "ForwardHubUuid": "b041315e-5039-4c75-81e8-9fd42250b011",
-  "ForwardHubDataUpdateId": 42,
+  "ForwardHubUpdateId": 42,
   "hostname": "myhostname",
-  "streamer-id": { "content-id": "av-orig", "format": "flash", "quality": "medium" },
+  "stream": { "content": "av-orig", "format": "flash", "quality": "medium" },
   "tags": [ "elevate", "2014", "discourse" ]
   "start-time": "2014-08-03T12:34:56.123Z",
   "duration-ms": 5000,