diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 1378267b81..89f3474a33 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -287,6 +287,12 @@
     "honeycomb": {
         "target": "keyhive/honeycomb"
     },
+    "hub16": {
+        "target": "joshajohnson/hub16"
+    },
+    "hub20": {
+        "target": "joshajohnson/hub20"
+    },
     "idb_60": {
         "target": "idb/idb_60"
     },
diff --git a/keyboards/hub16/config.h b/keyboards/joshajohnson/hub16/config.h
similarity index 100%
rename from keyboards/hub16/config.h
rename to keyboards/joshajohnson/hub16/config.h
diff --git a/keyboards/hub16/info.json b/keyboards/joshajohnson/hub16/info.json
similarity index 100%
rename from keyboards/hub16/info.json
rename to keyboards/joshajohnson/hub16/info.json
diff --git a/keyboards/hub16/keymaps/default/keymap.c b/keyboards/joshajohnson/hub16/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/hub16/keymaps/default/keymap.c
rename to keyboards/joshajohnson/hub16/keymaps/default/keymap.c
diff --git a/keyboards/hub16/keymaps/peepeetee/config.h b/keyboards/joshajohnson/hub16/keymaps/peepeetee/config.h
similarity index 100%
rename from keyboards/hub16/keymaps/peepeetee/config.h
rename to keyboards/joshajohnson/hub16/keymaps/peepeetee/config.h
diff --git a/keyboards/hub16/keymaps/peepeetee/keymap.c b/keyboards/joshajohnson/hub16/keymaps/peepeetee/keymap.c
similarity index 100%
rename from keyboards/hub16/keymaps/peepeetee/keymap.c
rename to keyboards/joshajohnson/hub16/keymaps/peepeetee/keymap.c
diff --git a/keyboards/hub16/keymaps/peepeetee/rules.mk b/keyboards/joshajohnson/hub16/keymaps/peepeetee/rules.mk
similarity index 100%
rename from keyboards/hub16/keymaps/peepeetee/rules.mk
rename to keyboards/joshajohnson/hub16/keymaps/peepeetee/rules.mk
diff --git a/keyboards/hub16/keymaps/via/keymap.c b/keyboards/joshajohnson/hub16/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/hub16/keymaps/via/keymap.c
rename to keyboards/joshajohnson/hub16/keymaps/via/keymap.c
diff --git a/keyboards/hub16/keymaps/via/rules.mk b/keyboards/joshajohnson/hub16/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/hub16/keymaps/via/rules.mk
rename to keyboards/joshajohnson/hub16/keymaps/via/rules.mk
diff --git a/keyboards/hub16/matrix.c b/keyboards/joshajohnson/hub16/matrix.c
similarity index 100%
rename from keyboards/hub16/matrix.c
rename to keyboards/joshajohnson/hub16/matrix.c
diff --git a/keyboards/hub16/readme.md b/keyboards/joshajohnson/hub16/readme.md
similarity index 93%
rename from keyboards/hub16/readme.md
rename to keyboards/joshajohnson/hub16/readme.md
index f2bcf4b0a7..9735079e24 100755
--- a/keyboards/hub16/readme.md
+++ b/keyboards/joshajohnson/hub16/readme.md
@@ -10,11 +10,11 @@ For more information regarding the keyboard, please visit the [Hub16 Website](ht
 
 Make example for this keyboard (after setting up your build environment):
 
-    make hub16:default
+    make joshajohnson/hub16:default
 
 Flashing example for this keyboard:
 
-    make hub16:default:flash
+    make joshajohnson/hub16:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/hub16/rules.mk b/keyboards/joshajohnson/hub16/rules.mk
similarity index 100%
rename from keyboards/hub16/rules.mk
rename to keyboards/joshajohnson/hub16/rules.mk
diff --git a/keyboards/hub20/chconf.h b/keyboards/joshajohnson/hub20/chconf.h
similarity index 100%
rename from keyboards/hub20/chconf.h
rename to keyboards/joshajohnson/hub20/chconf.h
diff --git a/keyboards/hub20/config.h b/keyboards/joshajohnson/hub20/config.h
similarity index 100%
rename from keyboards/hub20/config.h
rename to keyboards/joshajohnson/hub20/config.h
diff --git a/keyboards/hub20/halconf.h b/keyboards/joshajohnson/hub20/halconf.h
similarity index 100%
rename from keyboards/hub20/halconf.h
rename to keyboards/joshajohnson/hub20/halconf.h
diff --git a/keyboards/hub20/hub20.c b/keyboards/joshajohnson/hub20/hub20.c
similarity index 100%
rename from keyboards/hub20/hub20.c
rename to keyboards/joshajohnson/hub20/hub20.c
diff --git a/keyboards/hub20/info.json b/keyboards/joshajohnson/hub20/info.json
similarity index 100%
rename from keyboards/hub20/info.json
rename to keyboards/joshajohnson/hub20/info.json
diff --git a/keyboards/hub20/keymaps/default/keymap.c b/keyboards/joshajohnson/hub20/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/hub20/keymaps/default/keymap.c
rename to keyboards/joshajohnson/hub20/keymaps/default/keymap.c
diff --git a/keyboards/hub20/keymaps/left_hand_numpad/keymap.c b/keyboards/joshajohnson/hub20/keymaps/left_hand_numpad/keymap.c
similarity index 100%
rename from keyboards/hub20/keymaps/left_hand_numpad/keymap.c
rename to keyboards/joshajohnson/hub20/keymaps/left_hand_numpad/keymap.c
diff --git a/keyboards/hub20/keymaps/right_hand_numpad/keymap.c b/keyboards/joshajohnson/hub20/keymaps/right_hand_numpad/keymap.c
similarity index 100%
rename from keyboards/hub20/keymaps/right_hand_numpad/keymap.c
rename to keyboards/joshajohnson/hub20/keymaps/right_hand_numpad/keymap.c
diff --git a/keyboards/hub20/keymaps/via/keymap.c b/keyboards/joshajohnson/hub20/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/hub20/keymaps/via/keymap.c
rename to keyboards/joshajohnson/hub20/keymaps/via/keymap.c
diff --git a/keyboards/hub20/keymaps/via/rules.mk b/keyboards/joshajohnson/hub20/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/hub20/keymaps/via/rules.mk
rename to keyboards/joshajohnson/hub20/keymaps/via/rules.mk
diff --git a/keyboards/hub20/mcuconf.h b/keyboards/joshajohnson/hub20/mcuconf.h
similarity index 100%
rename from keyboards/hub20/mcuconf.h
rename to keyboards/joshajohnson/hub20/mcuconf.h
diff --git a/keyboards/hub20/readme.md b/keyboards/joshajohnson/hub20/readme.md
similarity index 93%
rename from keyboards/hub20/readme.md
rename to keyboards/joshajohnson/hub20/readme.md
index 1abfa0dea8..a3b5aba641 100755
--- a/keyboards/hub20/readme.md
+++ b/keyboards/joshajohnson/hub20/readme.md
@@ -10,11 +10,11 @@ For more information regarding the keyboard, please visit the [Hub20 Website](ht
 
 Make example for this keyboard (after setting up your build environment):
 
-    make hub20:default
+    make joshajohnson/hub20:default
 
 Flashing example for this keyboard:
 
-    make hub20:default:flash
+    make joshajohnson/hub20:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/hub20/rules.mk b/keyboards/joshajohnson/hub20/rules.mk
similarity index 100%
rename from keyboards/hub20/rules.mk
rename to keyboards/joshajohnson/hub20/rules.mk