diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
index 1d928ff5..540b0cf0 100644
--- a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
+++ b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp
@@ -291,12 +291,6 @@ void BydAttoBattery::
       stateMachineClearCrash = STARTED;
       datalayer_bydatto->UserRequestCrashReset = false;
     }
-
-    // Change SOC method if requested from webserver datalayer
-    if (datalayer_bydatto->ChangeSOCMethod) {
-      SOC_method = !SOC_method;  // Toggle the SOC method
-      datalayer_bydatto->ChangeSOCMethod = false;
-    }
   }
 }
 
diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.h b/Software/src/battery/BYD-ATTO-3-BATTERY.h
index b8209c10..84baa4d5 100644
--- a/Software/src/battery/BYD-ATTO-3-BATTERY.h
+++ b/Software/src/battery/BYD-ATTO-3-BATTERY.h
@@ -58,11 +58,11 @@ class BydAttoBattery : public CanBattery {
   void reset_crash() { datalayer_bydatto->UserRequestCrashReset = true; }
 
 #ifndef USE_ESTIMATED_SOC
-  // Changing SOC method in UI is only enabled if we initially use measured SOC
-  bool supports_change_SOC_method() { return true; }
+  // Toggle SOC method in UI is only enabled if we initially use measured SOC
+  bool supports_toggle_SOC_method() { return true; }
 #endif
 
-  void change_SOC_method() { datalayer_bydatto->ChangeSOCMethod = true; }
+  void toggle_SOC_method() { SOC_method = !SOC_method; }
 
   BatteryHtmlRenderer& get_status_renderer() { return renderer; }
 
@@ -88,7 +88,6 @@ class BydAttoBattery : public CanBattery {
   unsigned long previousMillis100 = 0;  // will store last time a 100ms CAN Message was send
   unsigned long previousMillis200 = 0;  // will store last time a 200ms CAN Message was send
   bool SOC_method = false;
-  bool ChangeSOCMethod = false;
   uint8_t counter_50ms = 0;
   uint8_t counter_100ms = 0;
   uint8_t frame6_counter = 0xB;
diff --git a/Software/src/battery/Battery.h b/Software/src/battery/Battery.h
index 3e8d6f22..d7681e20 100644
--- a/Software/src/battery/Battery.h
+++ b/Software/src/battery/Battery.h
@@ -29,7 +29,7 @@ class Battery {
   virtual bool supports_set_fake_voltage() { return false; }
   virtual bool supports_manual_balancing() { return false; }
   virtual bool supports_real_BMS_status() { return false; }
-  virtual bool supports_change_SOC_method() { return false; }
+  virtual bool supports_toggle_SOC_method() { return false; }
 
   virtual void clear_isolation() {}
   virtual void reset_BMS() {}
@@ -41,7 +41,7 @@ class Battery {
   virtual void reset_BECM() {}
   virtual void request_open_contactors() {}
   virtual void request_close_contactors() {}
-  virtual void change_SOC_method() {}
+  virtual void toggle_SOC_method() {}
 
   virtual void set_fake_voltage(float v) {}
   virtual float get_voltage() { static_cast<float>(datalayer.battery.status.voltage_dV) / 10.0; }
diff --git a/Software/src/datalayer/datalayer_extended.h b/Software/src/datalayer/datalayer_extended.h
index c2435e43..0ada9d70 100644
--- a/Software/src/datalayer/datalayer_extended.h
+++ b/Software/src/datalayer/datalayer_extended.h
@@ -171,9 +171,6 @@ typedef struct {
   /** User requesting crash reset via WebUI*/
   bool UserRequestCrashReset = false;
   /** bool */
-  /** User changing SOC method via WebUI*/
-  bool ChangeSOCMethod = false;
-  /** bool */
   /** Which SOC method currently used. 0 = Estimated, 1 = Measured */
   bool SOC_method = 0;
   /** uint16_t */
diff --git a/Software/src/devboard/webserver/advanced_battery_html.cpp b/Software/src/devboard/webserver/advanced_battery_html.cpp
index c0566ffc..fab882b6 100644
--- a/Software/src/devboard/webserver/advanced_battery_html.cpp
+++ b/Software/src/devboard/webserver/advanced_battery_html.cpp
@@ -56,11 +56,11 @@ std::vector<BatteryCommand> battery_commands = {
      [](Battery* b) {
        b->reset_SOH();
      }},
-    {"changeSOC", "Change SOC method",
-     "change SOC method? This will toggle between ESTIMATED and MEASURED SOC methods.",
-     [](Battery* b) { return b && b->supports_change_SOC_method(); },
+    {"toggleSOC", "Toggle SOC method",
+     "toggle SOC method? This will toggle between ESTIMATED and MEASURED SOC methods.",
+     [](Battery* b) { return b && b->supports_toggle_SOC_method(); },
      [](Battery* b) {
-       b->change_SOC_method();
+       b->toggle_SOC_method();
      }},
 };