49 files changed, 6 insertions, 4 deletions
diff --git a/keyboards/bigswitch/README.md b/keyboards/flehrad/bigswitch/README.md
index 65213af7c..1a0fb155a 100644
--- a/keyboards/bigswitch/README.md
+++ b/keyboards/flehrad/bigswitch/README.md
@@ -7,6 +7,8 @@ Designed by Don of the Board Podcast and sold as a kit by [keeb.io](https://keeb
 
 https://github.com/flehrad/Big-Switch-PCB
 
+make: flehrad/bigswitch:default
+
 ### Technical Specifications
 
  * Uses a atmega32u4 pro micro or pin compatible MCU
diff --git a/keyboards/bigswitch/bigswitch.c b/keyboards/flehrad/bigswitch/bigswitch.c
index 32f9f7fab..32f9f7fab 100644
--- a/keyboards/bigswitch/bigswitch.c
+++ b/keyboards/flehrad/bigswitch/bigswitch.c
diff --git a/keyboards/bigswitch/bigswitch.h b/keyboards/flehrad/bigswitch/bigswitch.h
index ea3d51a1f..ea3d51a1f 100755..100644
--- a/keyboards/bigswitch/bigswitch.h
+++ b/keyboards/flehrad/bigswitch/bigswitch.h
diff --git a/keyboards/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h
index 220f2591b..220f2591b 100755..100644
--- a/keyboards/bigswitch/config.h
+++ b/keyboards/flehrad/bigswitch/config.h
diff --git a/keyboards/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json
index 8d3d746f5..8d3d746f5 100644
--- a/keyboards/bigswitch/info.json
+++ b/keyboards/flehrad/bigswitch/info.json
diff --git a/keyboards/bigswitch/keymaps/333fred/config.h b/keyboards/flehrad/bigswitch/keymaps/333fred/config.h
index 76f13f08b..76f13f08b 100644
--- a/keyboards/bigswitch/keymaps/333fred/config.h
+++ b/keyboards/flehrad/bigswitch/keymaps/333fred/config.h
diff --git a/keyboards/bigswitch/keymaps/333fred/keymap.c b/keyboards/flehrad/bigswitch/keymaps/333fred/keymap.c
index be40fecb2..be40fecb2 100644
--- a/keyboards/bigswitch/keymaps/333fred/keymap.c
+++ b/keyboards/flehrad/bigswitch/keymaps/333fred/keymap.c
diff --git a/keyboards/bigswitch/keymaps/333fred/rules.mk b/keyboards/flehrad/bigswitch/keymaps/333fred/rules.mk
index 20aaadacb..20aaadacb 100644
--- a/keyboards/bigswitch/keymaps/333fred/rules.mk
+++ b/keyboards/flehrad/bigswitch/keymaps/333fred/rules.mk
diff --git a/keyboards/bigswitch/keymaps/default/keymap.c b/keyboards/flehrad/bigswitch/keymaps/default/keymap.c
index 210d00123..210d00123 100755..100644
--- a/keyboards/bigswitch/keymaps/default/keymap.c
+++ b/keyboards/flehrad/bigswitch/keymaps/default/keymap.c
diff --git a/keyboards/bigswitch/keymaps/wanleg/config.h b/keyboards/flehrad/bigswitch/keymaps/wanleg/config.h
index 54abb9a6c..54abb9a6c 100644
--- a/keyboards/bigswitch/keymaps/wanleg/config.h
+++ b/keyboards/flehrad/bigswitch/keymaps/wanleg/config.h
diff --git a/keyboards/bigswitch/keymaps/wanleg/keymap.c b/keyboards/flehrad/bigswitch/keymaps/wanleg/keymap.c
index 76d0808fd..76d0808fd 100644
--- a/keyboards/bigswitch/keymaps/wanleg/keymap.c
+++ b/keyboards/flehrad/bigswitch/keymaps/wanleg/keymap.c
diff --git a/keyboards/bigswitch/keymaps/wanleg/rules.mk b/keyboards/flehrad/bigswitch/keymaps/wanleg/rules.mk
index 75da67fa4..75da67fa4 100644
--- a/keyboards/bigswitch/keymaps/wanleg/rules.mk
+++ b/keyboards/flehrad/bigswitch/keymaps/wanleg/rules.mk
diff --git a/keyboards/bigswitch/rules.mk b/keyboards/flehrad/bigswitch/rules.mk
index 88844733f..88844733f 100755..100644
--- a/keyboards/bigswitch/rules.mk
+++ b/keyboards/flehrad/bigswitch/rules.mk
diff --git a/keyboards/handwired/downbubble/config.h b/keyboards/flehrad/downbubble/config.h
index f2628cb70..f2628cb70 100644
--- a/keyboards/handwired/downbubble/config.h
+++ b/keyboards/flehrad/downbubble/config.h
diff --git a/keyboards/handwired/downbubble/downbubble.c b/keyboards/flehrad/downbubble/downbubble.c
index 48be8e499..48be8e499 100644
--- a/keyboards/handwired/downbubble/downbubble.c
+++ b/keyboards/flehrad/downbubble/downbubble.c
diff --git a/keyboards/handwired/downbubble/downbubble.h b/keyboards/flehrad/downbubble/downbubble.h
index 0df39dd9e..0df39dd9e 100644
--- a/keyboards/handwired/downbubble/downbubble.h
+++ b/keyboards/flehrad/downbubble/downbubble.h
diff --git a/keyboards/handwired/downbubble/info.json b/keyboards/flehrad/downbubble/info.json
index c5cd97de5..c5cd97de5 100644
--- a/keyboards/handwired/downbubble/info.json
+++ b/keyboards/flehrad/downbubble/info.json
diff --git a/keyboards/handwired/downbubble/keymaps/default/config.h b/keyboards/flehrad/downbubble/keymaps/default/config.h
index 4496c5910..4496c5910 100644
--- a/keyboards/handwired/downbubble/keymaps/default/config.h
+++ b/keyboards/flehrad/downbubble/keymaps/default/config.h
diff --git a/keyboards/handwired/downbubble/keymaps/default/keymap.c b/keyboards/flehrad/downbubble/keymaps/default/keymap.c
index 48303900f..48303900f 100644
--- a/keyboards/handwired/downbubble/keymaps/default/keymap.c
+++ b/keyboards/flehrad/downbubble/keymaps/default/keymap.c
diff --git a/keyboards/handwired/downbubble/keymaps/default/readme.md b/keyboards/flehrad/downbubble/keymaps/default/readme.md
index 757d99062..757d99062 100644
--- a/keyboards/handwired/downbubble/keymaps/default/readme.md
+++ b/keyboards/flehrad/downbubble/keymaps/default/readme.md
diff --git a/keyboards/handwired/downbubble/license b/keyboards/flehrad/downbubble/license
index e6e77b089..e6e77b089 100644
--- a/keyboards/handwired/downbubble/license
+++ b/keyboards/flehrad/downbubble/license
diff --git a/keyboards/handwired/downbubble/readme.md b/keyboards/flehrad/downbubble/readme.md
index e66234512..f1c83b8aa 100644
--- a/keyboards/handwired/downbubble/readme.md
+++ b/keyboards/flehrad/downbubble/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: The Board Podcast Slack
 
 Make example for this keyboard (after setting up your build environment):
 
-    make downbubble:default
+    make flehrad/downbubble:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/downbubble/rules.mk b/keyboards/flehrad/downbubble/rules.mk
index 189b82720..189b82720 100644
--- a/keyboards/handwired/downbubble/rules.mk
+++ b/keyboards/flehrad/downbubble/rules.mk
diff --git a/keyboards/handwired/numbrero/config.h b/keyboards/flehrad/numbrero/config.h
index ac38e0814..ac38e0814 100644
--- a/keyboards/handwired/numbrero/config.h
+++ b/keyboards/flehrad/numbrero/config.h
diff --git a/keyboards/handwired/numbrero/info.json b/keyboards/flehrad/numbrero/info.json
index d2f7ebd03..d2f7ebd03 100644
--- a/keyboards/handwired/numbrero/info.json
+++ b/keyboards/flehrad/numbrero/info.json
diff --git a/keyboards/handwired/numbrero/keymaps/default/keymap.c b/keyboards/flehrad/numbrero/keymaps/default/keymap.c
index 903ed8d88..903ed8d88 100644
--- a/keyboards/handwired/numbrero/keymaps/default/keymap.c
+++ b/keyboards/flehrad/numbrero/keymaps/default/keymap.c
diff --git a/keyboards/handwired/numbrero/license b/keyboards/flehrad/numbrero/license
index b09cd7856..b09cd7856 100644
--- a/keyboards/handwired/numbrero/license
+++ b/keyboards/flehrad/numbrero/license
diff --git a/keyboards/handwired/numbrero/numbrero.c b/keyboards/flehrad/numbrero/numbrero.c
index d3ec36904..d3ec36904 100644
--- a/keyboards/handwired/numbrero/numbrero.c
+++ b/keyboards/flehrad/numbrero/numbrero.c
diff --git a/keyboards/handwired/numbrero/numbrero.h b/keyboards/flehrad/numbrero/numbrero.h
index c72e65407..c72e65407 100644
--- a/keyboards/handwired/numbrero/numbrero.h
+++ b/keyboards/flehrad/numbrero/numbrero.h
diff --git a/keyboards/handwired/numbrero/readme.md b/keyboards/flehrad/numbrero/readme.md
index 931c60127..823a81fbe 100644
--- a/keyboards/handwired/numbrero/readme.md
+++ b/keyboards/flehrad/numbrero/readme.md
@@ -8,6 +8,6 @@ Hardware Availability: The Board Podcast Slack
 
 Make example for this keyboard (after setting up your build environment):
 
-    make handwired/numbrero:default
+    make flehrad/numbrero:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/numbrero/rules.mk b/keyboards/flehrad/numbrero/rules.mk
index 969dd0b50..969dd0b50 100644
--- a/keyboards/handwired/numbrero/rules.mk
+++ b/keyboards/flehrad/numbrero/rules.mk
diff --git a/keyboards/snagpad/config.h b/keyboards/flehrad/snagpad/config.h
index 339bdd1be..339bdd1be 100644
--- a/keyboards/snagpad/config.h
+++ b/keyboards/flehrad/snagpad/config.h
diff --git a/keyboards/snagpad/info.json b/keyboards/flehrad/snagpad/info.json
index 6e3ab601a..6e3ab601a 100644
--- a/keyboards/snagpad/info.json
+++ b/keyboards/flehrad/snagpad/info.json
diff --git a/keyboards/snagpad/keymaps/default/keymap.c b/keyboards/flehrad/snagpad/keymaps/default/keymap.c
index 7645b435c..7645b435c 100644
--- a/keyboards/snagpad/keymaps/default/keymap.c
+++ b/keyboards/flehrad/snagpad/keymaps/default/keymap.c
diff --git a/keyboards/snagpad/keymaps/via/keymap.c b/keyboards/flehrad/snagpad/keymaps/via/keymap.c
index 7fa226de7..7fa226de7 100644
--- a/keyboards/snagpad/keymaps/via/keymap.c
+++ b/keyboards/flehrad/snagpad/keymaps/via/keymap.c
diff --git a/keyboards/snagpad/keymaps/via/rules.mk b/keyboards/flehrad/snagpad/keymaps/via/rules.mk
index 1e5b99807..1e5b99807 100644
--- a/keyboards/snagpad/keymaps/via/rules.mk
+++ b/keyboards/flehrad/snagpad/keymaps/via/rules.mk
diff --git a/keyboards/handwired/tradestation/license b/keyboards/flehrad/snagpad/license
index 261eeb9e9..261eeb9e9 100644
--- a/keyboards/handwired/tradestation/license
+++ b/keyboards/flehrad/snagpad/license
diff --git a/keyboards/snagpad/readme.md b/keyboards/flehrad/snagpad/readme.md
index b59bd7588..cefd65e57 100644
--- a/keyboards/snagpad/readme.md
+++ b/keyboards/flehrad/snagpad/readme.md
@@ -8,7 +8,7 @@ Hardware Availability: [GitHub](https://github.com/flehrad/Snagpad)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make snagpad:default
+    make flehrad/snagpad:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/snagpad/rules.mk b/keyboards/flehrad/snagpad/rules.mk
index 566a398fe..566a398fe 100644
--- a/keyboards/snagpad/rules.mk
+++ b/keyboards/flehrad/snagpad/rules.mk
diff --git a/keyboards/snagpad/snagpad.c b/keyboards/flehrad/snagpad/snagpad.c
index ce7e50b38..ce7e50b38 100644
--- a/keyboards/snagpad/snagpad.c
+++ b/keyboards/flehrad/snagpad/snagpad.c
diff --git a/keyboards/snagpad/snagpad.h b/keyboards/flehrad/snagpad/snagpad.h
index f1e5e34e6..f1e5e34e6 100644
--- a/keyboards/snagpad/snagpad.h
+++ b/keyboards/flehrad/snagpad/snagpad.h
diff --git a/keyboards/handwired/tradestation/config.h b/keyboards/flehrad/tradestation/config.h
index 33c87548f..33c87548f 100644
--- a/keyboards/handwired/tradestation/config.h
+++ b/keyboards/flehrad/tradestation/config.h
diff --git a/keyboards/handwired/tradestation/info.json b/keyboards/flehrad/tradestation/info.json
index 233eb6282..233eb6282 100644
--- a/keyboards/handwired/tradestation/info.json
+++ b/keyboards/flehrad/tradestation/info.json
diff --git a/keyboards/handwired/tradestation/keymaps/default/keymap.c b/keyboards/flehrad/tradestation/keymaps/default/keymap.c
index 3497dcb94..3497dcb94 100644
--- a/keyboards/handwired/tradestation/keymaps/default/keymap.c
+++ b/keyboards/flehrad/tradestation/keymaps/default/keymap.c
diff --git a/keyboards/snagpad/license b/keyboards/flehrad/tradestation/license
index 261eeb9e9..261eeb9e9 100644
--- a/keyboards/snagpad/license
+++ b/keyboards/flehrad/tradestation/license
diff --git a/keyboards/handwired/tradestation/readme.md b/keyboards/flehrad/tradestation/readme.md
index 3a8c39e26..d2a9c4d18 100644
--- a/keyboards/handwired/tradestation/readme.md
+++ b/keyboards/flehrad/tradestation/readme.md
@@ -22,6 +22,6 @@ Hardware Supported: Tradestation PCB, Pro Micro
 
 Make example for this keyboard (after setting up your build environment):
 
-    make tradestation:default
+    make flehrad/tradestation:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/tradestation/rules.mk b/keyboards/flehrad/tradestation/rules.mk
index d3612c3c2..d3612c3c2 100644
--- a/keyboards/handwired/tradestation/rules.mk
+++ b/keyboards/flehrad/tradestation/rules.mk
diff --git a/keyboards/handwired/tradestation/tradestation.c b/keyboards/flehrad/tradestation/tradestation.c
index a3285a2cc..a3285a2cc 100644
--- a/keyboards/handwired/tradestation/tradestation.c
+++ b/keyboards/flehrad/tradestation/tradestation.c
diff --git a/keyboards/handwired/tradestation/tradestation.h b/keyboards/flehrad/tradestation/tradestation.h
index 60b53b7dd..60b53b7dd 100644
--- a/keyboards/handwired/tradestation/tradestation.h
+++ b/keyboards/flehrad/tradestation/tradestation.h