diff --git a/src/Custom-sample.h b/src/Custom-sample.h
index 284c0c5bd..f6281ced5 100644
--- a/src/Custom-sample.h
+++ b/src/Custom-sample.h
@@ -189,7 +189,7 @@
 
 #define FEATURE_EXT_RTC  1         // Support for external RTC clock modules like PCF8563/PCF8523/DS3231/DS1307 
 
-#define USES_PLUGIN_STATS          // Support collecting historic data + computing stats on historic data
+#define FEATURE_PLUGIN_STATS  1    // Support collecting historic data + computing stats on historic data
 #ifdef ESP8266
 #  define PLUGIN_STATS_NR_ELEMENTS 16
 #endif // ifdef ESP8266
diff --git a/src/_P002_ADC.ino b/src/_P002_ADC.ino
index 31da06da6..112d468cc 100644
--- a/src/_P002_ADC.ino
+++ b/src/_P002_ADC.ino
@@ -71,7 +71,7 @@ boolean Plugin_002(uint8_t function, struct EventStruct *event, String& string)
       break;
     }
 
-# ifdef USES_PLUGIN_STATS
+# if FEATURE_PLUGIN_STATS
     case PLUGIN_WEBFORM_LOAD_SHOW_STATS:
     {
       P002_data_struct *P002_data =
@@ -82,7 +82,7 @@ boolean Plugin_002(uint8_t function, struct EventStruct *event, String& string)
       }
       break;
     }
-# endif // ifdef USES_PLUGIN_STATS
+# endif // if FEATURE_PLUGIN_STATS
 
     case PLUGIN_WEBFORM_SAVE:
     {
diff --git a/src/_Plugin_Helper.cpp b/src/_Plugin_Helper.cpp
index 9446a35a2..fdc180ec9 100644
--- a/src/_Plugin_Helper.cpp
+++ b/src/_Plugin_Helper.cpp
@@ -58,7 +58,7 @@ void initPluginTaskData(taskIndex_t taskIndex, PluginTaskData_base *data) {
     Plugin_task_data[taskIndex]                     = data;
     Plugin_task_data[taskIndex]->_taskdata_pluginID = Settings.TaskDeviceNumber[taskIndex];
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
     const uint8_t valueCount = getValueCountForTask(taskIndex);
     LoadTaskSettings(taskIndex);
     for (size_t i = 0; i < valueCount; ++i) {
diff --git a/src/_Plugin_Helper.h b/src/_Plugin_Helper.h
index 807a108cc..3edecbf47 100644
--- a/src/_Plugin_Helper.h
+++ b/src/_Plugin_Helper.h
@@ -45,7 +45,7 @@
 #include "src/Helpers/_Plugin_SensorTypeHelper.h"
 #include "src/Helpers/_Plugin_Helper_serial.h"
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 #include "src/PluginStructs/_StatsOnly_data_struct.h"
 #endif
 
diff --git a/src/src/CustomBuild/check_defines_custom.h b/src/src/CustomBuild/check_defines_custom.h
index c723166fd..fc933a639 100644
--- a/src/src/CustomBuild/check_defines_custom.h
+++ b/src/src/CustomBuild/check_defines_custom.h
@@ -90,6 +90,12 @@
 # undef USES_HOMEASSISTANT_OPENHAB
 #endif // ifdef USES_HOMEASSISTANT_OPENHAB
 
+#ifdef USES_PLUGIN_STATS
+# warning "Custom.h has '#define USES_PLUGIN_STATS' to be replaced with '#define FEATURE_PLUGIN_STATS 1', see https://github.com/letscontrolit/ESPEasy/pull/4153"
+# define FEATURE_PLUGIN_STATS  1
+# undef USES_PLUGIN_STATS
+#endif // ifdef USES_PLUGIN_STATS
+
 /* *INDENT-ON* */
 
 #endif // ifndef CUSTOMBUILD_CHECK_DEFINES_CUSTOM_H
diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h
index 3b9071a4a..1a3a0a2c5 100644
--- a/src/src/CustomBuild/define_plugin_sets.h
+++ b/src/src/CustomBuild/define_plugin_sets.h
@@ -310,8 +310,8 @@ To create/register a plugin, you have to :
         #define FEATURE_TRIGONOMETRIC_FUNCTIONS_RULES 1
     #endif
     #define KEEP_TRIGONOMETRIC_FUNCTIONS_RULES
-    #ifndef USES_PLUGIN_STATS
-        #define USES_PLUGIN_STATS
+    #ifndef FEATURE_PLUGIN_STATS
+        #define FEATURE_PLUGIN_STATS  1
     #endif
     #ifndef USES_CHART_JS
         #define USES_CHART_JS
@@ -847,8 +847,8 @@ To create/register a plugin, you have to :
     #ifndef PLUGIN_NEOPIXEL_COLLECTION
         #define PLUGIN_NEOPIXEL_COLLECTION
     #endif
-    #ifndef USES_PLUGIN_STATS
-        #define USES_PLUGIN_STATS
+    #ifndef FEATURE_PLUGIN_STATS
+        #define FEATURE_PLUGIN_STATS  1
     #endif
     #ifndef USES_CHART_JS
         #define USES_CHART_JS
@@ -1406,9 +1406,9 @@ To create/register a plugin, you have to :
   #ifndef USES_P128
     #define USES_P128   // NeoPixelBusFX
   #endif
-  #if defined(USES_PLUGIN_STATS) && defined(ESP8266)
+  #if FEATURE_PLUGIN_STATS && defined(ESP8266)
     // Does not fit in build
-    #undef USES_PLUGIN_STATS
+    #undef FEATURE_PLUGIN_STATS
   #endif
   #if defined(USES_CHART_JS) && defined(ESP8266)
     // Does not fit in build
@@ -1879,8 +1879,8 @@ To create/register a plugin, you have to :
     #undef FEATURE_SSDP
     #define FEATURE_SSDP  0
   #endif
-  #ifdef USES_PLUGIN_STATS
-    #undef USES_PLUGIN_STATS
+  #if FEATURE_PLUGIN_STATS
+    #undef FEATURE_PLUGIN_STATS
   #endif
   #ifdef USES_CHART_JS
     #undef USES_CHART_JS
diff --git a/src/src/DataStructs/PluginStats.cpp b/src/src/DataStructs/PluginStats.cpp
index 2b236649b..2b84dd6c5 100644
--- a/src/src/DataStructs/PluginStats.cpp
+++ b/src/src/DataStructs/PluginStats.cpp
@@ -1,6 +1,6 @@
 #include "../DataStructs/PluginStats.h"
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 # include "../../_Plugin_Helper.h"
 
 # include "../Helpers/ESPEasy_math.h"
@@ -366,4 +366,4 @@ PluginStats * PluginStats_array::getPluginStats(taskVarIndex_t taskVarIndex)
   return nullptr;
 }
 
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
diff --git a/src/src/DataStructs/PluginStats.h b/src/src/DataStructs/PluginStats.h
index 1c4cb75c3..c16b4b234 100644
--- a/src/src/DataStructs/PluginStats.h
+++ b/src/src/DataStructs/PluginStats.h
@@ -3,7 +3,7 @@
 
 #include "../../ESPEasy_common.h"
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 
 # include "../DataStructs/ChartJS_dataset_config.h"
 
@@ -169,5 +169,5 @@ private:
   PluginStats *_plugin_stats[VARS_PER_TASK] = { nullptr, };
 };
 
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
 #endif // ifndef HELPERS_PLUGINSTATS_H
diff --git a/src/src/DataStructs/PluginTaskData_base.cpp b/src/src/DataStructs/PluginTaskData_base.cpp
index 3dc337f1f..0bfd8bcd8 100644
--- a/src/src/DataStructs/PluginTaskData_base.cpp
+++ b/src/src/DataStructs/PluginTaskData_base.cpp
@@ -11,52 +11,52 @@
 
 PluginTaskData_base::PluginTaskData_base()
   : _taskdata_pluginID(INVALID_PLUGIN_ID)
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
   , _plugin_stats_array(nullptr)
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
 {}
 
 PluginTaskData_base::~PluginTaskData_base() {
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
   delete _plugin_stats_array;
   _plugin_stats_array = nullptr;
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
 }
 
 bool PluginTaskData_base::hasPluginStats() const
 {
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 
   if (_plugin_stats_array != nullptr) {
     return _plugin_stats_array->hasStats();
   }
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
   return false;
 }
 
 bool PluginTaskData_base::hasPeaks() const
 {
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 
   if (_plugin_stats_array != nullptr) {
     return _plugin_stats_array->hasPeaks();
   }
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
   return false;
 }
 
 uint8_t PluginTaskData_base::nrSamplesPresent() const
 {
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 
   if (_plugin_stats_array != nullptr) {
     return _plugin_stats_array->nrSamplesPresent();
   }
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
   return 0;
 }
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 void PluginTaskData_base::initPluginStats(taskVarIndex_t taskVarIndex)
 {
   if (taskVarIndex < VARS_PER_TASK) {
@@ -82,41 +82,41 @@ void PluginTaskData_base::clearPluginStats(taskVarIndex_t taskVarIndex)
   }
 }
 
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
 void PluginTaskData_base::pushPluginStatsValues(struct EventStruct *event, bool trackPeaks)
 {
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 
   if (_plugin_stats_array != nullptr) {
     _plugin_stats_array->pushPluginStatsValues(event, trackPeaks);
   }
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
 }
 
 bool PluginTaskData_base::plugin_get_config_value_base(struct EventStruct *event,
                                                        String            & string) const
 {
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 
   if (_plugin_stats_array != nullptr) {
     return _plugin_stats_array->plugin_get_config_value_base(event, string);
   }
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
   return false;
 }
 
 bool PluginTaskData_base::plugin_write_base(struct EventStruct *event, const String& string)
 {
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 
   if (_plugin_stats_array != nullptr) {
     return _plugin_stats_array->plugin_write_base(event, string);
   }
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
   return false;
 }
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 bool PluginTaskData_base::webformLoad_show_stats(struct EventStruct *event) const
 {
   if (_plugin_stats_array != nullptr) {
@@ -151,4 +151,4 @@ PluginStats * PluginTaskData_base::getPluginStats(taskVarIndex_t taskVarIndex)
   return nullptr;
 }
 
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
diff --git a/src/src/DataStructs/PluginTaskData_base.h b/src/src/DataStructs/PluginTaskData_base.h
index e40798e6c..ca42da194 100644
--- a/src/src/DataStructs/PluginTaskData_base.h
+++ b/src/src/DataStructs/PluginTaskData_base.h
@@ -24,10 +24,10 @@ struct PluginTaskData_base {
   bool    hasPluginStats() const;
   bool    hasPeaks() const;
   uint8_t nrSamplesPresent() const;
-  #ifdef USES_PLUGIN_STATS
+  #if FEATURE_PLUGIN_STATS
   void    initPluginStats(taskVarIndex_t taskVarIndex);
   void    clearPluginStats(taskVarIndex_t taskVarIndex);
-  #endif // ifdef USES_PLUGIN_STATS
+  #endif // if FEATURE_PLUGIN_STATS
 
   // Called right after successful PLUGIN_READ to store task values
   void pushPluginStatsValues(struct EventStruct *event,
@@ -41,19 +41,19 @@ struct PluginTaskData_base {
   bool plugin_write_base(struct EventStruct *event,
                          const String      & string);
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
   bool webformLoad_show_stats(struct EventStruct *event) const;
 # ifdef USES_CHART_JS
   void plot_ChartJS() const;
 # endif // ifdef USES_CHART_JS
-#endif  // ifdef USES_PLUGIN_STATS
+#endif  // if FEATURE_PLUGIN_STATS
 
   // We cannot use dynamic_cast, so we must keep track of the plugin ID to
   // perform checks on the casting.
   // This is also a check to only use these functions and not to insert pointers
   // at random in the Plugin_task_data array.
   pluginID_t _taskdata_pluginID = INVALID_PLUGIN_ID;
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 
   PluginStats* getPluginStats(taskVarIndex_t taskVarIndex) const;
 
@@ -63,7 +63,7 @@ private:
 
   // Array of pointers to PluginStats. One per task value.
   PluginStats_array *_plugin_stats_array = nullptr;
-#endif // ifdef USES_PLUGIN_STATS
+#endif // if FEATURE_PLUGIN_STATS
 };
 
 #endif // ifndef DATASTRUCTS_PLUGINTASKDATA_BASE_H
diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h
index 43f074acf..5a5639a7c 100644
--- a/src/src/DataTypes/ESPEasy_plugin_functions.h
+++ b/src/src/DataTypes/ESPEasy_plugin_functions.h
@@ -45,9 +45,9 @@
 #define PLUGIN_MQTT_IMPORT                 37 // For P037 MQTT import
 #define PLUGIN_FORMAT_USERVAR              38 // Allow plugin specific formatting of a task variable (event->idx = variable)
 #define PLUGIN_WEBFORM_SHOW_GPIO_DESCR     39 // Show GPIO description on devices overview tab
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 #define PLUGIN_WEBFORM_LOAD_SHOW_STATS     40 // Show PluginStats on task config page
-#endif
+#endif // if FEATURE_PLUGIN_STATS
 #define PLUGIN_I2C_HAS_ADDRESS             41 // Check the I2C addresses from the plugin, output in 'success'
 #define PLUGIN_GET_DISPLAY_PARAMETERS      42 // Fetch X/Y resolution and Rotation setting from the plugin, output in 'success'
 #define PLUGIN_WEBFORM_SHOW_ERRORSTATE_OPT 43 // Show Error State Value options, so be saved during PLUGIN_WEBFORM_SAVE
diff --git a/src/src/Globals/Plugins.cpp b/src/src/Globals/Plugins.cpp
index 34f8dec0e..a487752fc 100644
--- a/src/src/Globals/Plugins.cpp
+++ b/src/src/Globals/Plugins.cpp
@@ -320,7 +320,7 @@ bool PluginCallForTask(taskIndex_t taskIndex, uint8_t Function, EventStruct *Tem
         STOP_TIMER_TASK(DeviceIndex, Function);
 
         if (Function == PLUGIN_INIT) {
-          #ifdef USES_PLUGIN_STATS
+          #if FEATURE_PLUGIN_STATS
           if (Device[DeviceIndex].PluginStats) {
             PluginTaskData_base *taskData = getPluginTaskData(event->TaskIndex);
             if (taskData == nullptr) {
@@ -332,7 +332,7 @@ bool PluginCallForTask(taskIndex_t taskIndex, uint8_t Function, EventStruct *Tem
               }
             }
           }
-          #endif
+          #endif // if FEATURE_PLUGIN_STATS
           // Schedule the plugin to be read.
           Scheduler.schedule_task_device_timer_at_init(TempEvent->TaskIndex);
           queueTaskEvent(F("TaskInit"), taskIndex, retval);
@@ -660,17 +660,17 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str)
               queueTaskEvent(F("TaskError"), event->TaskIndex, errorStr);
             }
           } else {
-            #ifdef USES_PLUGIN_STATS
+            #if FEATURE_PLUGIN_STATS
             PluginTaskData_base *taskData = getPluginTaskData(event->TaskIndex);
             if (taskData != nullptr) {
               taskData->pushPluginStatsValues(event, !Device[DeviceIndex].PluginLogsPeaks);
             }
-            #endif
+            #endif // if FEATURE_PLUGIN_STATS
             saveUserVarToRTC();
           }
         }
         if (Function == PLUGIN_INIT) {
-          #ifdef USES_PLUGIN_STATS
+          #if FEATURE_PLUGIN_STATS
           if (Device[DeviceIndex].PluginStats) {
             PluginTaskData_base *taskData = getPluginTaskData(event->TaskIndex);
             if (taskData == nullptr) {
@@ -682,7 +682,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str)
               }
             }
           }
-          #endif
+          #endif // if FEATURE_PLUGIN_STATS
           // Schedule the plugin to be read.
           Scheduler.schedule_task_device_timer_at_init(TempEvent.TaskIndex);
           queueTaskEvent(F("TaskInit"), event->TaskIndex, retval);
@@ -714,9 +714,9 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str)
     case PLUGIN_WEBFORM_SHOW_I2C_PARAMS:
     case PLUGIN_WEBFORM_SHOW_SERIAL_PARAMS:
     case PLUGIN_WEBFORM_SHOW_GPIO_DESCR:
-#ifdef USES_PLUGIN_STATS
+    #if FEATURE_PLUGIN_STATS
     case PLUGIN_WEBFORM_LOAD_SHOW_STATS:
-#endif
+    #endif // if FEATURE_PLUGIN_STATS
     case PLUGIN_FORMAT_USERVAR:
     case PLUGIN_SET_CONFIG:
     case PLUGIN_SET_DEFAULTS:
diff --git a/src/src/PluginStructs/P002_data_struct.cpp b/src/src/PluginStructs/P002_data_struct.cpp
index e8179b32f..86ef15644 100644
--- a/src/src/PluginStructs/P002_data_struct.cpp
+++ b/src/src/PluginStructs/P002_data_struct.cpp
@@ -102,12 +102,12 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
   int raw_value            = 0;
   const float currentValue = P002_data_struct::getCurrentValue(event, raw_value);
 
-# ifdef USES_PLUGIN_STATS
+# if FEATURE_PLUGIN_STATS
 
   if (getPluginStats(0) != nullptr) {
     getPluginStats(0)->trackPeak(raw_value);
   }
-# endif // ifdef USES_PLUGIN_STATS
+# endif // if FEATURE_PLUGIN_STATS
 
 # ifdef ESP32
   addRowLabel(F("Analog Pin"));
@@ -282,7 +282,7 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
 # endif    // ifndef LIMIT_BUILD_SIZE
 }
 
-# ifdef USES_PLUGIN_STATS
+# if FEATURE_PLUGIN_STATS
 bool P002_data_struct::webformLoad_show_stats(struct EventStruct *event)
 {
   bool somethingAdded = false;
@@ -299,7 +299,7 @@ bool P002_data_struct::webformLoad_show_stats(struct EventStruct *event)
   return somethingAdded;
 }
 
-# endif // ifdef USES_PLUGIN_STATS
+# endif // if FEATURE_PLUGIN_STATS
 
 
 # ifdef ESP32
@@ -730,12 +730,12 @@ void P002_data_struct::takeSample()
   if (_sampleMode == P002_USE_CURENT_SAMPLE) { return; }
   int raw = espeasy_analogRead(_pin_analogRead);
 
-# ifdef USES_PLUGIN_STATS
+# if FEATURE_PLUGIN_STATS
 
   if (getPluginStats(0) != nullptr) {
     getPluginStats(0)->trackPeak(raw);
   }
-# endif // ifdef USES_PLUGIN_STATS
+# endif // if FEATURE_PLUGIN_STATS
 
   switch (_sampleMode) {
     case P002_USE_OVERSAMPLING:
@@ -781,12 +781,12 @@ bool P002_data_struct::getValue(float& float_value,
   }
 
   raw_value = espeasy_analogRead(_pin_analogRead);
-# ifdef USES_PLUGIN_STATS
+# if FEATURE_PLUGIN_STATS
 
   if (getPluginStats(0) != nullptr) {
     getPluginStats(0)->trackPeak(raw_value);
   }
-# endif // ifdef USES_PLUGIN_STATS
+# endif // if FEATURE_PLUGIN_STATS
   float_value = raw_value;
   # ifdef ESP32
 
diff --git a/src/src/PluginStructs/P002_data_struct.h b/src/src/PluginStructs/P002_data_struct.h
index 6e4bbaf0a..0b034c473 100644
--- a/src/src/PluginStructs/P002_data_struct.h
+++ b/src/src/PluginStructs/P002_data_struct.h
@@ -112,9 +112,9 @@ public:
 
   void webformLoad(struct EventStruct *event);
 
-# ifdef USES_PLUGIN_STATS
+# if FEATURE_PLUGIN_STATS
   bool webformLoad_show_stats(struct EventStruct *event);
-# endif // ifdef USES_PLUGIN_STATS
+# endif // if FEATURE_PLUGIN_STATS
 
 private:
 
diff --git a/src/src/PluginStructs/_StatsOnly_data_struct.cpp b/src/src/PluginStructs/_StatsOnly_data_struct.cpp
index 9e573fef0..0c4741960 100644
--- a/src/src/PluginStructs/_StatsOnly_data_struct.cpp
+++ b/src/src/PluginStructs/_StatsOnly_data_struct.cpp
@@ -1,11 +1,11 @@
 #include "../PluginStructs/_StatsOnly_data_struct.h"
 
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 
 _StatsOnly_data_struct::_StatsOnly_data_struct()
 {
 
 }
 
-#endif
\ No newline at end of file
+#endif // if FEATURE_PLUGIN_STATS
\ No newline at end of file
diff --git a/src/src/PluginStructs/_StatsOnly_data_struct.h b/src/src/PluginStructs/_StatsOnly_data_struct.h
index 27e84124c..bbc4310f0 100644
--- a/src/src/PluginStructs/_StatsOnly_data_struct.h
+++ b/src/src/PluginStructs/_StatsOnly_data_struct.h
@@ -3,13 +3,12 @@
 
 #include "../../_Plugin_Helper.h"
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 
 // Dummy class to be able to use the PluginStats for plugins that don't (yet) have their own PluginTaskData.
 struct _StatsOnly_data_struct  : public PluginTaskData_base {
-    _StatsOnly_data_struct();
-
+  _StatsOnly_data_struct();
 };
 
-#endif
-#endif
\ No newline at end of file
+#endif // if FEATURE_PLUGIN_STATS
+#endif // ifndef PLUGINSTRUCTS__STATSONLY_DATA_STRUCT_H
diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp
index 2f5f405ed..e5eec8940 100644
--- a/src/src/WebServer/DevicesPage.cpp
+++ b/src/src/WebServer/DevicesPage.cpp
@@ -976,10 +976,10 @@ void handle_devices_TaskSettingsPage(taskIndex_t taskIndex, uint8_t page)
       #endif
     }
 
-#ifdef USES_PLUGIN_STATS
+    #if FEATURE_PLUGIN_STATS
     // Task statistics and historic data in a chart
     devicePage_show_task_statistics(taskIndex, DeviceIndex);
-#endif
+    #endif // if FEATURE_PLUGIN_STATS
 
     // section: Data Acquisition
     devicePage_show_controller_config(taskIndex, DeviceIndex);
@@ -1210,7 +1210,7 @@ void devicePage_show_output_data_type(taskIndex_t taskIndex, deviceIndex_t Devic
   }
 }
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 void devicePage_show_task_statistics(taskIndex_t taskIndex, deviceIndex_t DeviceIndex)
 {
   if (Device[DeviceIndex].PluginStats)
@@ -1247,7 +1247,7 @@ void devicePage_show_task_statistics(taskIndex_t taskIndex, deviceIndex_t Device
     }
   }
 }
-#endif
+#endif // if FEATURE_PLUGIN_STATS
 
 void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t DeviceIndex)
 {
diff --git a/src/src/WebServer/DevicesPage.h b/src/src/WebServer/DevicesPage.h
index 1093c621a..697941ddb 100644
--- a/src/src/WebServer/DevicesPage.h
+++ b/src/src/WebServer/DevicesPage.h
@@ -62,9 +62,9 @@ void devicePage_show_I2C_config(taskIndex_t taskIndex);
 
 void devicePage_show_output_data_type(taskIndex_t taskIndex, deviceIndex_t DeviceIndex);
 
-#ifdef USES_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS
 void devicePage_show_task_statistics(taskIndex_t taskIndex, deviceIndex_t DeviceIndex);
-#endif
+#endif // if FEATURE_PLUGIN_STATS
 
 void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t DeviceIndex);
 
diff --git a/tools/pio/pre_custom_esp32.py b/tools/pio/pre_custom_esp32.py
index 05fc30378..d29d4b3cf 100644
--- a/tools/pio/pre_custom_esp32.py
+++ b/tools/pio/pre_custom_esp32.py
@@ -62,7 +62,7 @@ else:
     "-DFEATURE_I2CMULTIPLEXER=1",
     "-DFEATURE_TRIGONOMETRIC_FUNCTIONS_RULES=1",
 
-    "-DUSES_PLUGIN_STATS",
+    "-DFEATURE_PLUGIN_STATS=1",
     "-DUSES_CHART_JS",
 
     "-DFEATURE_SETTINGS_ARCHIVE=1",