diff --git a/make/source.mk b/make/source.mk
index 4beb4d2325..5267ee77aa 100644
--- a/make/source.mk
+++ b/make/source.mk
@@ -38,9 +38,9 @@ COMMON_SRC = \
             drivers/transponder_ir_erlt.c \
             fc/board_info.c \
             fc/config.c \
-            fc/fc_dispatch.c \
-            fc/fc_hardfaults.c \
-            fc/fc_tasks.c \
+            fc/dispatch.c \
+            fc/hardfaults.c \
+            fc/tasks.c \
             fc/runtime_config.c \
             interface/msp.c \
             interface/msp_box.c \
@@ -60,7 +60,7 @@ COMMON_SRC = \
             sensors/current.c \
             sensors/voltage.c \
             target/config_helper.c \
-            fc/fc_init.c \
+            fc/init.c \
             fc/controlrate_profile.c \
             drivers/camera_control.c \
             drivers/accgyro/gyro_sync.c \
@@ -70,8 +70,8 @@ COMMON_SRC = \
             drivers/rx/rx_xn297.c \
             drivers/rx/rx_pwm.c \
             drivers/serial_softserial.c \
-            fc/fc_core.c \
-            fc/fc_rc.c \
+            fc/core.c \
+            fc/rc.c \
             fc/rc_adjustments.c \
             fc/rc_controls.c \
             fc/rc_modes.c \
@@ -213,9 +213,9 @@ SPEED_OPTIMISED_SRC := $(SPEED_OPTIMISED_SRC) \
             drivers/serial_uart.c \
             drivers/system.c \
             drivers/timer.c \
-            fc/fc_core.c \
-            fc/fc_tasks.c \
-            fc/fc_rc.c \
+            fc/core.c \
+            fc/tasks.c \
+            fc/rc.c \
             fc/rc_controls.c \
             fc/runtime_config.c \
             flight/imu.c \
@@ -271,7 +271,7 @@ SIZE_OPTIMISED_SRC := $(SIZE_OPTIMISED_SRC) \
             drivers/vtx_rtc6705_soft_spi.c \
             drivers/vtx_rtc6705.c \
             drivers/vtx_common.c \
-            fc/fc_init.c \
+            fc/init.c \
             fc/board_info.c \
             config/config_eeprom.c \
             config/feature.c \
diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index 89b1b7ef6f..2593547db7 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -53,7 +53,7 @@
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
-#include "fc/fc_rc.h"
+#include "fc/rc.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index f23792f457..a980902e4f 100644
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -34,8 +34,8 @@
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
-#include "fc/fc_core.h"
-#include "fc/fc_rc.h"
+#include "fc/core.h"
+#include "fc/rc.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
 
diff --git a/src/main/fc/controlrate_profile.c b/src/main/fc/controlrate_profile.c
index 31089a6eb2..e423ab4462 100644
--- a/src/main/fc/controlrate_profile.c
+++ b/src/main/fc/controlrate_profile.c
@@ -32,7 +32,7 @@
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
-#include "fc/fc_rc.h"
+#include "fc/rc.h"
 
 controlRateConfig_t *currentControlRateProfile;
 
diff --git a/src/main/fc/fc_core.c b/src/main/fc/core.c
similarity index 99%
rename from src/main/fc/fc_core.c
rename to src/main/fc/core.c
index e3a653fb3c..efbb73339c 100644
--- a/src/main/fc/fc_core.c
+++ b/src/main/fc/core.c
@@ -54,8 +54,8 @@
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
-#include "fc/fc_core.h"
-#include "fc/fc_rc.h"
+#include "fc/core.h"
+#include "fc/rc.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/fc/fc_core.h b/src/main/fc/core.h
similarity index 100%
rename from src/main/fc/fc_core.h
rename to src/main/fc/core.h
diff --git a/src/main/fc/fc_dispatch.c b/src/main/fc/dispatch.c
similarity index 98%
rename from src/main/fc/fc_dispatch.c
rename to src/main/fc/dispatch.c
index b6fdfeef93..db372f121b 100644
--- a/src/main/fc/fc_dispatch.c
+++ b/src/main/fc/dispatch.c
@@ -28,7 +28,7 @@
 
 #include "drivers/time.h"
 
-#include "fc/fc_dispatch.h"
+#include "fc/dispatch.h"
 
 static dispatchEntry_t *head = NULL;
 static bool dispatchEnabled = false;
diff --git a/src/main/fc/fc_dispatch.h b/src/main/fc/dispatch.h
similarity index 100%
rename from src/main/fc/fc_dispatch.h
rename to src/main/fc/dispatch.h
diff --git a/src/main/fc/fc_hardfaults.c b/src/main/fc/hardfaults.c
similarity index 99%
rename from src/main/fc/fc_hardfaults.c
rename to src/main/fc/hardfaults.c
index c6f78289ef..9bd4932a60 100644
--- a/src/main/fc/fc_hardfaults.c
+++ b/src/main/fc/hardfaults.c
@@ -27,7 +27,7 @@
 #include "drivers/time.h"
 #include "drivers/transponder_ir.h"
 
-#include "fc/fc_init.h"
+#include "fc/init.h"
 
 #include "flight/mixer.h"
 
diff --git a/src/main/fc/fc_init.c b/src/main/fc/init.c
similarity index 99%
rename from src/main/fc/fc_init.c
rename to src/main/fc/init.c
index 6136711b27..c918ebe31d 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/init.c
@@ -80,8 +80,8 @@
 
 #include "fc/board_info.h"
 #include "fc/config.h"
-#include "fc/fc_init.h"
-#include "fc/fc_tasks.h"
+#include "fc/init.h"
+#include "fc/tasks.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/fc/fc_init.h b/src/main/fc/init.h
similarity index 100%
rename from src/main/fc/fc_init.h
rename to src/main/fc/init.h
diff --git a/src/main/fc/fc_rc.c b/src/main/fc/rc.c
similarity index 99%
rename from src/main/fc/fc_rc.c
rename to src/main/fc/rc.c
index bbcf7f1d42..5aff3de8ed 100644
--- a/src/main/fc/fc_rc.c
+++ b/src/main/fc/rc.c
@@ -35,8 +35,8 @@
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
 #include "drivers/time.h"
-#include "fc/fc_core.h"
-#include "fc/fc_rc.h"
+#include "fc/core.h"
+#include "fc/rc.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/fc/fc_rc.h b/src/main/fc/rc.h
similarity index 100%
rename from src/main/fc/fc_rc.h
rename to src/main/fc/rc.h
diff --git a/src/main/fc/rc_adjustments.c b/src/main/fc/rc_adjustments.c
index a3065d8f58..fdbc55f2da 100644
--- a/src/main/fc/rc_adjustments.c
+++ b/src/main/fc/rc_adjustments.c
@@ -52,7 +52,7 @@
 #include "fc/controlrate_profile.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
-#include "fc/fc_rc.h"
+#include "fc/rc.h"
 
 #include "rx/rx.h"
 
diff --git a/src/main/fc/rc_controls.c b/src/main/fc/rc_controls.c
index d67d3baaf8..d9355f261f 100644
--- a/src/main/fc/rc_controls.c
+++ b/src/main/fc/rc_controls.c
@@ -43,9 +43,9 @@
 #include "drivers/camera_control.h"
 
 #include "fc/config.h"
-#include "fc/fc_core.h"
+#include "fc/core.h"
 #include "fc/rc_controls.h"
-#include "fc/fc_rc.h"
+#include "fc/rc.h"
 #include "fc/runtime_config.h"
 
 #include "io/gps.h"
diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/tasks.c
similarity index 99%
rename from src/main/fc/fc_tasks.c
rename to src/main/fc/tasks.c
index 90052d8bb9..19e016a377 100644
--- a/src/main/fc/fc_tasks.c
+++ b/src/main/fc/tasks.c
@@ -45,9 +45,9 @@
 #include "drivers/vtx_common.h"
 
 #include "fc/config.h"
-#include "fc/fc_core.h"
-#include "fc/fc_rc.h"
-#include "fc/fc_dispatch.h"
+#include "fc/core.h"
+#include "fc/rc.h"
+#include "fc/dispatch.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
@@ -108,7 +108,7 @@
 #endif
 #endif
 
-#include "fc_tasks.h"
+#include "tasks.h"
 
 static void taskMain(timeUs_t currentTimeUs)
 {
diff --git a/src/main/fc/fc_tasks.h b/src/main/fc/tasks.h
similarity index 100%
rename from src/main/fc/fc_tasks.h
rename to src/main/fc/tasks.h
diff --git a/src/main/flight/failsafe.c b/src/main/flight/failsafe.c
index 7eca015f34..c59a64f30f 100644
--- a/src/main/flight/failsafe.c
+++ b/src/main/flight/failsafe.c
@@ -34,7 +34,7 @@
 #include "drivers/time.h"
 
 #include "fc/config.h"
-#include "fc/fc_core.h"
+#include "fc/core.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/flight/gps_rescue.c b/src/main/flight/gps_rescue.c
index 74d145e9bf..f2b4ccc632 100644
--- a/src/main/flight/gps_rescue.c
+++ b/src/main/flight/gps_rescue.c
@@ -32,7 +32,7 @@
 #include "io/gps.h"
 
 #include "fc/config.h"
-#include "fc/fc_core.h"
+#include "fc/core.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c
index a80093aac1..a84422cc39 100644
--- a/src/main/flight/mixer.c
+++ b/src/main/flight/mixer.c
@@ -49,8 +49,8 @@
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
 #include "fc/runtime_config.h"
-#include "fc/fc_core.h"
-#include "fc/fc_rc.h"
+#include "fc/core.h"
+#include "fc/rc.h"
 
 #include "flight/failsafe.h"
 #include "flight/imu.h"
diff --git a/src/main/flight/pid.c b/src/main/flight/pid.c
index b9b4da5777..7f46d52a30 100644
--- a/src/main/flight/pid.c
+++ b/src/main/flight/pid.c
@@ -39,8 +39,8 @@
 #include "drivers/sound_beeper.h"
 #include "drivers/time.h"
 
-#include "fc/fc_core.h"
-#include "fc/fc_rc.h"
+#include "fc/core.h"
+#include "fc/rc.h"
 
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c
index 5ebca90176..6fd74c8d91 100644
--- a/src/main/interface/cli.c
+++ b/src/main/interface/cli.c
@@ -88,8 +88,8 @@ extern uint8_t __config_end;
 #include "fc/board_info.h"
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
-#include "fc/fc_core.h"
-#include "fc/fc_rc.h"
+#include "fc/core.h"
+#include "fc/rc.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c
index 81c2c834b6..65108aca1b 100644
--- a/src/main/interface/msp.c
+++ b/src/main/interface/msp.c
@@ -62,8 +62,8 @@
 #include "fc/board_info.h"
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
-#include "fc/fc_core.h"
-#include "fc/fc_rc.h"
+#include "fc/core.h"
+#include "fc/rc.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c
index 97fc76b638..1721ab5d18 100644
--- a/src/main/interface/settings.c
+++ b/src/main/interface/settings.c
@@ -41,7 +41,7 @@
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
-#include "fc/fc_core.h"
+#include "fc/core.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
 
diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index 7ceeec2dda..0c4d04c0ae 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -36,7 +36,7 @@
 #include "flight/mixer.h"
 
 #include "fc/config.h"
-#include "fc/fc_core.h"
+#include "fc/core.h"
 #include "fc/runtime_config.h"
 
 #include "io/statusindicator.h"
diff --git a/src/main/io/osd.c b/src/main/io/osd.c
index c988163e5c..fdd29e1098 100644
--- a/src/main/io/osd.c
+++ b/src/main/io/osd.c
@@ -61,10 +61,10 @@
 #include "drivers/time.h"
 
 #include "fc/config.h"
-#include "fc/fc_core.h"
+#include "fc/core.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
-#include "fc/fc_rc.h"
+#include "fc/rc.h"
 #include "fc/runtime_config.h"
 
 #include "flight/failsafe.h"
diff --git a/src/main/main.c b/src/main/main.c
index 9c24fe197c..2d93e83afd 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -23,7 +23,7 @@
 
 #include "platform.h"
 
-#include "fc/fc_init.h"
+#include "fc/init.h"
 
 #include "scheduler/scheduler.h"
 
diff --git a/src/main/pg/rx.c b/src/main/pg/rx.c
index 04da0597ad..e106da5f09 100644
--- a/src/main/pg/rx.c
+++ b/src/main/pg/rx.c
@@ -29,7 +29,7 @@
 #include "config/config_reset.h"
 
 #include "drivers/io.h"
-#include "fc/fc_rc.h"
+#include "fc/rc.h"
 #include "fc/rc_controls.h"
 #include "rx/rx.h"
 #include "rx/rx_spi.h"
diff --git a/src/main/rx/spektrum.c b/src/main/rx/spektrum.c
index 1d029fc4c3..0c2d561743 100644
--- a/src/main/rx/spektrum.c
+++ b/src/main/rx/spektrum.c
@@ -36,7 +36,7 @@
 #include "io/serial.h"
 
 #include "fc/config.h"
-#include "fc/fc_dispatch.h"
+#include "fc/dispatch.h"
 
 #include "io/spektrum_rssi.h"
 #include "io/spektrum_vtx_control.h"
diff --git a/src/main/sensors/rangefinder.c b/src/main/sensors/rangefinder.c
index 0878718288..3bf386450f 100644
--- a/src/main/sensors/rangefinder.c
+++ b/src/main/sensors/rangefinder.c
@@ -46,7 +46,7 @@
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"
-#include "fc/fc_tasks.h"
+#include "fc/tasks.h"
 
 #include "sensors/sensors.h"
 #include "sensors/rangefinder.h"
diff --git a/src/main/target/CJMCU/initialisation.c b/src/main/target/CJMCU/initialisation.c
index 46b2ce5d13..21074ee54e 100644
--- a/src/main/target/CJMCU/initialisation.c
+++ b/src/main/target/CJMCU/initialisation.c
@@ -30,7 +30,7 @@
 #include "pg/bus_spi.h"
 
 
-extern void spiPreInit(void); // XXX In fc/fc_init.c
+extern void spiPreInit(void); // XXX In fc/init.c
 
 void targetBusInit(void)
 {
diff --git a/src/main/target/COLIBRI_RACE/i2c_bst.c b/src/main/target/COLIBRI_RACE/i2c_bst.c
index 220fa276b3..02685a8251 100644
--- a/src/main/target/COLIBRI_RACE/i2c_bst.c
+++ b/src/main/target/COLIBRI_RACE/i2c_bst.c
@@ -27,7 +27,7 @@
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
-#include "fc/fc_core.h"
+#include "fc/core.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/target/NAZE/initialisation.c b/src/main/target/NAZE/initialisation.c
index 359363dd48..feeeb3f8fc 100644
--- a/src/main/target/NAZE/initialisation.c
+++ b/src/main/target/NAZE/initialisation.c
@@ -31,7 +31,7 @@
 #include "pg/bus_spi.h"
 
 
-extern void spiPreInit(void); // XXX In fc/fc_init.c
+extern void spiPreInit(void); // XXX In fc/init.c
 
 void targetBusInit(void)
 {
diff --git a/src/test/Makefile b/src/test/Makefile
index 23c24d3169..565b05887b 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -28,8 +28,8 @@ alignsensor_unittest_SRC := \
 		$(USER_DIR)/common/maths.c
 
 arming_prevention_unittest_SRC := \
-		$(USER_DIR)/fc/fc_core.c \
-		$(USER_DIR)/fc/fc_dispatch.c \
+		$(USER_DIR)/fc/core.c \
+		$(USER_DIR)/fc/dispatch.c \
 		$(USER_DIR)/fc/rc_controls.c \
 		$(USER_DIR)/fc/rc_modes.c \
 		$(USER_DIR)/fc/runtime_config.c \
@@ -304,8 +304,8 @@ rcdevice_unittest_DEFINES := \
 		USE_RCDEVICE
 
 vtx_unittest_SRC := \
-		$(USER_DIR)/fc/fc_core.c \
-		$(USER_DIR)/fc/fc_dispatch.c \
+		$(USER_DIR)/fc/core.c \
+		$(USER_DIR)/fc/dispatch.c \
 		$(USER_DIR)/fc/rc_controls.c \
 		$(USER_DIR)/fc/rc_modes.c \
 		$(USER_DIR)/fc/runtime_config.c \
diff --git a/src/test/unit/arming_prevention_unittest.cc b/src/test/unit/arming_prevention_unittest.cc
index a4b164cea6..d72fae8337 100644
--- a/src/test/unit/arming_prevention_unittest.cc
+++ b/src/test/unit/arming_prevention_unittest.cc
@@ -27,7 +27,7 @@ extern "C" {
     #include "pg/rx.h"
     #include "fc/config.h"
     #include "fc/controlrate_profile.h"
-    #include "fc/fc_core.h"
+    #include "fc/core.h"
     #include "fc/rc_controls.h"
     #include "fc/rc_modes.h"
     #include "fc/runtime_config.h"
diff --git a/src/test/unit/osd_unittest.cc b/src/test/unit/osd_unittest.cc
index 45b33bb28b..6016a9fe28 100644
--- a/src/test/unit/osd_unittest.cc
+++ b/src/test/unit/osd_unittest.cc
@@ -38,7 +38,7 @@ extern "C" {
     #include "drivers/serial.h"
 
     #include "fc/config.h"
-    #include "fc/fc_core.h"
+    #include "fc/core.h"
     #include "fc/rc_controls.h"
     #include "fc/rc_modes.h"
     #include "fc/runtime_config.h"
diff --git a/src/test/unit/pid_unittest.cc b/src/test/unit/pid_unittest.cc
index f222b54115..0de0172edd 100644
--- a/src/test/unit/pid_unittest.cc
+++ b/src/test/unit/pid_unittest.cc
@@ -46,8 +46,8 @@ extern "C" {
     #include "drivers/sound_beeper.h"
     #include "drivers/time.h"
 
-    #include "fc/fc_core.h"
-    #include "fc/fc_rc.h"
+    #include "fc/core.h"
+    #include "fc/rc.h"
 
     #include "fc/rc_controls.h"
     #include "fc/runtime_config.h"
diff --git a/src/test/unit/rc_controls_unittest.cc b/src/test/unit/rc_controls_unittest.cc
index 80c387f265..a01d6a70ba 100644
--- a/src/test/unit/rc_controls_unittest.cc
+++ b/src/test/unit/rc_controls_unittest.cc
@@ -52,7 +52,7 @@ extern "C" {
 
     #include "fc/rc_controls.h"
     #include "fc/runtime_config.h"
-    #include "fc/fc_core.h"
+    #include "fc/core.h"
 
     #include "scheduler/scheduler.h"
 }
diff --git a/src/test/unit/telemetry_ibus_unittest.cc b/src/test/unit/telemetry_ibus_unittest.cc
index 7476ca5e8b..e889fad8ce 100644
--- a/src/test/unit/telemetry_ibus_unittest.cc
+++ b/src/test/unit/telemetry_ibus_unittest.cc
@@ -35,7 +35,7 @@ extern "C" {
 #include "sensors/barometer.h"
 #include "sensors/acceleration.h"
 #include "scheduler/scheduler.h"
-#include "fc/fc_tasks.h"
+#include "fc/tasks.h"
 }
 
 #include "unittest_macros.h"
diff --git a/src/test/unit/vtx_unittest.cc b/src/test/unit/vtx_unittest.cc
index 7f5747a3d0..7ed8c66c78 100644
--- a/src/test/unit/vtx_unittest.cc
+++ b/src/test/unit/vtx_unittest.cc
@@ -27,7 +27,7 @@ extern "C" {
     #include "pg/rx.h"
     #include "fc/config.h"
     #include "fc/controlrate_profile.h"
-    #include "fc/fc_core.h"
+    #include "fc/core.h"
     #include "fc/rc_controls.h"
     #include "fc/rc_modes.h"
     #include "fc/runtime_config.h"