diff --git a/make/source.mk b/make/source.mk
index 7cf45d8f85..f2b5396fb1 100644
--- a/make/source.mk
+++ b/make/source.mk
@@ -53,8 +53,8 @@ COMMON_SRC = \
             fc/fc_hardfaults.c \
             fc/fc_tasks.c \
             fc/runtime_config.c \
-            interface/fc_msp.c \
-            interface/fc_msp_box.c \
+            interface/msp.c \
+            interface/msp_box.c \
             io/beeper.c \
             io/serial.c \
             io/statusindicator.c \
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index ae537be90a..eaad12a8d1 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -76,8 +76,8 @@
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "interface/fc_msp.h"
 #include "interface/cli.h"
+#include "interface/msp.h"
 
 #include "msp/msp_serial.h"
 
diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c
index 0878a0edf2..c576cfc00e 100644
--- a/src/main/fc/fc_tasks.c
+++ b/src/main/fc/fc_tasks.c
@@ -52,7 +52,7 @@
 #include "flight/pid.h"
 
 #include "interface/cli.h"
-#include "interface/fc_msp.h"
+#include "interface/msp.h"
 
 #include "io/beeper.h"
 #include "io/dashboard.h"
diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c
index 125323edda..b70867a8d0 100755
--- a/src/main/interface/cli.c
+++ b/src/main/interface/cli.c
@@ -99,8 +99,8 @@ extern uint8_t __config_end;
 #include "flight/servos.h"
 
 #include "interface/cli.h"
-#include "interface/fc_msp.h"
-#include "interface/fc_msp_box.h"
+#include "interface/msp.h"
+#include "interface/msp_box.h"
 #include "interface/msp_protocol.h"
 #include "interface/settings.h"
 
diff --git a/src/main/interface/fc_msp.h b/src/main/interface/fc_msp.h
deleted file mode 100644
index 964ff70469..0000000000
--- a/src/main/interface/fc_msp.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of Cleanflight.
- *
- * Cleanflight is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Cleanflight is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cleanflight.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "msp/msp.h"
-
-void mspInit(void);
-mspResult_e mspFcProcessCommand(mspPacket_t *cmd, mspPacket_t *reply, mspPostProcessFnPtr *mspPostProcessFn);
-void mspFcProcessReply(mspPacket_t *reply);
-
-void mspSerialProcessStreamSchedule(void);
diff --git a/src/main/interface/fc_msp.c b/src/main/interface/msp.c
similarity index 99%
rename from src/main/interface/fc_msp.c
rename to src/main/interface/msp.c
index eca4bbc8fc..73e1b1a475 100644
--- a/src/main/interface/fc_msp.c
+++ b/src/main/interface/msp.c
@@ -74,8 +74,8 @@
 #include "flight/pid.h"
 #include "flight/servos.h"
 
-#include "interface/fc_msp.h"
-#include "interface/fc_msp_box.h"
+#include "interface/msp.h"
+#include "interface/msp_box.h"
 #include "interface/msp_protocol.h"
 
 #include "io/asyncfatfs/asyncfatfs.h"
@@ -95,11 +95,10 @@
 #include "io/vtx.h"
 #include "io/vtx_string.h"
 
-#include "msp/msp.h"
 #include "msp/msp_serial.h"
 
-#include "rx/msp.h"
 #include "rx/rx.h"
+#include "rx/msp.h"
 
 #include "scheduler/scheduler.h"
 
diff --git a/src/main/msp/msp.h b/src/main/interface/msp.h
similarity index 89%
rename from src/main/msp/msp.h
rename to src/main/interface/msp.h
index 702898bb9b..96683fbb50 100644
--- a/src/main/msp/msp.h
+++ b/src/main/interface/msp.h
@@ -43,3 +43,8 @@ struct serialPort_s;
 typedef void (*mspPostProcessFnPtr)(struct serialPort_s *port); // msp post process function, used for gracefully handling reboots, etc.
 typedef mspResult_e (*mspProcessCommandFnPtr)(mspPacket_t *cmd, mspPacket_t *reply, mspPostProcessFnPtr *mspPostProcessFn);
 typedef void (*mspProcessReplyFnPtr)(mspPacket_t *cmd);
+
+
+void mspInit(void);
+mspResult_e mspFcProcessCommand(mspPacket_t *cmd, mspPacket_t *reply, mspPostProcessFnPtr *mspPostProcessFn);
+void mspFcProcessReply(mspPacket_t *reply);
diff --git a/src/main/interface/fc_msp_box.c b/src/main/interface/msp_box.c
similarity index 99%
rename from src/main/interface/fc_msp_box.c
rename to src/main/interface/msp_box.c
index 7ffa253f6b..e0b6ac8104 100644
--- a/src/main/interface/fc_msp_box.c
+++ b/src/main/interface/msp_box.c
@@ -32,7 +32,7 @@
 
 #include "flight/mixer.h"
 
-#include "interface/fc_msp_box.h"
+#include "interface/msp_box.h"
 
 #include "sensors/sensors.h"
 
diff --git a/src/main/interface/fc_msp_box.h b/src/main/interface/msp_box.h
similarity index 100%
rename from src/main/interface/fc_msp_box.h
rename to src/main/interface/msp_box.h
diff --git a/src/main/io/displayport_msp.c b/src/main/io/displayport_msp.c
index 4bdc14f743..434ca3868e 100644
--- a/src/main/io/displayport_msp.c
+++ b/src/main/io/displayport_msp.c
@@ -31,7 +31,7 @@
 
 #include "drivers/display.h"
 
-#include "interface/fc_msp.h"
+#include "interface/msp.h"
 #include "interface/msp_protocol.h"
 
 #include "io/displayport_msp.h"
diff --git a/src/main/msp/msp_serial.c b/src/main/msp/msp_serial.c
index 9500296b40..03c5858861 100644
--- a/src/main/msp/msp_serial.c
+++ b/src/main/msp/msp_serial.c
@@ -21,13 +21,15 @@
 
 #include "platform.h"
 
+#include "build/debug.h"
+
 #include "common/streambuf.h"
 #include "common/utils.h"
-#include "build/debug.h"
+
+#include "interface/msp.h"
 
 #include "io/serial.h"
 
-#include "msp/msp.h"
 #include "msp/msp_serial.h"
 
 static mspPort_t mspPorts[MAX_MSP_PORT_COUNT];
diff --git a/src/main/msp/msp_serial.h b/src/main/msp/msp_serial.h
index 0032937363..488f06def4 100644
--- a/src/main/msp/msp_serial.h
+++ b/src/main/msp/msp_serial.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "msp/msp.h"
+#include "interface/msp.h"
 
 // Each MSP port requires state and a receive buffer, revisit this default if someone needs more than 3 MSP ports.
 #define MAX_MSP_PORT_COUNT 3
diff --git a/src/main/osd_slave/osd_slave_init.c b/src/main/osd_slave/osd_slave_init.c
index d4e85832c7..f58a928f68 100644
--- a/src/main/osd_slave/osd_slave_init.c
+++ b/src/main/osd_slave/osd_slave_init.c
@@ -60,7 +60,7 @@
 #include "fc/runtime_config.h"
 
 #include "interface/cli.h"
-#include "interface/fc_msp.h"
+#include "interface/msp.h"
 
 #include "msp/msp_serial.h"
 
diff --git a/src/main/telemetry/msp_shared.c b/src/main/telemetry/msp_shared.c
index 67bcb842fc..3b7ea03491 100644
--- a/src/main/telemetry/msp_shared.c
+++ b/src/main/telemetry/msp_shared.c
@@ -10,7 +10,7 @@
 
 #include "common/utils.h"
 
-#include "interface/fc_msp.h"
+#include "interface/msp.h"
 
 #include "rx/crsf.h"
 
diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c
index 82c75a8f94..cc5e44f58e 100644
--- a/src/main/telemetry/smartport.c
+++ b/src/main/telemetry/smartport.c
@@ -38,7 +38,7 @@
 #include "flight/pid.h"
 #include "flight/navigation.h"
 
-#include "interface/fc_msp.h"
+#include "interface/msp.h"
 
 #include "io/beeper.h"
 #include "io/motors.h"
diff --git a/src/test/unit/cli_unittest.cc b/src/test/unit/cli_unittest.cc
index 25a8b12f30..1787d5085d 100644
--- a/src/test/unit/cli_unittest.cc
+++ b/src/test/unit/cli_unittest.cc
@@ -39,8 +39,8 @@ extern "C" {
     #include "flight/pid.h"
     #include "flight/servos.h"
     #include "interface/cli.h"
-    #include "interface/fc_msp.h"
-    #include "interface/fc_msp_box.h"
+    #include "interface/msp.h"
+    #include "interface/msp_box.h"
     #include "interface/settings.h"
     #include "io/beeper.h"
     #include "io/ledstrip.h"
diff --git a/src/test/unit/telemetry_crsf_msp_unittest.cc b/src/test/unit/telemetry_crsf_msp_unittest.cc
index 12396285ec..724542682d 100644
--- a/src/test/unit/telemetry_crsf_msp_unittest.cc
+++ b/src/test/unit/telemetry_crsf_msp_unittest.cc
@@ -46,13 +46,11 @@ extern "C" {
     #include "fc/config.h"
     #include "flight/imu.h"
 
-    #include "interface/fc_msp.h"
+    #include "interface/msp.h"
 
     #include "io/serial.h"
     #include "io/gps.h"
 
-    #include "msp/msp.h"
-
     #include "rx/rx.h"
     #include "rx/crsf.h"