diff --git a/resources/bloom.template.yaml b/resources/bloom.template.yaml
index bc33569b..fd040c49 100644
--- a/resources/bloom.template.yaml
+++ b/resources/bloom.template.yaml
@@ -13,7 +13,7 @@ environments:
       name: "avr-gdb-rsp"
       ipAddress: "127.0.0.1"
       port: 1442
-      rangeSteppingEnabled: true
+      rangeStepping: true
 
 insight:
   activateOnStartup: false
diff --git a/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp b/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
index c8513f0e..9a2a9764 100644
--- a/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
+++ b/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
@@ -124,7 +124,7 @@ namespace DebugServer::Gdb::AvrGdb
                 return std::make_unique<VContStepExecution>(rawPacket);
             }
 
-            if (this->debugServerConfig.rangeSteppingEnabled) {
+            if (this->debugServerConfig.rangeStepping) {
                 if (rawPacketString.find("vCont;r") == 0) {
                     return std::make_unique<VContRangeStep>(rawPacket);
                 }
diff --git a/src/DebugServer/Gdb/AvrGdb/CommandPackets/VContSupportedActionsQuery.cpp b/src/DebugServer/Gdb/AvrGdb/CommandPackets/VContSupportedActionsQuery.cpp
index cf267c8e..c0fa061b 100644
--- a/src/DebugServer/Gdb/AvrGdb/CommandPackets/VContSupportedActionsQuery.cpp
+++ b/src/DebugServer/Gdb/AvrGdb/CommandPackets/VContSupportedActionsQuery.cpp
@@ -17,7 +17,7 @@ namespace DebugServer::Gdb::AvrGdb::CommandPackets
 
         // Respond with a SupportedFeaturesResponse packet, listing all supported GDB features by Bloom
         debugSession.connection.writePacket(ResponsePackets::ResponsePacket(
-            debugSession.serverConfig.rangeSteppingEnabled
+            debugSession.serverConfig.rangeStepping
                 ? "vCont;c;C;s;S;r"
                 : "vCont;c;C;s;S"
             )
diff --git a/src/DebugServer/Gdb/GdbDebugServerConfig.cpp b/src/DebugServer/Gdb/GdbDebugServerConfig.cpp
index ba98ce0e..a2edfd05 100644
--- a/src/DebugServer/Gdb/GdbDebugServerConfig.cpp
+++ b/src/DebugServer/Gdb/GdbDebugServerConfig.cpp
@@ -31,14 +31,14 @@ namespace DebugServer::Gdb
             }
         }
 
-        if (debugServerConfig.debugServerNode["rangeSteppingEnabled"]) {
-            if (YamlUtilities::isCastable<bool>(debugServerConfig.debugServerNode["rangeSteppingEnabled"])) {
-                this->rangeSteppingEnabled = debugServerConfig.debugServerNode["rangeSteppingEnabled"].as<bool>();
+        if (debugServerConfig.debugServerNode["rangeStepping"]) {
+            if (YamlUtilities::isCastable<bool>(debugServerConfig.debugServerNode["rangeStepping"])) {
+                this->rangeStepping = debugServerConfig.debugServerNode["rangeStepping"].as<bool>();
 
             } else {
                 Logger::error(
-                    "Invalid GDB debug server config parameter ('rangeSteppingEnabled') provided - value must be "
-                    "castable to a boolean. The parameter will be ignored."
+                    "Invalid GDB debug server config parameter ('rangeStepping') provided - value must be castable to "
+                    "a boolean. The parameter will be ignored."
                 );
             }
         }
diff --git a/src/DebugServer/Gdb/GdbDebugServerConfig.hpp b/src/DebugServer/Gdb/GdbDebugServerConfig.hpp
index a1881456..86b34e3d 100644
--- a/src/DebugServer/Gdb/GdbDebugServerConfig.hpp
+++ b/src/DebugServer/Gdb/GdbDebugServerConfig.hpp
@@ -33,7 +33,7 @@ namespace DebugServer::Gdb
          *
          * This parameter is optional. If not specified, the default value set here will be used.
          */
-        bool rangeSteppingEnabled = true;
+        bool rangeStepping = true;
 
         explicit GdbDebugServerConfig(const DebugServerConfig& debugServerConfig);
     };