diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b0ba5ef..c823fb46 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         board: [proton_c, nice_nano]
-        shield: [clueboard_california, kyria]
+        shield: [kyria, petejohanson_pro_micro_handwire]
     steps:
       # To use this repository's private action,
       # you must check out the repository
diff --git a/app/boards/shields/petejohanson_proton_handwire/Kconfig.defconfig b/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.defconfig
similarity index 53%
rename from app/boards/shields/petejohanson_proton_handwire/Kconfig.defconfig
rename to app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.defconfig
index 196c636e..5098fc81 100644
--- a/app/boards/shields/petejohanson_proton_handwire/Kconfig.defconfig
+++ b/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.defconfig
@@ -1,8 +1,8 @@
 
-if SHIELD_PETEJOHANSON_PROTON_HANDWIRE
+if SHIELD_PETEJOHANSON_PRO_MICRO_HANDWIRE
 
 config ZMK_KEYBOARD_NAME
-	default "Pete's Proton Handwire"
+	default "Pete's ProMicro Compat Handwire"
 
 config ZMK_USB
 	default y
diff --git a/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.shield b/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.shield
new file mode 100644
index 00000000..b6264dbc
--- /dev/null
+++ b/app/boards/shields/petejohanson_pro_micro_handwire/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2020 Pete Johanson
+# SPDX-License-Identifier: MIT
+
+config SHIELD_PETEJOHANSON_PRO_MICRO_HANDWIRE
+	def_bool $(shields_list_contains,petejohanson_pro_micro_handwire)
diff --git a/app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay b/app/boards/shields/petejohanson_pro_micro_handwire/keymap/keymap.overlay
similarity index 100%
rename from app/boards/shields/petejohanson_proton_handwire/keymap/keymap.overlay
rename to app/boards/shields/petejohanson_pro_micro_handwire/keymap/keymap.overlay
diff --git a/app/boards/shields/petejohanson_proton_handwire/petejohanson_proton_handwire.conf b/app/boards/shields/petejohanson_pro_micro_handwire/petejohanson_pro_micro_handwire.conf
similarity index 100%
rename from app/boards/shields/petejohanson_proton_handwire/petejohanson_proton_handwire.conf
rename to app/boards/shields/petejohanson_pro_micro_handwire/petejohanson_pro_micro_handwire.conf
diff --git a/app/boards/shields/petejohanson_proton_handwire/petejohanson_proton_handwire.overlay b/app/boards/shields/petejohanson_pro_micro_handwire/petejohanson_pro_micro_handwire.overlay
similarity index 100%
rename from app/boards/shields/petejohanson_proton_handwire/petejohanson_proton_handwire.overlay
rename to app/boards/shields/petejohanson_pro_micro_handwire/petejohanson_pro_micro_handwire.overlay
diff --git a/app/boards/shields/petejohanson_proton_handwire/Kconfig.shield b/app/boards/shields/petejohanson_proton_handwire/Kconfig.shield
deleted file mode 100644
index e43f57d3..00000000
--- a/app/boards/shields/petejohanson_proton_handwire/Kconfig.shield
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2020 Pete Johanson
-# SPDX-License-Identifier: MIT
-
-config SHIELD_PETEJOHANSON_PROTON_HANDWIRE
-	def_bool $(shields_list_contains,petejohanson_proton_handwire)