diff --git a/src/core/analogsensor.h b/src/core/analogsensor.h
index 955e6e6c2..f774dd11b 100644
--- a/src/core/analogsensor.h
+++ b/src/core/analogsensor.h
@@ -164,8 +164,8 @@ class AnalogSensor {
         return (!sensors_.empty());
     }
 
-    size_t count_entities(bool include_disabled = true) const {
-        if (!include_disabled) {
+    size_t count_entities(bool exclude_disabled_system = false) const {
+        if (exclude_disabled_system) {
             // count number of items in sensors_ where type is not set to disabled and not a system sensor
             return std::count_if(sensors_.begin(), sensors_.end(), [](const Sensor & sensor) {
                 return sensor.type() != AnalogSensor::AnalogType::NOTUSED && !sensor.is_system();
diff --git a/src/core/temperaturesensor.h b/src/core/temperaturesensor.h
index d7868c81d..f754e3a14 100644
--- a/src/core/temperaturesensor.h
+++ b/src/core/temperaturesensor.h
@@ -114,9 +114,9 @@ class TemperatureSensor {
         return (!sensors_.empty());
     }
 
-    size_t count_entities(bool include_system = true) const {
-        return std::count_if(sensors_.begin(), sensors_.end(), [include_system](const Sensor & sensor) {
-            return include_system ? sensor.is_system() : !sensor.is_system();
+    size_t count_entities(bool exclude_disabled_system = false) const {
+        return std::count_if(sensors_.begin(), sensors_.end(), [exclude_disabled_system](const Sensor & sensor) {
+            return exclude_disabled_system ? !sensor.is_system() : sensor.is_system();
         });
     }