diff --git a/config/boards/bananapim2ultra.csc b/config/boards/bananapim2ultra.csc
index b61e3a5c40..1215eb3a79 100644
--- a/config/boards/bananapim2ultra.csc
+++ b/config/boards/bananapim2ultra.csc
@@ -1,5 +1,5 @@
 # Allwinner R40 quad core 2Gb SoC Wifi eMMC
-BOARD_NAME="Banana Pi M2U"
+BOARD_NAME="Banana Pi M2 Ultra"
 BOARDFAMILY="sun8i"
 BOOTCONFIG="Bananapi_M2_Ultra_defconfig"
 OVERLAY_PREFIX="sun8i-r40"
diff --git a/config/boards/bananapir2pro.csc b/config/boards/bananapir2pro.csc
index 04a7075a60..7b86ac5625 100644
--- a/config/boards/bananapir2pro.csc
+++ b/config/boards/bananapir2pro.csc
@@ -1,5 +1,5 @@
 # Rockchip RK3568 quad core 2GB-4GB 5GBE eMMC SATA USB3 Mini PCIE M.2 key-e
-BOARD_NAME="Banana Pi R2"
+BOARD_NAME="Banana Pi R2 Pro"
 BOARDFAMILY="media"
 BOOTCONFIG="bpi-r2pro-rk3568_defconfig"
 KERNEL_TARGET="legacy,current,edge"
diff --git a/config/boards/cubieboard.csc b/config/boards/cubieboard.csc
index a7c44711fa..ca1c5dbd34 100644
--- a/config/boards/cubieboard.csc
+++ b/config/boards/cubieboard.csc
@@ -1,5 +1,5 @@
 # Allwinner A10 single core 1Gb SoC 1xSATA
-BOARD_NAME="Cubieboard"
+BOARD_NAME="Cubieboard 1"
 BOARDFAMILY="sun4i"
 BOOTCONFIG="Cubieboard_config"
 BUILD_DESKTOP="no"
diff --git a/config/boards/fe-som-rk3399.csc b/config/boards/fe-som-rk3399.csc
index 4aab125fe0..e5243c73df 100644
--- a/config/boards/fe-som-rk3399.csc
+++ b/config/boards/fe-som-rk3399.csc
@@ -1,5 +1,5 @@
 # Rockchip RK3399 hexa core 2GB/4GB RAM SoC GBE USB3 USB-C WiFi/BT eMMC NVMe PCI-e i2c
-BOARD_NAME="FE-SOM-RK3399"
+BOARD_NAME="FE SOM RK3399"
 BOARDFAMILY="rk3399"
 BOOTCONFIG="nanopc-t4-rk3399_defconfig"
 BUILD_DESKTOP="no"
diff --git a/config/boards/lime-a33.csc b/config/boards/lime-a33.csc
index 0b969ba69d..f46eeac972 100644
--- a/config/boards/lime-a33.csc
+++ b/config/boards/lime-a33.csc
@@ -1,5 +1,5 @@
 # Allwinner A33 quad core 1Gb SoC
-BOARD_NAME="Lime A33"
+BOARD_NAME="A33 OLinuXino"
 BOARDFAMILY="sun8i"
 BUILD_DESKTOP="no"
 BOOTCONFIG="A33-OLinuXino_defconfig"
diff --git a/config/boards/lime-a64.conf b/config/boards/lime-a64.conf
index a10bda29b9..0ba9ad8914 100644
--- a/config/boards/lime-a64.conf
+++ b/config/boards/lime-a64.conf
@@ -1,5 +1,5 @@
 # Allwinner A64 quad core 1GB RAM SoC GBE eMMC Wi-Fi/BT
-BOARD_NAME="Lime A64"
+BOARD_NAME="A64 OLinuXino"
 BOARDFAMILY="sun50iw1"
 BOOTCONFIG_DEFAULT="sun50iw1p1_config"
 BOOTCONFIG="a64-olinuxino_defconfig"
diff --git a/config/boards/lime.csc b/config/boards/lime.csc
index 40bc6a62a0..52f62f94c1 100644
--- a/config/boards/lime.csc
+++ b/config/boards/lime.csc
@@ -1,5 +1,5 @@
 # Allwinner A20 dual core 512Mb SoC
-BOARD_NAME="Lime"
+BOARD_NAME="A20 OLinuXino Lime"
 BOARDFAMILY="sun7i"
 BOOTCONFIG="A20-OLinuXino-Lime_defconfig"
 KERNEL_TARGET="current,edge"
diff --git a/config/boards/lime2.conf b/config/boards/lime2.conf
index c1db66be23..fd47e30acf 100644
--- a/config/boards/lime2.conf
+++ b/config/boards/lime2.conf
@@ -1,5 +1,5 @@
 # Allwinner A20 dual core 1GB RAM SoC eMMC GBE 1xSATA
-BOARD_NAME="Lime 2"
+BOARD_NAME="A20 OLinuXino Lime 2"
 BOARDFAMILY="sun7i"
 BOOTCONFIG="A20-OLinuXino-Lime2-eMMC_defconfig"
 KERNEL_TARGET="legacy,current,edge"
diff --git a/config/boards/macchiatobin-doubleshot.csc b/config/boards/macchiatobin-doubleshot.csc
index 389ad80160..c56801ac22 100644
--- a/config/boards/macchiatobin-doubleshot.csc
+++ b/config/boards/macchiatobin-doubleshot.csc
@@ -1,5 +1,5 @@
 # Marvell Armada 8040 DDR4 RAM SoC 1xPCIx4 3xSATA 1xGBE 1x2.5GBE 2x10GBE USB3.0 eMMC SPI
-BOARD_NAME="MACCHIATObin Double Shot"
+BOARD_NAME="Macchiatobin DS"
 BOARDFAMILY="mvebu64"
 BOOTCONFIG="mvebu_mcbin-88f8040_defconfig"
 BUILD_DESKTOP="no"
diff --git a/config/boards/micro.csc b/config/boards/micro.csc
index 04228920e7..8dd1e748ad 100644
--- a/config/boards/micro.csc
+++ b/config/boards/micro.csc
@@ -1,5 +1,5 @@
 # Allwinner A20 dual core 1Gb SoC eMMC 1xSATA
-BOARD_NAME="Micro"
+BOARD_NAME="A20 OLinuXino Micro"
 BOARDFAMILY="sun7i"
 BOOTCONFIG="A20-OLinuXino_MICRO-eMMC_defconfig"
 KERNEL_TARGET="current,edge"
diff --git a/config/boards/olinux-som-a13.csc b/config/boards/olinux-som-a13.csc
index 09f73b64a2..cab7854902 100644
--- a/config/boards/olinux-som-a13.csc
+++ b/config/boards/olinux-som-a13.csc
@@ -1,5 +1,5 @@
 # Allwinner A13 single core 512Mb SoM
-BOARD_NAME="SoM A13"
+BOARD_NAME="Olimex A13 SOM"
 BOARDFAMILY="sun5i"
 BUILD_DESKTOP="no"
 BOOTCONFIG="A13-OLinuXino_defconfig"
diff --git a/config/boards/olinuxino-a13.csc b/config/boards/olinuxino-a13.csc
deleted file mode 100644
index 6d682866ee..0000000000
--- a/config/boards/olinuxino-a13.csc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Allwinner A13 single core 512Mb
-BOARD_NAME="A13-OLinuXino"
-BOARDFAMILY="sun5i"
-BUILD_DESKTOP="no"
-BOOTCONFIG="A13-OLinuXino_defconfig"
-KERNEL_TARGET="current,edge"
diff --git a/config/boards/pcduino3.csc b/config/boards/pcduino3.csc
index 52384c7688..575a9abb95 100644
--- a/config/boards/pcduino3.csc
+++ b/config/boards/pcduino3.csc
@@ -1,5 +1,5 @@
 # Allwinner A20 dual core 1Gb SoC
-BOARD_NAME="pcDuino3"
+BOARD_NAME="pcDuino 3"
 BOARDFAMILY="sun7i"
 BOOTCONFIG="Linksprite_pcDuino3_defconfig"
 KERNEL_TARGET="current,edge"
diff --git a/config/boards/pinecube.csc b/config/boards/pinecube.csc
index 8972f4d4e1..6e1ee383e3 100644
--- a/config/boards/pinecube.csc
+++ b/config/boards/pinecube.csc
@@ -1,5 +1,5 @@
 # Sochip(Allwinner) S3 integrated 128M RAM SoC
-BOARD_NAME="PineCube"
+BOARD_NAME="Pine Cube"
 BOARDFAMILY="sun8i-v3s"
 KERNEL_TARGET="current,edge"
 BOOTCONFIG="pinecube_defconfig"
diff --git a/config/boards/quartz64a.wip b/config/boards/quartz64a.wip
index a4b88ffde2..d5d49a2ce4 100644
--- a/config/boards/quartz64a.wip
+++ b/config/boards/quartz64a.wip
@@ -1,5 +1,5 @@
 # Rockchip RK3566 quad core 4GB-8GB GBE PCIe USB3
-BOARD_NAME="Quartz64 A"
+BOARD_NAME="Pine Quartz64 A"
 BOARDFAMILY="media"
 BOOT_SOC="rk3568"
 BOOTCONFIG="quartz64-a-rk3566_defconfig"
diff --git a/config/boards/roc-rk3399-pc.csc b/config/boards/roc-rk3399-pc.csc
index f51f5b62a6..ca9e709cab 100644
--- a/config/boards/roc-rk3399-pc.csc
+++ b/config/boards/roc-rk3399-pc.csc
@@ -1,5 +1,5 @@
 # Rockchip RK3399 hexa core 4GB DDR4 SoC eMMC GBE USB3
-BOARD_NAME="ROC-RK3399-PC"
+BOARD_NAME="Renegade Elite"
 BOARDFAMILY="rk3399"
 BOOTCONFIG="roc-pc-mezzanine-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,edge"
diff --git a/config/boards/uefi-arm64.wip b/config/boards/uefi-arm64.wip
index 63d6f8832b..3da87e4596 100644
--- a/config/boards/uefi-arm64.wip
+++ b/config/boards/uefi-arm64.wip
@@ -1,4 +1,4 @@
 # aarch64 via UEFI for all UEFI-enabled boards
-export BOARD_NAME="uefi-arm64"
+export BOARD_NAME="UEFI arm64"
 export BOARDFAMILY="uefi-arm64"
 export KERNEL_TARGET="current,edge"
diff --git a/config/boards/uefi-x86.wip b/config/boards/uefi-x86.wip
index 375f654932..0188da5453 100644
--- a/config/boards/uefi-x86.wip
+++ b/config/boards/uefi-x86.wip
@@ -1,4 +1,4 @@
 # x86_64 via UEFI/BIOS for all boards
-export BOARD_NAME="uefi-x86"
+export BOARD_NAME="UEFI x86"
 export BOARDFAMILY="uefi-x86"
 export KERNEL_TARGET="current,edge"
diff --git a/config/boards/virtual-qemu.wip b/config/boards/virtual-qemu.wip
index 60959e0682..812806b73f 100644
--- a/config/boards/virtual-qemu.wip
+++ b/config/boards/virtual-qemu.wip
@@ -17,7 +17,7 @@
 #
 #/Applications/UTM.app/Contents/XPCServices/QEMUHelper.xpc/Contents/MacOS/QEMULauncher /Applications/UTM.app/Contents/Frameworks/libqemu-aarch64-softmmu.utm.dylib -L /Applications/UTM.app/Contents/Resources/qemu -S -qmp tcp:127.0.0.1:4000,server,nowait -vga none -spice port=4001,addr=127.0.0.1,disable-ticketing,image-compression=off,playback-compression=off,streaming-video=off -device virtio-ramfb -cpu host -smp cpus=8,sockets=1,cores=8,threads=1 -machine none,highmem=off -accel hvf -accel tcg,tb-size=1024 -boot menu=on -m 4096 -name armbian -usb -device virtio-blk-pci,drive=drive0,bootindex=0 -drive if=none,media=disk,id=drive0,file=/Users/lane/Library/Containers/com.utmapp.UTM/Data/Documents/armbian.utm/Images/armbian.img,cache=writethrough -device virtio-net-device,mac=AE:C6:BD:B0:F1:33,netdev=net0 -netdev user,id=net0 -uuid 3952DB60-A50E-4838-BAAE-BD13C526CC7A -rtc base=localtime -M virt -cpu host -accel hvf -bios u-boot.bin -device virtio-mouse -device virtio-keyboard
 #
-BOARD_NAME="virtual qemu"
+BOARD_NAME="Virtual QEMU"
 BOARDFAMILY="virtual"
 KERNEL_TARGET="current"
 SERIALCON="ttyS0"
diff --git a/config/boards/xt-q8l-v10.tvb b/config/boards/xt-q8l-v10.tvb
index 74612a80a3..06028c30a1 100644
--- a/config/boards/xt-q8l-v10.tvb
+++ b/config/boards/xt-q8l-v10.tvb
@@ -1,5 +1,5 @@
 # Allwinner RK3288 TVBox quad core 2GB eMMC SoC GBE WiFi
-BOARD_NAME="xt-q8l-v10"
+BOARD_NAME="XT Q8L V10"
 BOARDFAMILY="rockchip"
 BOOTCONFIG="xt-q8l-v10-rk3288_defconfig"
 BOOT_FDT_FILE="rk3288-xt-q8l-v10.dtb"