diff --git a/doc/json_rpc_api/v2_0_0.md b/doc/json_rpc_api/v2_0_0.md
index 0882be01..a4f8dfbc 100644
--- a/doc/json_rpc_api/v2_0_0.md
+++ b/doc/json_rpc_api/v2_0_0.md
@@ -67,6 +67,7 @@ The Server JSON object contains a list of Groups and Streams. Every Group holds
   * [Group.SetMute](#groupsetmute)
   * [Group.SetStream](#groupsetstream)
   * [Group.SetClients](#groupsetclients)
+  * [Group.SetName](#groupsetname)
 * Server
   * [Server.GetRPCVersion](#servergetrpcversion)
   * [Server.GetStatus](#servergetstatus)
@@ -82,6 +83,7 @@ The Server JSON object contains a list of Groups and Streams. Every Group holds
 * Group
   * [Group.OnMute](#grouponmute)
   * [Group.OnStreamChanged](#grouponstreamchanged)
+  * [Group.OnNameChanged](#grouponnamechanged)
 * Stream
   * [Stream.OnUpdate](#streamonupdate)
 * Server
@@ -208,6 +210,22 @@ The Server JSON object contains a list of Groups and Streams. Every Group holds
 ```json
 {"jsonrpc":"2.0","method":"Server.OnUpdate","params":{"server":{"groups":[{"clients":[{"config":{"instance":2,"latency":6,"name":"123 456","volume":{"muted":false,"percent":48}},"connected":true,"host":{"arch":"x86_64","ip":"127.0.0.1","mac":"00:21:6a:7d:74:fc","name":"T400","os":"Linux Mint 17.3 Rosa"},"id":"00:21:6a:7d:74:fc#2","lastSeen":{"sec":1488025901,"usec":864472},"snapclient":{"name":"Snapclient","protocolVersion":2,"version":"0.10.0"}},{"config":{"instance":1,"latency":0,"name":"","volume":{"muted":false,"percent":100}},"connected":true,"host":{"arch":"x86_64","ip":"127.0.0.1","mac":"00:21:6a:7d:74:fc","name":"T400","os":"Linux Mint 17.3 Rosa"},"id":"00:21:6a:7d:74:fc","lastSeen":{"sec":1488025905,"usec":45238},"snapclient":{"name":"Snapclient","protocolVersion":2,"version":"0.10.0"}}],"id":"4dcc4e3b-c699-a04b-7f0c-8260d23c43e1","muted":false,"name":"","stream_id":"stream 2"}],"server":{"host":{"arch":"x86_64","ip":"","mac":"","name":"T400","os":"Linux Mint 17.3 Rosa"},"snapserver":{"controlProtocolVersion":1,"name":"Snapserver","protocolVersion":1,"version":"0.10.0"}},"streams":[{"id":"stream 1","status":"idle","uri":{"fragment":"","host":"","path":"/tmp/snapfifo","query":{"buffer_ms":"20","codec":"flac","name":"stream 1","sampleformat":"48000:16:2"},"raw":"pipe:///tmp/snapfifo?name=stream 1","scheme":"pipe"}},{"id":"stream 2","status":"idle","uri":{"fragment":"","host":"","path":"/tmp/snapfifo","query":{"buffer_ms":"20","codec":"flac","name":"stream 2","sampleformat":"48000:16:2"},"raw":"pipe:///tmp/snapfifo?name=stream 2","scheme":"pipe"}}]}}}
 ```
+### Group.SetName
+#### Request
+```json
+{"id":7,"jsonrpc":"2.0","method":"Group.SetName","params":{"id":"4dcc4e3b-c699-a04b-7f0c-8260d23c43e1","name":"GroundFloor"}}
+```
+
+#### Response
+```json
+{"id":7,"jsonrpc":"2.0","result":{"name":"GroundFloor"}}
+```
+
+#### Notification
+```json
+{"jsonrpc":"2.0","method":"Group.OnNameChanged","params":{"id":"4dcc4e3b-c699-a04b-7f0c-8260d23c43e1","name":"GroundFloor"}}
+```
+
 
 
 ### Server.GetRPCVersion
@@ -286,6 +304,11 @@ The Server JSON object contains a list of Groups and Streams. Every Group holds
 {"jsonrpc":"2.0","method":"Group.OnStreamChanged","params":{"id":"4dcc4e3b-c699-a04b-7f0c-8260d23c43e1","stream_id":"stream 1"}}
 ```
 
+### Group.OnNameChanged
+```json
+{"jsonrpc":"2.0","method":"GrClient.OnNameChanged","params":{"id":"4dcc4e3b-c699-a04b-7f0c-8260d23c43e1","name":"GroundFloor"}}
+```
+
 ### Stream.OnUpdate
 ```json
 {"jsonrpc":"2.0","method":"Stream.OnUpdate","params":{"id":"stream 1","stream":{"id":"stream 1","status":"idle","uri":{"fragment":"","host":"","path":"/tmp/snapfifo","query":{"buffer_ms":"20","codec":"flac","name":"stream 1","sampleformat":"48000:16:2"},"raw":"pipe:///tmp/snapfifo?name=stream 1","scheme":"pipe"}}}}