diff --git a/lib/requestHandlers/lib.request.getDeviceSettings.js b/lib/requestHandlers/lib.request.getDeviceSetting.js
similarity index 83%
rename from lib/requestHandlers/lib.request.getDeviceSettings.js
rename to lib/requestHandlers/lib.request.getDeviceSetting.js
index a36bd9c..ffa2646 100644
--- a/lib/requestHandlers/lib.request.getDeviceSettings.js
+++ b/lib/requestHandlers/lib.request.getDeviceSetting.js
@@ -1,7 +1,7 @@
 'use strict'; 
 var RequestMediaRenderer = require('../lib.base.requestMediaRenderer');
 
-module.exports = class Request_GetDeviceSettings extends RequestMediaRenderer
+module.exports = class Request_GetDeviceSetting extends RequestMediaRenderer
 {
     constructor()
     {
@@ -35,7 +35,7 @@ module.exports = class Request_GetDeviceSettings extends RequestMediaRenderer
         if(!key)
             _reject(new Error("This request needs a key option"));
 
-        _mediaRendererRoom.getDeviceSettings(key, value).then(function(_data){
+        _mediaRendererRoom.getDeviceSetting(key).then(function(_data){
                 _resolve(_data);
             }).catch(function(_data){
                 _reject(_data);
diff --git a/lib/requestHandlers/lib.request.getRendererState.js b/lib/requestHandlers/lib.request.getRendererState.js
index f38fb9a..9aeaae7 100644
--- a/lib/requestHandlers/lib.request.getRendererState.js
+++ b/lib/requestHandlers/lib.request.getRendererState.js
@@ -137,8 +137,12 @@ module.exports = class Request_GetRendererState extends RequestLongPolling
         {
             newStateObject.rooms.push(_rendererState.rooms[udn]);
         }
+
         // add current media item
-        newStateObject["mediaItem"] = _mediaRenderer.currentMediaItemData;
+        if(Object.keys(_mediaRenderer.currentMediaItemData).length > 0)
+            newStateObject["mediaItem"] = _mediaRenderer.currentMediaItemData;
+        else
+            newStateObject["mediaItem"] = null;
 
         return newStateObject;
     }
diff --git a/lib/requestHandlers/lib.request.setDeviceSettings.js b/lib/requestHandlers/lib.request.setDeviceSetting.js
similarity index 84%
rename from lib/requestHandlers/lib.request.setDeviceSettings.js
rename to lib/requestHandlers/lib.request.setDeviceSetting.js
index 81202bd..3d5e65e 100644
--- a/lib/requestHandlers/lib.request.setDeviceSettings.js
+++ b/lib/requestHandlers/lib.request.setDeviceSetting.js
@@ -1,7 +1,7 @@
 'use strict'; 
 var RequestMediaRenderer = require('../lib.base.requestMediaRenderer');
 
-module.exports = class Request_SetDeviceSettings extends RequestMediaRenderer
+module.exports = class Request_SetDeviceSetting extends RequestMediaRenderer
 {
     constructor()
     {
@@ -36,7 +36,7 @@ module.exports = class Request_SetDeviceSettings extends RequestMediaRenderer
         if(!key || !value)
             _reject(new Error("This request needs a key and a value option"));
 
-        _mediaRendererRoom.setDeviceSettings(key, value).then(function(_data){
+        _mediaRendererRoom.setDeviceSetting(key, value).then(function(_data){
                 _resolve(_data);
             }).catch(function(_data){
                 _reject(_data);