diff --git a/includes/discovery/sensors/charge/linux.inc.php b/includes/discovery/sensors/charge/linux.inc.php
index f3ccb554fd..d32739aec9 100644
--- a/includes/discovery/sensors/charge/linux.inc.php
+++ b/includes/discovery/sensors/charge/linux.inc.php
@@ -26,7 +26,7 @@ if (!empty($value)) {
     $lowwarnlimit = 10;
     $descr = 'Battery Charge';
     if (is_numeric($value)) {
-        discover_sensor($valid['sensor'], 'ups_nut', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
+        discover_sensor($valid['sensor'], 'charge', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
     }
 }
 unset($oids);
diff --git a/includes/discovery/sensors/load/linux.inc.php b/includes/discovery/sensors/load/linux.inc.php
index 34175c4e48..553fc53f72 100644
--- a/includes/discovery/sensors/load/linux.inc.php
+++ b/includes/discovery/sensors/load/linux.inc.php
@@ -11,7 +11,7 @@ if (!empty($value)) {
     $lowwarnlimit = 0;
     $descr = 'Ups Load';
 
-    discover_sensor($valid['sensor'], 'ups_nut', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
+    discover_sensor($valid['sensor'], 'load', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
 }
 
 unset($oids);
diff --git a/includes/discovery/sensors/runtime/linux.inc.php b/includes/discovery/sensors/runtime/linux.inc.php
index b5ccb09694..a5f6bba8ab 100644
--- a/includes/discovery/sensors/runtime/linux.inc.php
+++ b/includes/discovery/sensors/runtime/linux.inc.php
@@ -11,7 +11,7 @@ if (!empty($value)) {
     $lowwarnlimit = 0;
     $descr = 'Time Remaining';
 
-    discover_sensor($valid['sensor'], 'ups_nut', $device, $oids, $index, $type, $descr, 60, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
+    discover_sensor($valid['sensor'], 'runtime', $device, $oids, $index, $type, $descr, 60, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
 }
 
 unset($oids);
diff --git a/includes/discovery/sensors/voltage/linux.inc.php b/includes/discovery/sensors/voltage/linux.inc.php
index e9ed67637b..36a7acbf45 100644
--- a/includes/discovery/sensors/voltage/linux.inc.php
+++ b/includes/discovery/sensors/voltage/linux.inc.php
@@ -109,7 +109,7 @@ if (!empty($value)) {
     $lowwarnlimit = 0;
     $descr = 'Battery Voltage';
 
-    discover_sensor($valid['sensor'], 'ups_nut', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
+    discover_sensor($valid['sensor'], 'voltage', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
 }
 unset($oids);
 
@@ -124,7 +124,7 @@ if (!empty($value)) {
     $lowwarnlimit = 0;
     $descr = 'Battery Nominal';
 
-    discover_sensor($valid['sensor'], 'ups_nut', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
+    discover_sensor($valid['sensor'], 'voltage', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
 }
 unset($oids);
 
@@ -139,7 +139,7 @@ if (!empty($value)) {
     $lowwarnlimit = 0;
     $descr = 'Line Nominal';
 
-    discover_sensor($valid['sensor'], 'ups_nut', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
+    discover_sensor($valid['sensor'], 'voltage', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
 }
 unset($oids);
 
@@ -154,5 +154,5 @@ if (!empty($value)) {
     $lowwarnlimit = 0;
     $descr = 'Input Voltage';
 
-    discover_sensor($valid['sensor'], 'ups_nut', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
+    discover_sensor($valid['sensor'], 'voltage', $device, $oids, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, null, $limit, $value);
 }