diff --git a/doc/motionplus_config.html b/doc/motionplus_config.html
index 70a80227..055b8ea7 100644
--- a/doc/motionplus_config.html
+++ b/doc/motionplus_config.html
@@ -117,7 +117,7 @@
               <td bgcolor="#edf4f9" ><a href="#camera" >camera</a> </td>
               <td bgcolor="#edf4f9" ><a href="#camera_dir" >camera_dir</a> </td>
             </tr>
-              <td bgcolor="#edf4f9" ><a href="#camera_tmo" >camera_tmo</a> </td>
+              <td bgcolor="#edf4f9" ><a href="#device_tmo" >device_tmo</a> </td>
               <td bgcolor="#edf4f9" ><a href="#watchdog_tmo" >watchdog_tmo</a> </td>
               <td bgcolor="#edf4f9" ><a href="#watchdog_kill" >watchdog_kill</a> </td>
               <td bgcolor="#edf4f9" ><a href="#pause" >pause</a> </td>
@@ -727,10 +727,10 @@
         </ul>
         <p></p>
 
-        <h3><a name="camera_tmo"></a>camera_tmo</h3>
+        <h3><a name="device_tmo"></a>device_tmo</h3>
         <ul>           
           <li> Values: Integer | Default: 30 </li>
-          Number of seconds that elapse before the camera is deemed to be lost.
+          Number of seconds that elapse before the device is deemed to be lost.
         </ul>
         <p></p>
 
diff --git a/src/conf.cpp b/src/conf.cpp
index bb5bcd89..497f9380 100644
--- a/src/conf.cpp
+++ b/src/conf.cpp
@@ -48,7 +48,7 @@ ctx_parm config_parms[] = {
 
     {"device_name",               PARM_TYP_STRING, PARM_CAT_01, WEBUI_LEVEL_LIMITED },
     {"device_id",                 PARM_TYP_INT,    PARM_CAT_01, WEBUI_LEVEL_LIMITED },
-    {"camera_tmo",                PARM_TYP_INT,    PARM_CAT_01, WEBUI_LEVEL_LIMITED },
+    {"device_tmo",                PARM_TYP_INT,    PARM_CAT_01, WEBUI_LEVEL_LIMITED },
     {"target_dir",                PARM_TYP_STRING, PARM_CAT_01, WEBUI_LEVEL_ADVANCED },
     {"watchdog_tmo",              PARM_TYP_INT,    PARM_CAT_01, WEBUI_LEVEL_LIMITED },
     {"watchdog_kill",             PARM_TYP_INT,    PARM_CAT_01, WEBUI_LEVEL_LIMITED },
@@ -617,23 +617,23 @@ static void conf_edit_device_id(ctx_config *conf, std::string &parm, enum PARM_A
     MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","device_id",_("device_id"));
 }
 
-static void conf_edit_camera_tmo(ctx_config *conf, std::string &parm, enum PARM_ACT pact)
+static void conf_edit_device_tmo(ctx_config *conf, std::string &parm, enum PARM_ACT pact)
 {
     int parm_in;
     if (pact == PARM_ACT_DFLT) {
-        conf->camera_tmo = 30;
+        conf->device_tmo = 30;
     } else if (pact == PARM_ACT_SET) {
         parm_in = atoi(parm.c_str());
         if (parm_in < 1) {
-            MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid camera_tmo %d"),parm_in);
+            MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid device_tmo %d"),parm_in);
         } else {
-            conf->camera_tmo = parm_in;
+            conf->device_tmo = parm_in;
         }
     } else if (pact == PARM_ACT_GET) {
-        parm = std::to_string(conf->camera_tmo);
+        parm = std::to_string(conf->device_tmo);
     }
     return;
-    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","camera_tmo",_("camera_tmo"));
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","device_tmo",_("device_tmo"));
 }
 
 static void conf_edit_camera_dir(ctx_config *conf, std::string &parm, enum PARM_ACT pact)
@@ -2843,7 +2843,7 @@ static void conf_edit_cat01(ctx_config *conf, std::string parm_nm
     } else if (parm_nm == "camera") {                conf_edit_camera(conf, parm_val, pact);
     } else if (parm_nm == "device_name") {           conf_edit_device_name(conf, parm_val, pact);
     } else if (parm_nm == "device_id") {             conf_edit_device_id(conf, parm_val, pact);
-    } else if (parm_nm == "camera_tmo") {            conf_edit_camera_tmo(conf, parm_val, pact);
+    } else if (parm_nm == "device_tmo") {            conf_edit_device_tmo(conf, parm_val, pact);
     } else if (parm_nm == "target_dir") {            conf_edit_target_dir(conf, parm_val, pact);
     } else if (parm_nm == "watchdog_tmo") {          conf_edit_watchdog_tmo(conf, parm_val, pact);
     } else if (parm_nm == "watchdog_kill") {         conf_edit_watchdog_kill(conf, parm_val, pact);
diff --git a/src/conf.hpp b/src/conf.hpp
index ad011cbf..d5e45665 100644
--- a/src/conf.hpp
+++ b/src/conf.hpp
@@ -43,7 +43,7 @@
         std::string     target_dir;
         int             watchdog_tmo;
         int             watchdog_kill;
-        int             camera_tmo;
+        int             device_tmo;
 
         /* Capture device configuration parameters */
         std::string     v4l2_device;
diff --git a/src/motion_loop.cpp b/src/motion_loop.cpp
index 823cbb81..95a1634e 100644
--- a/src/motion_loop.cpp
+++ b/src/motion_loop.cpp
@@ -841,7 +841,7 @@ static int mlp_capture(ctx_dev *cam)
         cam->lost_connection = 0;
         cam->connectionlosttime.tv_sec = 0;
 
-        if (cam->missing_frame_counter >= (cam->conf->camera_tmo * cam->conf->framerate)) {
+        if (cam->missing_frame_counter >= (cam->conf->device_tmo * cam->conf->framerate)) {
             MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Video signal re-acquired"));
             event(cam, EVENT_CAMERA_FOUND, NULL, NULL, NULL, NULL);
         }
@@ -859,7 +859,7 @@ static int mlp_capture(ctx_dev *cam)
 
         if ((cam->camera_status == STATUS_OPENED) &&
             (cam->missing_frame_counter <
-                (cam->conf->camera_tmo * cam->conf->framerate))) {
+                (cam->conf->device_tmo * cam->conf->framerate))) {
             memcpy(cam->current_image->image_norm, cam->imgs.image_vprvcy, cam->imgs.size_norm);
         } else {
             cam->lost_connection = 1;
@@ -876,14 +876,14 @@ static int mlp_capture(ctx_dev *cam)
                       10, 20 * cam->text_scale, tmpout, cam->text_scale);
 
             /* Write error message only once */
-            if (cam->missing_frame_counter == (cam->conf->camera_tmo * cam->conf->framerate)) {
+            if (cam->missing_frame_counter == (cam->conf->device_tmo * cam->conf->framerate)) {
                 MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO
                     ,_("Video signal lost - Adding grey image"));
                 event(cam, EVENT_CAMERA_LOST, NULL, NULL, NULL, &cam->connectionlosttime);
             }
 
             if ((cam->camera_status == STATUS_OPENED) &&
-                (cam->missing_frame_counter == ((cam->conf->camera_tmo * 4) * cam->conf->framerate))) {
+                (cam->missing_frame_counter == ((cam->conf->device_tmo * 4) * cam->conf->framerate))) {
                 MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO
                     ,_("Video signal still lost - Trying to close video device"));
                 mlp_cam_close(cam);