diff --git a/Makefile b/Makefile
index 523746941c..b37df2c3e2 100644
--- a/Makefile
+++ b/Makefile
@@ -505,8 +505,8 @@ COMMON_SRC = \
             drivers/rx_xn297.c \
             drivers/pwm_esc_detect.c \
             drivers/pwm_output.c \
-            drivers/pwm_rx.c \
             drivers/rcc.c \
+            drivers/rx_pwm.c \
             drivers/serial.c \
             drivers/serial_uart.c \
             drivers/sound_beeper.c \
@@ -623,8 +623,8 @@ SPEED_OPTIMISED_SRC := $(SPEED_OPTIMISED_SRC) \
             drivers/rx_spi.c \
             drivers/rx_xn297.c \
             drivers/pwm_output.c \
-            drivers/pwm_rx.c \
             drivers/rcc.c \
+            drivers/rx_pwm.c \
             drivers/serial.c \
             drivers/serial_uart.c \
             drivers/sound_beeper.c \
diff --git a/src/main/config/config_master.h b/src/main/config/config_master.h
index f9d3385547..e2e51979db 100644
--- a/src/main/config/config_master.h
+++ b/src/main/config/config_master.h
@@ -26,7 +26,7 @@
 #include "cms/cms.h"
 
 #include "drivers/adc.h"
-#include "drivers/pwm_rx.h"
+#include "drivers/rx_pwm.h"
 #include "drivers/sound_beeper.h"
 #include "drivers/sonar_hcsr04.h"
 #include "drivers/sdcard.h"
diff --git a/src/main/drivers/pwm_rx.c b/src/main/drivers/rx_pwm.c
similarity index 100%
rename from src/main/drivers/pwm_rx.c
rename to src/main/drivers/rx_pwm.c
diff --git a/src/main/drivers/pwm_rx.h b/src/main/drivers/rx_pwm.h
similarity index 97%
rename from src/main/drivers/pwm_rx.h
rename to src/main/drivers/rx_pwm.h
index c16306a81e..a5e4629183 100644
--- a/src/main/drivers/pwm_rx.h
+++ b/src/main/drivers/rx_pwm.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "drivers/io.h"
+#include "drivers/io_types.h"
 
 typedef enum {
     INPUT_FILTERING_DISABLED = 0,
diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index d8d77c8227..090403058f 100755
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -38,7 +38,7 @@
 #include "drivers/compass.h"
 #include "drivers/system.h"
 #include "drivers/timer.h"
-#include "drivers/pwm_rx.h"
+#include "drivers/rx_pwm.h"
 #include "drivers/rx_spi.h"
 #include "drivers/serial.h"
 #include "drivers/pwm_esc_detect.h"
diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c
index a67db84ffb..31734e9fd3 100644
--- a/src/main/io/ledstrip.c
+++ b/src/main/io/ledstrip.c
@@ -38,7 +38,7 @@
 #include "drivers/accgyro.h"
 #include "drivers/gpio.h"
 #include "drivers/timer.h"
-#include "drivers/pwm_rx.h"
+#include "drivers/rx_pwm.h"
 
 #include "common/printf.h"
 #include "common/axis.h"
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index f526e5d428..e171a9cc13 100755
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -54,7 +54,7 @@ uint8_t cliMode = 0;
 #include "drivers/io_impl.h"
 #include "drivers/dma.h"
 #include "drivers/timer.h"
-#include "drivers/pwm_rx.h"
+#include "drivers/rx_pwm.h"
 #include "drivers/sdcard.h"
 #include "drivers/buf_writer.h"
 #include "drivers/serial_escserial.h"
diff --git a/src/main/main.c b/src/main/main.c
index aed6c9ba8c..78bed43c63 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -45,7 +45,7 @@
 #include "drivers/accgyro.h"
 #include "drivers/compass.h"
 #include "drivers/pwm_esc_detect.h"
-#include "drivers/pwm_rx.h"
+#include "drivers/rx_pwm.h"
 #include "drivers/pwm_output.h"
 #include "drivers/adc.h"
 #include "drivers/bus_i2c.h"
diff --git a/src/main/rx/pwm.c b/src/main/rx/pwm.c
index 0c81e35c6a..f41ce38df9 100644
--- a/src/main/rx/pwm.c
+++ b/src/main/rx/pwm.c
@@ -27,7 +27,7 @@
 
 #include "build/build_config.h"
 
-#include "drivers/pwm_rx.h"
+#include "drivers/rx_pwm.h"
 
 #include "fc/config.h"
 
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 5a00e2e56a..6a8278b19a 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -31,7 +31,7 @@
 #include "config/feature.h"
 
 #include "drivers/adc.h"
-#include "drivers/pwm_rx.h"
+#include "drivers/rx_pwm.h"
 #include "drivers/rx_spi.h"
 #include "drivers/system.h"
 
diff --git a/src/main/target/COLIBRI_RACE/i2c_bst.c b/src/main/target/COLIBRI_RACE/i2c_bst.c
index 40e6d55f18..1cf442dca4 100644
--- a/src/main/target/COLIBRI_RACE/i2c_bst.c
+++ b/src/main/target/COLIBRI_RACE/i2c_bst.c
@@ -26,7 +26,7 @@
 #include "drivers/bus_i2c.h"
 #include "drivers/gpio.h"
 #include "drivers/timer.h"
-#include "drivers/pwm_rx.h"
+#include "drivers/rx_pwm.h"
 
 #include "fc/config.h"
 #include "fc/mw.h"