diff --git a/fmdx_list.js b/fmdx_list.js
index e910cc8..a5f648e 100644
--- a/fmdx_list.js
+++ b/fmdx_list.js
@@ -74,7 +74,7 @@ function sendUpdate() {
     audioChannels: serverConfig.audio.audioChannels,
     audioQuality: serverConfig.audio.audioBitrate,
     contact: serverConfig.identification.contact || '',
-    device: serverConfig.deviceName || '',
+    tuner: serverConfig.device || '',
     bwLimit: bwLimit,
     version: pjson.version
   };
diff --git a/index.js b/index.js
index 9b8dfe8..b0e3bfc 100644
--- a/index.js
+++ b/index.js
@@ -422,7 +422,7 @@ app.get('/', (req, res) => {
     tuningLowerLimit: serverConfig.webserver.tuningLowerLimit,
     tuningUpperLimit: serverConfig.webserver.tuningUpperLimit,
     chatEnabled: serverConfig.webserver.chatEnabled,
-    device: serverConfig.tuner
+    device: serverConfig.device
    })
   }
 });
diff --git a/server_config.js b/server_config.js
index e3f00be..84d6688 100644
--- a/server_config.js
+++ b/server_config.js
@@ -42,7 +42,7 @@ let serverConfig = {
     tunePass: "",
     adminPass: ""
   },
-  tuner: 'tef',
+  device: 'tef',
   defaultFreq: 87.5,
   publicTuner: true,
   lockToAdmin: false,
diff --git a/web/js/confighandler.js b/web/js/confighandler.js
index c4214b1..794aee8 100644
--- a/web/js/confighandler.js
+++ b/web/js/confighandler.js
@@ -98,7 +98,7 @@ function submitData() {
         tunePass,
         adminPass,
       },
-      tuner,
+      device,
       publicTuner, 
       lockToAdmin,
       autoShutdown,
@@ -184,8 +184,8 @@ function submitData() {
           $("#com-devices").val(selectedDevice.text());
         }
 
-        $('#device-type').val(data.tuner);
-        var selectedDevice = $(".option[data-value='" + data.tuner + "']");
+        $('#device-type').val(data.device);
+        var selectedDevice = $(".option[data-value='" + data.device + "']");
         if (selectedDevice.length > 0) {
           $("#device-type").val(selectedDevice.text());
         }