diff --git a/app/boards/shields/bfo9000/Kconfig.defconfig b/app/boards/shields/bfo9000/Kconfig.defconfig
index a8584886..fdad5508 100644
--- a/app/boards/shields/bfo9000/Kconfig.defconfig
+++ b/app/boards/shields/bfo9000/Kconfig.defconfig
@@ -11,13 +11,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-if SHIELD_BFO9000_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "BFO9000 Right"
-
-endif
-
 if SHIELD_BFO9000_LEFT || SHIELD_BFO9000_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/corne/Kconfig.defconfig b/app/boards/shields/corne/Kconfig.defconfig
index ef4817b5..35bc2991 100644
--- a/app/boards/shields/corne/Kconfig.defconfig
+++ b/app/boards/shields/corne/Kconfig.defconfig
@@ -8,13 +8,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-if SHIELD_CORNE_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Corne Right"
-	
-endif
-
 if SHIELD_CORNE_LEFT || SHIELD_CORNE_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig
index 1a008d69..d5f8f4e0 100644
--- a/app/boards/shields/cradio/Kconfig.defconfig
+++ b/app/boards/shields/cradio/Kconfig.defconfig
@@ -11,14 +11,7 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-if SHIELD_CRADIO_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Cradio_Right"
-
-endif
-
-if SHIELD_CRADIO_RIGHT || SHIELD_CRADIO_LEFT
+if SHIELD_CRADIO_LEFT || SHIELD_CRADIO_RIGHT
 
 config ZMK_SPLIT
 	default y
diff --git a/app/boards/shields/helix/Kconfig.defconfig b/app/boards/shields/helix/Kconfig.defconfig
index f0a4f880..656ec2df 100644
--- a/app/boards/shields/helix/Kconfig.defconfig
+++ b/app/boards/shields/helix/Kconfig.defconfig
@@ -11,13 +11,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-if SHIELD_HELIX_RIGHT
-
-config ZMK_KEYBOARD_NAME
-    default "Helix Right"
-
-endif
-
 if SHIELD_HELIX_LEFT || SHIELD_HELIX_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/iris/Kconfig.defconfig b/app/boards/shields/iris/Kconfig.defconfig
index 57b8c1ee..308e3cef 100644
--- a/app/boards/shields/iris/Kconfig.defconfig
+++ b/app/boards/shields/iris/Kconfig.defconfig
@@ -11,13 +11,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-if SHIELD_IRIS_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Iris Right"
-
-endif
-
 if SHIELD_IRIS_LEFT || SHIELD_IRIS_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/jian/Kconfig.defconfig b/app/boards/shields/jian/Kconfig.defconfig
index fc1f1995..2de9660f 100644
--- a/app/boards/shields/jian/Kconfig.defconfig
+++ b/app/boards/shields/jian/Kconfig.defconfig
@@ -9,14 +9,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-
-if SHIELD_JIAN_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Jian Right"
-	
-endif
-
 if SHIELD_JIAN_LEFT || SHIELD_JIAN_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/jorne/Kconfig.defconfig b/app/boards/shields/jorne/Kconfig.defconfig
index 860cb12f..adec67d7 100644
--- a/app/boards/shields/jorne/Kconfig.defconfig
+++ b/app/boards/shields/jorne/Kconfig.defconfig
@@ -9,14 +9,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-
-if SHIELD_JORNE_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Jorne Right"
-	
-endif
-
 if SHIELD_JORNE_LEFT || SHIELD_JORNE_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/kyria/Kconfig.defconfig b/app/boards/shields/kyria/Kconfig.defconfig
index 99e47bfe..79a73388 100644
--- a/app/boards/shields/kyria/Kconfig.defconfig
+++ b/app/boards/shields/kyria/Kconfig.defconfig
@@ -9,14 +9,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-
-if SHIELD_KYRIA_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Kyria Right"
-
-endif
-
 if SHIELD_KYRIA_LEFT || SHIELD_KYRIA_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/lily58/Kconfig.defconfig b/app/boards/shields/lily58/Kconfig.defconfig
index 915cc70e..19028626 100644
--- a/app/boards/shields/lily58/Kconfig.defconfig
+++ b/app/boards/shields/lily58/Kconfig.defconfig
@@ -9,13 +9,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-if SHIELD_LILY58_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Lily58 Right"
-
-endif
-
 if SHIELD_LILY58_LEFT || SHIELD_LILY58_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/microdox/Kconfig.defconfig b/app/boards/shields/microdox/Kconfig.defconfig
index be39c9f8..bfc867ed 100644
--- a/app/boards/shields/microdox/Kconfig.defconfig
+++ b/app/boards/shields/microdox/Kconfig.defconfig
@@ -11,14 +11,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-
-if SHIELD_MICRODOX_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Microdox Right"
-
-endif
-
 if SHIELD_MICRODOX_LEFT || SHIELD_MICRODOX_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/quefrency/Kconfig.defconfig b/app/boards/shields/quefrency/Kconfig.defconfig
index de44702f..6d342ee6 100644
--- a/app/boards/shields/quefrency/Kconfig.defconfig
+++ b/app/boards/shields/quefrency/Kconfig.defconfig
@@ -12,13 +12,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-if SHIELD_QUEFRENCY_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Quefrency Right"
-
-endif
-
 if SHIELD_QUEFRENCY_LEFT || SHIELD_QUEFRENCY_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/sofle/Kconfig.defconfig b/app/boards/shields/sofle/Kconfig.defconfig
index 6a580bfe..3ea6ee4b 100644
--- a/app/boards/shields/sofle/Kconfig.defconfig
+++ b/app/boards/shields/sofle/Kconfig.defconfig
@@ -11,13 +11,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 	
 endif
 
-if SHIELD_SOFLE_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Sofle Right"
-
-endif
-
 if SHIELD_SOFLE_LEFT || SHIELD_SOFLE_RIGHT
 
 config ZMK_SPLIT
diff --git a/app/boards/shields/splitreus62/Kconfig.defconfig b/app/boards/shields/splitreus62/Kconfig.defconfig
index 41c1218a..e8f74148 100644
--- a/app/boards/shields/splitreus62/Kconfig.defconfig
+++ b/app/boards/shields/splitreus62/Kconfig.defconfig
@@ -13,13 +13,6 @@ config ZMK_SPLIT_BLE_ROLE_CENTRAL
 
 endif
 
-if SHIELD_SPLITREUS62_RIGHT
-
-config ZMK_KEYBOARD_NAME
-	default "Splitreus62 Rt"
-
-endif
-
 if SHIELD_SPLITREUS62_LEFT || SHIELD_SPLITREUS62_RIGHT
 
 config ZMK_SPLIT