diff --git a/android/Snapcast/src/main/java/de/badaix/snapcast/control/RemoteControl.java b/android/Snapcast/src/main/java/de/badaix/snapcast/control/RemoteControl.java
index 3087e63d..235d58ec 100644
--- a/android/Snapcast/src/main/java/de/badaix/snapcast/control/RemoteControl.java
+++ b/android/Snapcast/src/main/java/de/badaix/snapcast/control/RemoteControl.java
@@ -137,7 +137,7 @@ public class RemoteControl implements TcpClient.TcpClientListener {
     }
 
     public void getServerStatus() {
-        JSONObject request = jsonRequest("System.GetStatus", null);
+        JSONObject request = jsonRequest("Server.GetStatus", null);
         tcpClient.sendMessage(request.toString());
     }
 
@@ -170,7 +170,7 @@ public class RemoteControl implements TcpClient.TcpClientListener {
 
     public void delete(ClientInfo clientInfo) {
         try {
-            JSONObject request = jsonRequest("System.DeleteClient", new JSONObject("{\"client\": \"" + clientInfo.getMac() + "\"}"));
+            JSONObject request = jsonRequest("Server.DeleteClient", new JSONObject("{\"client\": \"" + clientInfo.getMac() + "\"}"));
             tcpClient.sendMessage(request.toString());
         } catch (JSONException e) {
             e.printStackTrace();
diff --git a/control/control.py b/control/control.py
index a7d98960..192bcbac 100755
--- a/control/control.py
+++ b/control/control.py
@@ -39,7 +39,7 @@ if sys.argv[2] == "setVolume":
 		print("usage: control.py <SERVER HOST> setVolume <VOLUME>")
 		exit(0)
 	volume = int(sys.argv[3])
-	j = doRequest(json.dumps({'jsonrpc': '2.0', 'method': 'System.GetStatus', 'id': 1}), 1)
+	j = doRequest(json.dumps({'jsonrpc': '2.0', 'method': 'Server.GetStatus', 'id': 1}), 1)
 	for client in j["result"]["clients"]:
 		setVolume(client['MAC'], volume)
 
@@ -52,7 +52,7 @@ elif sys.argv[2] == "setName":
 else:
 	print("unknown command \"" + sys.argv[2] + "\"")
 
-j = doRequest(json.dumps({'jsonrpc': '2.0', 'method': 'System.GetStatus', 'id': 1}), 1)
+j = doRequest(json.dumps({'jsonrpc': '2.0', 'method': 'Server.GetStatus', 'id': 1}), 1)
 for client in j["result"]["clients"]:
 	print("MAC: " + client['MAC'] + ", conntect: " + str(client['connected']) + ", volume: " + str(client['volume']['percent']) + ", name: " + client['name'] + ", host: " + client['host'])
 
diff --git a/control/setVolume.py b/control/setVolume.py
index a8a1bad9..ce5a199b 100755
--- a/control/setVolume.py
+++ b/control/setVolume.py
@@ -26,11 +26,11 @@ def setVolume(client, volume):
 	requestId = requestId + 1
 
 volume = int(sys.argv[2])
-j = doRequest(json.dumps({'jsonrpc': '2.0', 'method': 'System.GetStatus', 'id': 1}), 1)
+j = doRequest(json.dumps({'jsonrpc': '2.0', 'method': 'Server.GetStatus', 'id': 1}), 1)
 for client in j["result"]["clients"]:
 	setVolume(client['MAC'], volume)
 
-j = doRequest(json.dumps({'jsonrpc': '2.0', 'method': 'System.GetStatus', 'id': 1}), 1)
+j = doRequest(json.dumps({'jsonrpc': '2.0', 'method': 'Server.GetStatus', 'id': 1}), 1)
 for client in j["result"]["clients"]:
 	print("MAC: " + client['MAC'] + ", name: " + client['name'] + ", conntect: " + str(client['connected']) + ", volume: " + str(client['volume']['percent']))
 
diff --git a/control/testClient.py b/control/testClient.py
index 6e53e991..1927c84b 100755
--- a/control/testClient.py
+++ b/control/testClient.py
@@ -39,8 +39,8 @@ t_stop= threading.Event()
 t = ReaderThread(telnet, t_stop)
 t.start()
 
-doRequest("{\"jsonrpc\": \"2.0\", \"method\": \"System.GetStatus\", \"id\": 1}\r\n")
-doRequest("{\"jsonrpc\": \"2.0\", \"method\": \"System.GetStatus\", \"params\": {\"client\": \"80:1f:02:ed:fd:e0\"}, \"id\": 2}\r\n")
+doRequest("{\"jsonrpc\": \"2.0\", \"method\": \"Server.GetStatus\", \"id\": 1}\r\n")
+doRequest("{\"jsonrpc\": \"2.0\", \"method\": \"Server.GetStatus\", \"params\": {\"client\": \"80:1f:02:ed:fd:e0\"}, \"id\": 2}\r\n")
 doRequest("{\"jsonrpc\": \"2.0\", \"method\": \"Client.SetVolume\", \"params\": {\"client\": \"80:1f:02:ed:fd:e0\", \"volume\": 10}, \"id\": 3}\r\n")
 doRequest("{\"jsonrpc\": \"2.0\", \"method\": \"Client.SetVolume\", \"params\": {\"client\": \"80:1f:02:ed:fd:e0\", \"volume\": 30}, \"id\": 4}\r\n")
 doRequest("{\"jsonrpc\": \"2.0\", \"method\": \"Client.SetVolume\", \"params\": {\"client\": \"80:1f:02:ed:fd:e0\", \"volume\": 50}, \"id\": 5}\r\n")
diff --git a/server/streamServer.cpp b/server/streamServer.cpp
index 53152858..7d936875 100644
--- a/server/streamServer.cpp
+++ b/server/streamServer.cpp
@@ -141,7 +141,7 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
 				throw JsonInternalErrorException("Client not found", request.id);
 		}
 
-		if (request.method == "System.GetStatus")
+		if (request.method == "Server.GetStatus")
 		{
 			json jClient = json::array();
 			if (request.hasParam("client"))
@@ -158,10 +158,11 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
 					{"host", getHostName()},
 					{"version", VERSION}
 				}},
-				{"clients", jClient}
+				{"clients", jClient},
+				{"streams", "TODO"}
 			};
 		}
-		else if (request.method == "System.DeleteClient")
+		else if (request.method == "Server.DeleteClient")
 		{
 			clientInfo = Config::instance().getClientInfo(request.getParam("client").get<string>(), false);
 			if (clientInfo == nullptr)