diff --git a/src/EMSESPDevicesService.cpp b/src/EMSESPDevicesService.cpp
index 40896ae7d..a914d89c0 100644
--- a/src/EMSESPDevicesService.cpp
+++ b/src/EMSESPDevicesService.cpp
@@ -81,7 +81,7 @@ void EMSESPDevicesService::device_data(AsyncWebServerRequest * request, JsonVari
         AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_EMSESP_DEVICE_SIZE);
 #ifndef EMSESP_STANDALONE
         uint8_t id = json["id"]; // get id from selected table row
-        EMSESP::device_info(id, (JsonObject &)response->getRoot());
+        EMSESP::device_info_web(id, (JsonObject &)response->getRoot());
 #endif
         response->setLength();
         request->send(response);
diff --git a/src/devices/boiler.h b/src/devices/boiler.h
index c149df1b5..22acb48c1 100644
--- a/src/devices/boiler.h
+++ b/src/devices/boiler.h
@@ -40,7 +40,7 @@ class Boiler : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
-    virtual void device_info(JsonArray & root);
+    virtual void device_info_web(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 
diff --git a/src/devices/connect.cpp b/src/devices/connect.cpp
index 60b8de5c3..029d9f0bd 100644
--- a/src/devices/connect.cpp
+++ b/src/devices/connect.cpp
@@ -28,7 +28,7 @@ Connect::Connect(uint8_t device_type, uint8_t device_id, uint8_t product_id, con
     : EMSdevice(device_type, device_id, product_id, version, name, flags, brand) {
 }
 
-void Connect::device_info(JsonArray & root) {
+void Connect::device_info_web(JsonArray & root) {
 }
 
 void Connect::add_context_menu() {
diff --git a/src/devices/connect.h b/src/devices/connect.h
index 51956ef5a..9e25f33eb 100644
--- a/src/devices/connect.h
+++ b/src/devices/connect.h
@@ -37,7 +37,7 @@ class Connect : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
-    virtual void device_info(JsonArray & root);
+    virtual void device_info_web(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 
diff --git a/src/devices/controller.cpp b/src/devices/controller.cpp
index 07bd9879c..23faaeac4 100644
--- a/src/devices/controller.cpp
+++ b/src/devices/controller.cpp
@@ -31,7 +31,7 @@ Controller::Controller(uint8_t device_type, uint8_t device_id, uint8_t product_i
 void Controller::add_context_menu() {
 }
 
-void Controller::device_info(JsonArray & root) {
+void Controller::device_info_web(JsonArray & root) {
 }
 
 // display all values into the shell console
diff --git a/src/devices/controller.h b/src/devices/controller.h
index d905b3864..a92931621 100644
--- a/src/devices/controller.h
+++ b/src/devices/controller.h
@@ -37,7 +37,7 @@ class Controller : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
-    virtual void device_info(JsonArray & root);
+    virtual void device_info_web(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 
diff --git a/src/devices/gateway.cpp b/src/devices/gateway.cpp
index e36e40c38..e52fc4e60 100644
--- a/src/devices/gateway.cpp
+++ b/src/devices/gateway.cpp
@@ -31,7 +31,7 @@ Gateway::Gateway(uint8_t device_type, uint8_t device_id, uint8_t product_id, con
 void Gateway::add_context_menu() {
 }
 
-void Gateway::device_info(JsonArray & root) {
+void Gateway::device_info_web(JsonArray & root) {
 }
 
 // display all values into the shell console
diff --git a/src/devices/gateway.h b/src/devices/gateway.h
index d38dbb32e..df4b6f04b 100644
--- a/src/devices/gateway.h
+++ b/src/devices/gateway.h
@@ -37,7 +37,7 @@ class Gateway : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
-    virtual void device_info(JsonArray & root);
+    virtual void device_info_web(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 
diff --git a/src/devices/heatpump.cpp b/src/devices/heatpump.cpp
index 112a27963..1ffb8014b 100644
--- a/src/devices/heatpump.cpp
+++ b/src/devices/heatpump.cpp
@@ -37,7 +37,7 @@ Heatpump::Heatpump(uint8_t device_type, uint8_t device_id, uint8_t product_id, c
 void Heatpump::add_context_menu() {
 }
 
-void Heatpump::device_info(JsonArray & root) {
+void Heatpump::device_info_web(JsonArray & root) {
 }
 
 // display all values into the shell console
diff --git a/src/devices/heatpump.h b/src/devices/heatpump.h
index a23921698..f887e7608 100644
--- a/src/devices/heatpump.h
+++ b/src/devices/heatpump.h
@@ -37,7 +37,7 @@ class Heatpump : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
-    virtual void device_info(JsonArray & root);
+    virtual void device_info_web(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 
diff --git a/src/devices/mixing.cpp b/src/devices/mixing.cpp
index caad1a3fd..08f056b24 100644
--- a/src/devices/mixing.cpp
+++ b/src/devices/mixing.cpp
@@ -60,7 +60,7 @@ void Mixing::add_context_menu() {
 }
 
 // output json to web UI
-void Mixing::device_info(JsonArray & root) {
+void Mixing::device_info_web(JsonArray & root) {
     if (type_ == Type::NONE) {
         return; // don't have any values yet
     }
diff --git a/src/devices/mixing.h b/src/devices/mixing.h
index b530ba6c2..057184ab1 100644
--- a/src/devices/mixing.h
+++ b/src/devices/mixing.h
@@ -37,7 +37,7 @@ class Mixing : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
-    virtual void device_info(JsonArray & root);
+    virtual void device_info_web(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 
diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp
index 312b7f3cc..8c6fe6a4f 100644
--- a/src/devices/solar.cpp
+++ b/src/devices/solar.cpp
@@ -54,7 +54,7 @@ void Solar::add_context_menu() {
 }
 
 // print to web
-void Solar::device_info(JsonArray & root) {
+void Solar::device_info_web(JsonArray & root) {
     render_value_json(root, "", F("Collector temperature (TS1)"), collectorTemp_, F_(degrees), 10);
     render_value_json(root, "", F("Tank bottom temperature (TS2)"), tankBottomTemp_, F_(degrees), 10);
     render_value_json(root, "", F("Tank bottom temperature (TS5)"), tankBottomTemp2_, F_(degrees), 10);
diff --git a/src/devices/solar.h b/src/devices/solar.h
index a78927818..248cd71ec 100644
--- a/src/devices/solar.h
+++ b/src/devices/solar.h
@@ -37,7 +37,7 @@ class Solar : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
-    virtual void device_info(JsonArray & root);
+    virtual void device_info_web(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 
diff --git a/src/devices/switch.cpp b/src/devices/switch.cpp
index 95d1f4454..61a7c56e7 100644
--- a/src/devices/switch.cpp
+++ b/src/devices/switch.cpp
@@ -31,7 +31,7 @@ Switch::Switch(uint8_t device_type, uint8_t device_id, uint8_t product_id, const
 void Switch::add_context_menu() {
 }
 
-void Switch::device_info(JsonArray & root) {
+void Switch::device_info_web(JsonArray & root) {
 }
 
 // display all values into the shell console
diff --git a/src/devices/switch.h b/src/devices/switch.h
index 44d9844d6..083664cd6 100644
--- a/src/devices/switch.h
+++ b/src/devices/switch.h
@@ -37,7 +37,7 @@ class Switch : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
-    virtual void device_info(JsonArray & root);
+    virtual void device_info_web(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 
diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index 904e6957d..aa2845c9d 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -163,7 +163,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
 }
 
 // prepare data for Web UI
-void Thermostat::device_info(JsonArray & root) {
+void Thermostat::device_info_web(JsonArray & root) {
     uint8_t flags = this->model();
 
     for (const auto & hc : heating_circuits_) {
diff --git a/src/devices/thermostat.h b/src/devices/thermostat.h
index 13ebb2659..f05a406a6 100644
--- a/src/devices/thermostat.h
+++ b/src/devices/thermostat.h
@@ -98,7 +98,7 @@ class Thermostat : public EMSdevice {
 
     virtual void show_values(uuid::console::Shell & shell);
     virtual void publish_values();
-    virtual void device_info(JsonArray & root);
+    virtual void device_info_web(JsonArray & root);
     virtual bool updated_values();
     virtual void add_context_menu();
 
diff --git a/src/emsdevice.h b/src/emsdevice.h
index 6e5025d51..b9160a888 100644
--- a/src/emsdevice.h
+++ b/src/emsdevice.h
@@ -140,7 +140,7 @@ class EMSdevice {
     virtual void publish_values()                          = 0;
     virtual bool updated_values()                          = 0;
     virtual void add_context_menu()                        = 0;
-    virtual void device_info(JsonArray & root)             = 0;
+    virtual void device_info_web(JsonArray & root)             = 0;
 
     std::string telegram_type_name(std::shared_ptr<const Telegram> telegram);
 
diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index f7110cfbe..ceaed6dd0 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -541,13 +541,14 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
 }
 
 // calls the device handler's function to populate a json doc with device info
-void EMSESP::device_info(const uint8_t unique_id, JsonObject & root) {
+// to be used in the Web UI
+void EMSESP::device_info_web(const uint8_t unique_id, JsonObject & root) {
     for (const auto & emsdevice : emsdevices) {
         if (emsdevice) {
             if (emsdevice->unique_id() == unique_id) {
                 root["deviceName"] = emsdevice->to_string_short(); // can;t use c_str() because of scope
                 JsonArray data     = root.createNestedArray("deviceData");
-                emsdevice->device_info(data);
+                emsdevice->device_info_web(data);
                 return;
             }
         }
diff --git a/src/emsesp.h b/src/emsesp.h
index 720fb3a41..0f19d8701 100644
--- a/src/emsesp.h
+++ b/src/emsesp.h
@@ -86,7 +86,7 @@ class EMSESP {
     static void send_raw_telegram(const char * data);
     static bool device_exists(const uint8_t device_id);
 
-    static void device_info(const uint8_t unique_id, JsonObject & root);
+    static void device_info_web(const uint8_t unique_id, JsonObject & root);
 
     static uint8_t count_devices(const uint8_t device_type);