diff --git a/esphome/components/opentherm/hub.h b/esphome/components/opentherm/hub.h
index 80fd268820..ee0cfd104d 100644
--- a/esphome/components/opentherm/hub.h
+++ b/esphome/components/opentherm/hub.h
@@ -1,10 +1,10 @@
 #pragma once
 
+#include <vector>
+#include "esphome/core/component.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
-#include "esphome/core/component.h"
 #include "esphome/core/log.h"
-#include <vector>
 
 #include "opentherm.h"
 
@@ -17,21 +17,21 @@
 #endif
 
 #ifdef OPENTHERM_USE_SWITCH
-#include "esphome/components/opentherm/switch/switch.h"
+#include "esphome/components/opentherm/switch/opentherm_switch.h"
 #endif
 
 #ifdef OPENTHERM_USE_OUTPUT
-#include "esphome/components/opentherm/output/output.h"
+#include "esphome/components/opentherm/output/opentherm_output.h"
 #endif
 
 #ifdef OPENTHERM_USE_NUMBER
-#include "esphome/components/opentherm/number/number.h"
+#include "esphome/components/opentherm/number/opentherm_number.h"
 #endif
 
+#include <functional>
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
-#include <functional>
 
 #include "opentherm_macros.h"
 
diff --git a/esphome/components/opentherm/number/number.cpp b/esphome/components/opentherm/number/opentherm_number.cpp
similarity index 97%
rename from esphome/components/opentherm/number/number.cpp
rename to esphome/components/opentherm/number/opentherm_number.cpp
index 90ab5d6490..c5d094aa36 100644
--- a/esphome/components/opentherm/number/number.cpp
+++ b/esphome/components/opentherm/number/opentherm_number.cpp
@@ -1,4 +1,4 @@
-#include "number.h"
+#include "opentherm_number.h"
 
 namespace esphome {
 namespace opentherm {
diff --git a/esphome/components/opentherm/number/number.h b/esphome/components/opentherm/number/opentherm_number.h
similarity index 100%
rename from esphome/components/opentherm/number/number.h
rename to esphome/components/opentherm/number/opentherm_number.h
diff --git a/esphome/components/opentherm/output/output.cpp b/esphome/components/opentherm/output/opentherm_output.cpp
similarity index 95%
rename from esphome/components/opentherm/output/output.cpp
rename to esphome/components/opentherm/output/opentherm_output.cpp
index 486aa0d4e7..ff82ddd72c 100644
--- a/esphome/components/opentherm/output/output.cpp
+++ b/esphome/components/opentherm/output/opentherm_output.cpp
@@ -1,5 +1,5 @@
 #include "esphome/core/helpers.h"  // for clamp() and lerp()
-#include "output.h"
+#include "opentherm_output.h"
 
 namespace esphome {
 namespace opentherm {
diff --git a/esphome/components/opentherm/output/output.h b/esphome/components/opentherm/output/opentherm_output.h
similarity index 100%
rename from esphome/components/opentherm/output/output.h
rename to esphome/components/opentherm/output/opentherm_output.h
diff --git a/esphome/components/opentherm/switch/switch.cpp b/esphome/components/opentherm/switch/opentherm_switch.cpp
similarity index 96%
rename from esphome/components/opentherm/switch/switch.cpp
rename to esphome/components/opentherm/switch/opentherm_switch.cpp
index 228d9ac8f3..5c5d62e68e 100644
--- a/esphome/components/opentherm/switch/switch.cpp
+++ b/esphome/components/opentherm/switch/opentherm_switch.cpp
@@ -1,4 +1,4 @@
-#include "switch.h"
+#include "opentherm_switch.h"
 
 namespace esphome {
 namespace opentherm {
diff --git a/esphome/components/opentherm/switch/switch.h b/esphome/components/opentherm/switch/opentherm_switch.h
similarity index 100%
rename from esphome/components/opentherm/switch/switch.h
rename to esphome/components/opentherm/switch/opentherm_switch.h