diff --git a/mk/mcu/STM32F7.mk b/mk/mcu/STM32F7.mk
index dc7f7031b2..93508d6168 100644
--- a/mk/mcu/STM32F7.mk
+++ b/mk/mcu/STM32F7.mk
@@ -193,7 +193,7 @@ MCU_EXCLUDES = \
 
 MSC_SRC = \
             drivers/usb_msc_common.c \
-            drivers/stm32/usb_msc_f7xx.c \
+            drivers/stm32/usb_msc_hal.c \
             msc/usbd_storage.c \
             msc/usbd_storage_emfat.c \
             msc/emfat.c \
diff --git a/mk/mcu/STM32G4.mk b/mk/mcu/STM32G4.mk
index e824504020..c8c252ed63 100644
--- a/mk/mcu/STM32G4.mk
+++ b/mk/mcu/STM32G4.mk
@@ -180,7 +180,7 @@ MCU_EXCLUDES = \
 # G4's MSC use the same driver layer file with F7
 MSC_SRC = \
             drivers/usb_msc_common.c \
-            drivers/stm32/usb_msc_f7xx.c \
+            drivers/stm32/usb_msc_hal.c \
             msc/usbd_storage.c \
             msc/usbd_storage_emfat.c \
             msc/emfat.c \
diff --git a/mk/mcu/STM32H7.mk b/mk/mcu/STM32H7.mk
index 8ed04e2635..c7b0823ab5 100644
--- a/mk/mcu/STM32H7.mk
+++ b/mk/mcu/STM32H7.mk
@@ -335,7 +335,7 @@ MCU_EXCLUDES = \
             drivers/bus_i2c.c
 
 MSC_SRC = \
-            drivers/stm32/usb_msc_h7xx.c \
+            drivers/stm32/usb_msc_hal.c \
             drivers/usb_msc_common.c \
             msc/usbd_storage.c \
             msc/usbd_storage_emfat.c \
diff --git a/src/main/drivers/stm32/usb_msc_f7xx.c b/src/main/drivers/stm32/usb_msc_f7xx.c
deleted file mode 100644
index 69da876805..0000000000
--- a/src/main/drivers/stm32/usb_msc_f7xx.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This file is part of Cleanflight and Betaflight.
- *
- * Cleanflight and Betaflight are free software. You can redistribute
- * this software and/or modify this software 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 and Betaflight are distributed in the hope that they
- * 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 this software.
- *
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Author: Chris Hockuba (https://github.com/conkerkh)
- *
- */
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "platform.h"
-
-#if defined(USE_USB_MSC)
-
-#include "build/build_config.h"
-
-#include "common/utils.h"
-
-#include "blackbox/blackbox.h"
-#include "drivers/io.h"
-#include "drivers/nvic.h"
-#include "drivers/serial_usb_vcp.h"
-#include "drivers/system.h"
-#include "drivers/time.h"
-#include "drivers/usb_msc.h"
-
-#include "msc/usbd_storage.h"
-
-#include "pg/sdcard.h"
-#include "pg/usb.h"
-
-#include "vcp_hal/usbd_cdc_interface.h"
-
-#include "drivers/usb_io.h"
-#include "usbd_msc.h"
-
-uint8_t mscStart(void)
-{
-    //Start USB
-    usbGenerateDisconnectPulse();
-
-    IOInit(IOGetByTag(IO_TAG(PA11)), OWNER_USB, 0);
-    IOInit(IOGetByTag(IO_TAG(PA12)), OWNER_USB, 0);
-
-    USBD_Init(&USBD_Device, &VCP_Desc, 0);
-
-    /** Regsiter class */
-    USBD_RegisterClass(&USBD_Device, USBD_MSC_CLASS);
-
-    /** Register interface callbacks */
-    switch (blackboxConfig()->device) {
-#ifdef USE_SDCARD
-    case BLACKBOX_DEVICE_SDCARD:
-        switch (sdcardConfig()->mode) {
-#ifdef USE_SDCARD_SDIO
-        case SDCARD_MODE_SDIO:
-            USBD_MSC_RegisterStorage(&USBD_Device, &USBD_MSC_MICRO_SDIO_fops);
-            break;
-#endif
-#ifdef USE_SDCARD_SPI
-        case SDCARD_MODE_SPI:
-            USBD_MSC_RegisterStorage(&USBD_Device, &USBD_MSC_MICRO_SD_SPI_fops);
-            break;
-#endif
-        default:
-            return 1;
-        }
-        break;
-#endif
-
-#ifdef USE_FLASHFS
-    case BLACKBOX_DEVICE_FLASH:
-        USBD_MSC_RegisterStorage(&USBD_Device, &USBD_MSC_EMFAT_fops);
-        break;
-#endif
-
-    default:
-        return 1;
-    }
-
-    USBD_Start(&USBD_Device);
-
-    // NVIC configuration for SYSTick
-    NVIC_DisableIRQ(SysTick_IRQn);
-    NVIC_SetPriority(SysTick_IRQn, NVIC_BUILD_PRIORITY(0, 0));
-    NVIC_EnableIRQ(SysTick_IRQn);
-
-    return 0;
-}
-
-#endif
diff --git a/src/main/drivers/stm32/usb_msc_h7xx.c b/src/main/drivers/stm32/usb_msc_hal.c
similarity index 100%
rename from src/main/drivers/stm32/usb_msc_h7xx.c
rename to src/main/drivers/stm32/usb_msc_hal.c