diff --git a/CHANGELOG.md b/CHANGELOG.md
index 061aad82a..7b68319d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ All notable changes to this project will be documented in this file.
 - Refactored Analog driver to better support multiple channels
 - Zigbee loads device data early before MCU startup (#21917)
 - Rule and Scripter sensor polling
+- GUI name of Analog<x> to ADC<x>
 
 ### Fixed
 - Berry `light.get` for separate RGB/CT (#21818)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 067827860..6bd9392c2 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -174,6 +174,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - ESP32 Framework (Arduino Core) from v3.0.0 to v3.0.4 [#21893](https://github.com/arendst/Tasmota/issues/21893)
 - Rule and Scripter sensor polling
 - Refactored Analog driver to better support multiple channels
+- GUI name of Analog<x> to ADC<x>
 - Optional MQTT_TELE_RETAIN to Energy Margins message replaced by ``SensorRetain``
 - Display timing splash screen with display modes 1 to 5
 - Allow receive or send using SerialBridge
diff --git a/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino b/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino
index 66548d861..68754c514 100644
--- a/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino
+++ b/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino
@@ -425,17 +425,17 @@ void AdcInit(void) {
       case GPIO_ADC_MQ:
         Adc[Adcs.present].mq_samples = (float*)calloc(sizeof(float), ANALOG_MQ_SAMPLES);  // Need calloc to reset registers to 0
         if (nullptr == Adc[Adcs.present].mq_samples) { continue; }
-      case GPIO_ADC_CURRENT:
-      case GPIO_ADC_VOLTAGE:
-      case GPIO_ADC_PH:
-      case GPIO_ADC_JOY:
-      case GPIO_ADC_CT_POWER:
-      case GPIO_ADC_RANGE:
-      case GPIO_ADC_BUTTON_INV:
-      case GPIO_ADC_BUTTON:
-      case GPIO_ADC_LIGHT:
-      case GPIO_ADC_TEMP:
       case GPIO_ADC_INPUT:
+      case GPIO_ADC_TEMP:
+      case GPIO_ADC_LIGHT:
+      case GPIO_ADC_BUTTON:
+      case GPIO_ADC_BUTTON_INV:
+      case GPIO_ADC_RANGE:
+      case GPIO_ADC_CT_POWER:
+      case GPIO_ADC_JOY:
+      case GPIO_ADC_PH:
+      case GPIO_ADC_VOLTAGE:
+      case GPIO_ADC_CURRENT:
         Adc[Adcs.present].indexOfPointer = -1;  // Used to skip first update of GPIO_ADC_INPUT after restart
         Adc[Adcs.present].pin = pin;
         Adc[Adcs.present].type = adc_type;
@@ -787,7 +787,7 @@ void AdcShow(bool json) {
   for (uint32_t channel = 0; channel < Adcs.present; channel++) {
     uint32_t type_index = Adc[channel].index;
 #ifdef ESP32
-    snprintf_P(adc_name, sizeof(adc_name), PSTR("Analog%d"), type_index +1);
+    snprintf_P(adc_name, sizeof(adc_name), PSTR("ADC%d"), type_index +1);
     snprintf_P(adc_channel, sizeof(adc_channel), PSTR("%d"), type_index +1);
     offset = 1;
 #endif
@@ -917,10 +917,10 @@ void AdcShow(bool json) {
         if (json) {
           AdcShowContinuation(&jsonflg);
           ResponseAppend_P(PSTR("\"pH%s\":%s"), adc_channel, ph_chr);
-  #ifdef USE_WEBSERVER
+#ifdef USE_WEBSERVER
         } else {
           WSContentSend_PD(HTTP_SNS_PH, "", ph_chr);
-  #endif // USE_WEBSERVER
+#endif // USE_WEBSERVER
         }
         break;
       }
@@ -936,13 +936,42 @@ void AdcShow(bool json) {
         if (json) {
           AdcShowContinuation(&jsonflg);
           ResponseAppend_P(PSTR("\"MQ%d_%d\":%s"), Adc[channel].param[0], type_index + offset, mq_chr);
-  #ifdef USE_WEBSERVER
+#ifdef USE_WEBSERVER
         } else {
           WSContentSend_PD(HTTP_SNS_MQ, mqnumber_chr, mq_chr);
-  #endif // USE_WEBSERVER
+#endif // USE_WEBSERVER
         }
         break;
       }
+      case GPIO_ADC_VOLTAGE: 
+        if (TasmotaGlobal.energy_driver != XNRG_33) {
+          float value = AdcGetRange(channel) / 10000;   // Volt
+          if (value < 0.0f) { value = 0.0f; }           // Disregard negative values
+          if (json) {
+            AdcShowContinuation(&jsonflg);
+            ResponseAppend_P(PSTR("\"" D_JSON_VOLTAGE "%s\":%*_f"), adc_channel, Settings->flag2.voltage_resolution, &value);
+#ifdef USE_WEBSERVER
+          } else {
+//            WSContentSend_Voltage(adc_name, value);
+            WSContentSend_PD(HTTP_SNS_F_VOLTAGE, adc_name, Settings->flag2.voltage_resolution, &value);
+#endif // USE_WEBSERVER
+          }
+        }
+        break;
+      case GPIO_ADC_CURRENT: 
+        if (TasmotaGlobal.energy_driver != XNRG_33) {
+          float value = AdcGetRange(channel) / 10000;   // Ampere
+          if (value < 0.0f) { value = 0.0f; }           // Disregard negative values
+          if (json) {
+            AdcShowContinuation(&jsonflg);
+            ResponseAppend_P(PSTR("\"" D_JSON_CURRENT "%s\":%*_f"), adc_channel, Settings->flag2.current_resolution, &value);
+#ifdef USE_WEBSERVER
+          } else {
+            WSContentSend_PD(HTTP_SNS_F_CURRENT, adc_name, Settings->flag2.current_resolution, &value);
+#endif // USE_WEBSERVER
+          }
+        }
+        break;
     }
   }
   if (jsonflg) {
@@ -1171,7 +1200,7 @@ bool Xnrg33(uint32_t function) {
           if (GPIO_ADC_VOLTAGE == adc_type) { voltage_count++; }
           if (GPIO_ADC_CURRENT == adc_type) { current_count++; }
         }
-        if (voltage_count || current_count) {
+        if (voltage_count && current_count) {
           Energy->type_dc = true;
           Energy->voltage_common = (1 == voltage_count);
           Energy->phase_count = (voltage_count > current_count) ? voltage_count : current_count;