diff --git a/Grbl_Esp32/src/Spindles/NullSpindle.cpp b/Grbl_Esp32/src/Spindles/NullSpindle.cpp
index e547926d..5acea59e 100644
--- a/Grbl_Esp32/src/Spindles/NullSpindle.cpp
+++ b/Grbl_Esp32/src/Spindles/NullSpindle.cpp
@@ -41,6 +41,6 @@ namespace Spindles {
 
     // Configuration registration
     namespace {
-        SpindleFactory::InstanceBuilder<Null> registration("Null");
+        SpindleFactory::InstanceBuilder<Null> registration("NoSpindle");
     }
 }
diff --git a/Grbl_Esp32/src/Spindles/NullSpindle.h b/Grbl_Esp32/src/Spindles/NullSpindle.h
index 1779c3a0..ab611e82 100644
--- a/Grbl_Esp32/src/Spindles/NullSpindle.h
+++ b/Grbl_Esp32/src/Spindles/NullSpindle.h
@@ -46,7 +46,7 @@ namespace Spindles {
         void group(Configuration::HandlerBase& handler) override {}
 
         // Name of the configurable. Must match the name registered in the cpp file.
-        const char* name() const override { return "Null"; }
+        const char* name() const override { return "NoSpindle"; }
 
         virtual ~Null() {}
     };