diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
index 64624c549..2bb37d471 100644
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -4,7 +4,7 @@
 
 ## **IMPORTANT! BREAKING CHANGES**
 
-Writeable Text entities have moved from type `sensor` to `text` in Home Assistant to make them also editable within an HA dashboard. Examples are `datetime`, `holidays`, `switchtime`, `vacations`, `maintenancedate`...). You will need to manually remove any old discovery topics from your MQTT broker using an application like MQTT Explorer.
+Writeable Text entities have moved from type `sensor` to `text` in Home Assistant to make them also editable within an HA dashboard. Examples are `datetime`, `holidays`, `switchtime`, `vacations`, `maintenancedate`... You will need to manually remove any old discovery topics from your MQTT broker using an application like MQTT Explorer.
 
 ## Added
 
@@ -14,7 +14,7 @@ Writeable Text entities have moved from type `sensor` to `text` in Home Assistan
 - option for `forceheatingoff` [#1262](https://github.com/emsesp/EMS-ESP32/issues/1262)
 - shower_data MQTT payload contains the timestamp [#1329](https://github.com/emsesp/EMS-ESP32/issues/1329)
 - HA discovery for writeable text entities [#1337](https://github.com/emsesp/EMS-ESP32/pull/1377)
-- Added 'system values' command that dumps all the EMS device values, plus sensors and any custom entities
+- Added 'system allvalues' command that dumps all the EMS device values, plus sensors and any custom entities
 
 ## Fixed
 
diff --git a/src/locale_translations.h b/src/locale_translations.h
index 7df48201e..8b32724b6 100644
--- a/src/locale_translations.h
+++ b/src/locale_translations.h
@@ -70,7 +70,7 @@ MAKE_WORD_TRANSLATION(schedule_cmd, "enable schedule item", "Aktiviere Zeitplan"
 MAKE_WORD_TRANSLATION(entity_cmd, "set custom value on EMS", "Sende eigene Entitäten zu EMS", "verstuur custom waarde naar EMS", "", "wyślij własną wartość na EMS", "", "", "emp üzerinde özel değer ayarla", "imposta valori personalizzati su EMS") // TODO translate
 MAKE_WORD_TRANSLATION(commands_response, "get response","Hole Antwort","Verzoek om antwoord", "", "", "", "gelen cevap", "") // TODO translate
 MAKE_WORD_TRANSLATION(coldshot_cmd, "send a cold shot of water", "", "", "", "", "", "", "soğuk su gönder", "") // TODO translate
-MAKE_WORD_TRANSLATION(values_cmd, "show all values", "", "", "", "", "", "", "", "") // TODO translate
+MAKE_WORD_TRANSLATION(allvalues_cmd, "output all values", "", "", "", "", "", "", "", "") // TODO translate
 
 // tags
 MAKE_WORD_TRANSLATION(tag_boiler_data_ww, "dhw", "WW", "dhw", "VV", "CWU", "dhw", "ecs", "SKS", "dhw")
diff --git a/src/system.cpp b/src/system.cpp
index f4cd90302..6e2759f7d 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -106,9 +106,9 @@ bool System::command_response(const char * value, const int8_t id, JsonObject &
     return true;
 }
 
-// output all the EMS devices and their values, plus the sensors and any custom things
-// basically dump everything we know about
-bool System::command_values(const char * value, const int8_t id, JsonObject & output) {
+// output all the EMS devices and their values, plus the sensors and any custom entities
+// not scheduler as these are records with no output data
+bool System::command_allvalues(const char * value, const int8_t id, JsonObject & output) {
     DynamicJsonDocument doc(EMSESP_JSON_SIZE_XXXLARGE);
     JsonObject          device_output;
 
@@ -794,7 +794,7 @@ void System::commands_init() {
     Command::add(EMSdevice::DeviceType::SYSTEM, F_(info), System::command_info, FL_(system_info_cmd));
     Command::add(EMSdevice::DeviceType::SYSTEM, F_(commands), System::command_commands, FL_(commands_cmd));
     Command::add(EMSdevice::DeviceType::SYSTEM, F("response"), System::command_response, FL_(commands_response));
-    Command::add(EMSdevice::DeviceType::SYSTEM, F_(values), System::command_values, FL_(values_cmd));
+    Command::add(EMSdevice::DeviceType::SYSTEM, F("allvalues"), System::command_allvalues, FL_(allvalues_cmd));
 
 
     // MQTT subscribe "ems-esp/system/#"
diff --git a/src/system.h b/src/system.h
index d4826bb60..d75dd247d 100644
--- a/src/system.h
+++ b/src/system.h
@@ -60,7 +60,7 @@ class System {
     static bool command_info(const char * value, const int8_t id, JsonObject & output);
     static bool command_commands(const char * value, const int8_t id, JsonObject & output);
     static bool command_response(const char * value, const int8_t id, JsonObject & output);
-    static bool command_values(const char * value, const int8_t id, JsonObject & output);
+    static bool command_allvalues(const char * value, const int8_t id, JsonObject & output);
 
 #if defined(EMSESP_TEST)
     static bool command_test(const char * value, const int8_t id);
diff --git a/src/test/test.cpp b/src/test/test.cpp
index 51427919f..f993854a2 100644
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -284,7 +284,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
         // shell.invoke_command("show devices");
         shell.invoke_command("show values");
-        shell.invoke_command("call system values");
+        shell.invoke_command("call system allvalues");
         // shell.invoke_command("call system publish");
         // shell.invoke_command("show mqtt");
         ok = true;