diff --git a/patch/kernel/meson64-current/0093-arm64-dts-VIM1-enable-RTC.patch b/patch/kernel/meson64-current/board-VIM1-enable-RTC.patch
similarity index 100%
rename from patch/kernel/meson64-current/0093-arm64-dts-VIM1-enable-RTC.patch
rename to patch/kernel/meson64-current/board-VIM1-enable-RTC.patch
diff --git a/patch/kernel/meson64-current/0099-VIM2-add-GPIO-FAN-driver-for-V12-version.patch b/patch/kernel/meson64-current/board-VIM2-add-GPIO-FAN-driver-for-V12-version.patch
similarity index 100%
rename from patch/kernel/meson64-current/0099-VIM2-add-GPIO-FAN-driver-for-V12-version.patch
rename to patch/kernel/meson64-current/board-VIM2-add-GPIO-FAN-driver-for-V12-version.patch
diff --git a/patch/kernel/meson64-current/0094-arm64-dts-VIM2-enable-RTC.patch b/patch/kernel/meson64-current/board-VIM2-enable-RTC.patch
similarity index 100%
rename from patch/kernel/meson64-current/0094-arm64-dts-VIM2-enable-RTC.patch
rename to patch/kernel/meson64-current/board-VIM2-enable-RTC.patch
diff --git a/patch/kernel/meson64-current/0096-arm64-dts-SDIO-VIM2-enable-cap-sd-highspeed.patch b/patch/kernel/meson64-current/board-VIM2-enable-cap-sd-highspeed.patch
similarity index 100%
rename from patch/kernel/meson64-current/0096-arm64-dts-SDIO-VIM2-enable-cap-sd-highspeed.patch
rename to patch/kernel/meson64-current/board-VIM2-enable-cap-sd-highspeed.patch
diff --git a/patch/kernel/meson64-current/0097-arm64-dts-SDIO-VIM3-disable-sd-uhs-sdr50-to-fix-AP63.patch b/patch/kernel/meson64-current/board-VIM3-disable-sd-uhs-sdr50-to-fix-AP63.patch
similarity index 100%
rename from patch/kernel/meson64-current/0097-arm64-dts-SDIO-VIM3-disable-sd-uhs-sdr50-to-fix-AP63.patch
rename to patch/kernel/meson64-current/board-VIM3-disable-sd-uhs-sdr50-to-fix-AP63.patch
diff --git a/patch/kernel/meson64-current/0087-WIP-arm64-dts-meson-khadas-vim3-change-LED-behaviour.patch b/patch/kernel/meson64-current/board-khadas-vim3-change-LED-behaviour.patch
similarity index 100%
rename from patch/kernel/meson64-current/0087-WIP-arm64-dts-meson-khadas-vim3-change-LED-behaviour.patch
rename to patch/kernel/meson64-current/board-khadas-vim3-change-LED-behaviour.patch
diff --git a/patch/kernel/meson64-current/0086-WIP-arm64-dts-meson-khadas-vim3-fix-missing-i2c3-nod.patch b/patch/kernel/meson64-current/board-khadas-vim3-fix-missing-i2c3-nod.patch
similarity index 100%
rename from patch/kernel/meson64-current/0086-WIP-arm64-dts-meson-khadas-vim3-fix-missing-i2c3-nod.patch
rename to patch/kernel/meson64-current/board-khadas-vim3-fix-missing-i2c3-nod.patch
diff --git a/patch/kernel/meson64-current/0088-WIP-arm64-dts-meson-khadas-vim3l-add-audio-playback-.patch b/patch/kernel/meson64-current/board-khadas-vim3l-add-audio-playback-.patch
similarity index 100%
rename from patch/kernel/meson64-current/0088-WIP-arm64-dts-meson-khadas-vim3l-add-audio-playback-.patch
rename to patch/kernel/meson64-current/board-khadas-vim3l-add-audio-playback-.patch
diff --git a/patch/kernel/meson64-current/0019-FROMGIT-ASoC-meson-gx-add-sound-card-dt-binding-docu.patch b/patch/kernel/meson64-current/docs-FROMGIT-ASoC-meson-gx-add-sound-card-dt-binding-docu.patch
similarity index 100%
rename from patch/kernel/meson64-current/0019-FROMGIT-ASoC-meson-gx-add-sound-card-dt-binding-docu.patch
rename to patch/kernel/meson64-current/docs-FROMGIT-ASoC-meson-gx-add-sound-card-dt-binding-docu.patch
diff --git a/patch/kernel/meson64-current/0065-FROMLIST-dt-bindings-display-bridge-lvds-codec-Add-n.patch b/patch/kernel/meson64-current/docs-FROMLIST-dt-bindings-display-bridge-lvds-codec-Add-n.patch
similarity index 100%
rename from patch/kernel/meson64-current/0065-FROMLIST-dt-bindings-display-bridge-lvds-codec-Add-n.patch
rename to patch/kernel/meson64-current/docs-FROMLIST-dt-bindings-display-bridge-lvds-codec-Add-n.patch