diff --git a/keyboards/handwired/technicpad/keymaps/default/keymap.json b/keyboards/handwired/technicpad/keymaps/default/keymap.json
index 6d544a59466..5d662bf780c 100644
--- a/keyboards/handwired/technicpad/keymaps/default/keymap.json
+++ b/keyboards/handwired/technicpad/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
 {
-    "keyboard": "technicpad",
+    "keyboard": "handwired/technicpad",
     "keymap": "default",
     "layers": [
         ["KC_A", "KC_B", "KC_C", "KC_D"]
diff --git a/keyboards/handwired/technicpad/keymaps/via/keymap.json b/keyboards/handwired/technicpad/keymaps/via/keymap.json
index 845fff0dfba..040881546c1 100644
--- a/keyboards/handwired/technicpad/keymaps/via/keymap.json
+++ b/keyboards/handwired/technicpad/keymaps/via/keymap.json
@@ -1,5 +1,5 @@
 {
-    "keyboard": "technicpad",
+    "keyboard": "handwired/technicpad",
     "keymap": "via",
     "config": {
         "features": {
diff --git a/keyboards/mechwild/bb40/keymaps/default/keymap.json b/keyboards/mechwild/bb40/keymaps/default/keymap.json
index 104e42483c2..7ab58982586 100644
--- a/keyboards/mechwild/bb40/keymaps/default/keymap.json
+++ b/keyboards/mechwild/bb40/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
 {
-   "keyboard": "mechwild/bb40",
+   "keyboard": "mechwild/bb40/f401",
    "keymap": "default",
    "version": 1,
    "layout": "LAYOUT_all",