diff --git a/esphome/core/controller_registry.cpp b/esphome/core/controller_registry.cpp
index da7fd5c837..b3f4c646a3 100644
--- a/esphome/core/controller_registry.cpp
+++ b/esphome/core/controller_registry.cpp
@@ -3,13 +3,13 @@
 
 namespace esphome {
 
-std::vector<Controller *> ControllerRegistry::controllers_;
+std::vector<Controller *> ControllerRegistry::controllers;
 
-void ControllerRegistry::register_controller(Controller *controller) { controllers_.push_back(controller); }
+void ControllerRegistry::register_controller(Controller *controller) { controllers.push_back(controller); }
 
 #ifdef USE_BINARY_SENSOR
 void ControllerRegistry::notify_binary_sensor_update(binary_sensor::BinarySensor *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_binary_sensor_update(obj);
   }
 }
@@ -17,7 +17,7 @@ void ControllerRegistry::notify_binary_sensor_update(binary_sensor::BinarySensor
 
 #ifdef USE_FAN
 void ControllerRegistry::notify_fan_update(fan::Fan *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_fan_update(obj);
   }
 }
@@ -25,7 +25,7 @@ void ControllerRegistry::notify_fan_update(fan::Fan *obj) {
 
 #ifdef USE_LIGHT
 void ControllerRegistry::notify_light_update(light::LightState *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_light_update(obj);
   }
 }
@@ -33,7 +33,7 @@ void ControllerRegistry::notify_light_update(light::LightState *obj) {
 
 #ifdef USE_SENSOR
 void ControllerRegistry::notify_sensor_update(sensor::Sensor *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_sensor_update(obj);
   }
 }
@@ -41,7 +41,7 @@ void ControllerRegistry::notify_sensor_update(sensor::Sensor *obj) {
 
 #ifdef USE_SWITCH
 void ControllerRegistry::notify_switch_update(switch_::Switch *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_switch_update(obj);
   }
 }
@@ -49,7 +49,7 @@ void ControllerRegistry::notify_switch_update(switch_::Switch *obj) {
 
 #ifdef USE_COVER
 void ControllerRegistry::notify_cover_update(cover::Cover *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_cover_update(obj);
   }
 }
@@ -57,7 +57,7 @@ void ControllerRegistry::notify_cover_update(cover::Cover *obj) {
 
 #ifdef USE_TEXT_SENSOR
 void ControllerRegistry::notify_text_sensor_update(text_sensor::TextSensor *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_text_sensor_update(obj);
   }
 }
@@ -65,7 +65,7 @@ void ControllerRegistry::notify_text_sensor_update(text_sensor::TextSensor *obj)
 
 #ifdef USE_CLIMATE
 void ControllerRegistry::notify_climate_update(climate::Climate *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_climate_update(obj);
   }
 }
@@ -73,7 +73,7 @@ void ControllerRegistry::notify_climate_update(climate::Climate *obj) {
 
 #ifdef USE_NUMBER
 void ControllerRegistry::notify_number_update(number::Number *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_number_update(obj);
   }
 }
@@ -81,7 +81,7 @@ void ControllerRegistry::notify_number_update(number::Number *obj) {
 
 #ifdef USE_DATETIME_DATE
 void ControllerRegistry::notify_date_update(datetime::DateEntity *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_date_update(obj);
   }
 }
@@ -89,7 +89,7 @@ void ControllerRegistry::notify_date_update(datetime::DateEntity *obj) {
 
 #ifdef USE_DATETIME_TIME
 void ControllerRegistry::notify_time_update(datetime::TimeEntity *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_time_update(obj);
   }
 }
@@ -97,7 +97,7 @@ void ControllerRegistry::notify_time_update(datetime::TimeEntity *obj) {
 
 #ifdef USE_DATETIME_DATETIME
 void ControllerRegistry::notify_datetime_update(datetime::DateTimeEntity *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_datetime_update(obj);
   }
 }
@@ -105,7 +105,7 @@ void ControllerRegistry::notify_datetime_update(datetime::DateTimeEntity *obj) {
 
 #ifdef USE_TEXT
 void ControllerRegistry::notify_text_update(text::Text *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_text_update(obj);
   }
 }
@@ -113,7 +113,7 @@ void ControllerRegistry::notify_text_update(text::Text *obj) {
 
 #ifdef USE_SELECT
 void ControllerRegistry::notify_select_update(select::Select *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_select_update(obj);
   }
 }
@@ -121,7 +121,7 @@ void ControllerRegistry::notify_select_update(select::Select *obj) {
 
 #ifdef USE_LOCK
 void ControllerRegistry::notify_lock_update(lock::Lock *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_lock_update(obj);
   }
 }
@@ -129,7 +129,7 @@ void ControllerRegistry::notify_lock_update(lock::Lock *obj) {
 
 #ifdef USE_VALVE
 void ControllerRegistry::notify_valve_update(valve::Valve *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_valve_update(obj);
   }
 }
@@ -137,7 +137,7 @@ void ControllerRegistry::notify_valve_update(valve::Valve *obj) {
 
 #ifdef USE_MEDIA_PLAYER
 void ControllerRegistry::notify_media_player_update(media_player::MediaPlayer *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_media_player_update(obj);
   }
 }
@@ -145,7 +145,7 @@ void ControllerRegistry::notify_media_player_update(media_player::MediaPlayer *o
 
 #ifdef USE_ALARM_CONTROL_PANEL
 void ControllerRegistry::notify_alarm_control_panel_update(alarm_control_panel::AlarmControlPanel *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_alarm_control_panel_update(obj);
   }
 }
@@ -153,7 +153,7 @@ void ControllerRegistry::notify_alarm_control_panel_update(alarm_control_panel::
 
 #ifdef USE_EVENT
 void ControllerRegistry::notify_event(event::Event *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_event(obj);
   }
 }
@@ -161,7 +161,7 @@ void ControllerRegistry::notify_event(event::Event *obj) {
 
 #ifdef USE_UPDATE
 void ControllerRegistry::notify_update(update::UpdateEntity *obj) {
-  for (auto *controller : controllers_) {
+  for (auto *controller : controllers) {
     controller->on_update(obj);
   }
 }
diff --git a/esphome/core/controller_registry.h b/esphome/core/controller_registry.h
index 6a72195b63..72485c356b 100644
--- a/esphome/core/controller_registry.h
+++ b/esphome/core/controller_registry.h
@@ -234,7 +234,7 @@ class ControllerRegistry {
 #endif
 
  protected:
-  static std::vector<Controller *> controllers_;
+  static std::vector<Controller *> controllers;
 };
 
 }  // namespace esphome