diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/keyboard.json
similarity index 100%
rename from keyboards/fallacy/info.json
rename to keyboards/fallacy/keyboard.json
diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/keyboard.json
similarity index 100%
rename from keyboards/fc660c/info.json
rename to keyboards/fc660c/keyboard.json
diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/keyboard.json
similarity index 100%
rename from keyboards/fc980c/info.json
rename to keyboards/fc980c/keyboard.json
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/keyboard.json
similarity index 100%
rename from keyboards/ferris/0_1/info.json
rename to keyboards/ferris/0_1/keyboard.json
diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/keyboard.json
similarity index 100%
rename from keyboards/ferris/0_2/bling/info.json
rename to keyboards/ferris/0_2/bling/keyboard.json
diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/7vhotswap/info.json
rename to keyboards/fjlabs/7vhotswap/keyboard.json
diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/ad65/info.json
rename to keyboards/fjlabs/ad65/keyboard.json
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/avalon/info.json
rename to keyboards/fjlabs/avalon/keyboard.json
diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/bks65/info.json
rename to keyboards/fjlabs/bks65/keyboard.json
diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/bks65solder/info.json
rename to keyboards/fjlabs/bks65solder/keyboard.json
diff --git a/keyboards/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/bolsa65/info.json
rename to keyboards/fjlabs/bolsa65/keyboard.json
diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/kf87/info.json
rename to keyboards/fjlabs/kf87/keyboard.json
diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/kyuu/info.json
rename to keyboards/fjlabs/kyuu/keyboard.json
diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/ldk65/info.json
rename to keyboards/fjlabs/ldk65/keyboard.json
diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/midway60/info.json
rename to keyboards/fjlabs/midway60/keyboard.json
diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/mk61rgbansi/info.json
rename to keyboards/fjlabs/mk61rgbansi/keyboard.json
diff --git a/keyboards/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/peaker/info.json
rename to keyboards/fjlabs/peaker/keyboard.json
diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/polaris/info.json
rename to keyboards/fjlabs/polaris/keyboard.json
diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/ready100/info.json
rename to keyboards/fjlabs/ready100/keyboard.json
diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/sinanju/info.json
rename to keyboards/fjlabs/sinanju/keyboard.json
diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/sinanjuwk/info.json
rename to keyboards/fjlabs/sinanjuwk/keyboard.json
diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/solanis/info.json
rename to keyboards/fjlabs/solanis/keyboard.json
diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/swordfish/info.json
rename to keyboards/fjlabs/swordfish/keyboard.json
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/tf60ansi/info.json
rename to keyboards/fjlabs/tf60ansi/keyboard.json
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/tf60v2/info.json
rename to keyboards/fjlabs/tf60v2/keyboard.json
diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/tf65rgbv2/info.json
rename to keyboards/fjlabs/tf65rgbv2/keyboard.json
diff --git a/keyboards/fractal/info.json b/keyboards/fractal/keyboard.json
similarity index 100%
rename from keyboards/fractal/info.json
rename to keyboards/fractal/keyboard.json
diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/keyboard.json
similarity index 100%
rename from keyboards/frobiac/blackbowl/info.json
rename to keyboards/frobiac/blackbowl/keyboard.json
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/keyboard.json
similarity index 100%
rename from keyboards/gboards/ergotaco/info.json
rename to keyboards/gboards/ergotaco/keyboard.json
diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/keyboard.json
similarity index 100%
rename from keyboards/gboards/georgi/info.json
rename to keyboards/gboards/georgi/keyboard.json
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/keyboard.json
similarity index 100%
rename from keyboards/gboards/gergo/info.json
rename to keyboards/gboards/gergo/keyboard.json
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/keyboard.json
similarity index 100%
rename from keyboards/gboards/gergoplex/info.json
rename to keyboards/gboards/gergoplex/keyboard.json
diff --git a/keyboards/geistmaschine/macropod/info.json b/keyboards/geistmaschine/macropod/keyboard.json
similarity index 100%
rename from keyboards/geistmaschine/macropod/info.json
rename to keyboards/geistmaschine/macropod/keyboard.json
diff --git a/keyboards/geonworks/ee_at/info.json b/keyboards/geonworks/ee_at/keyboard.json
similarity index 100%
rename from keyboards/geonworks/ee_at/info.json
rename to keyboards/geonworks/ee_at/keyboard.json
diff --git a/keyboards/geonworks/w1_at/info.json b/keyboards/geonworks/w1_at/keyboard.json
similarity index 100%
rename from keyboards/geonworks/w1_at/info.json
rename to keyboards/geonworks/w1_at/keyboard.json
diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/keyboard.json
similarity index 100%
rename from keyboards/gl516/a52gl/info.json
rename to keyboards/gl516/a52gl/keyboard.json
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/keyboard.json
similarity index 100%
rename from keyboards/gl516/j73gl/info.json
rename to keyboards/gl516/j73gl/keyboard.json
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/keyboard.json
similarity index 100%
rename from keyboards/gl516/n51gl/info.json
rename to keyboards/gl516/n51gl/keyboard.json
diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/keyboard.json
similarity index 100%
rename from keyboards/glenpickle/chimera_ergo/info.json
rename to keyboards/glenpickle/chimera_ergo/keyboard.json
diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/keyboard.json
similarity index 100%
rename from keyboards/glenpickle/chimera_ls/info.json
rename to keyboards/glenpickle/chimera_ls/keyboard.json
diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/keyboard.json
similarity index 100%
rename from keyboards/glenpickle/chimera_ortho/info.json
rename to keyboards/glenpickle/chimera_ortho/keyboard.json
diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/keyboard.json
similarity index 100%
rename from keyboards/glenpickle/chimera_ortho_plus/info.json
rename to keyboards/glenpickle/chimera_ortho_plus/keyboard.json
diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/keyboard.json
similarity index 100%
rename from keyboards/gmmk/numpad/info.json
rename to keyboards/gmmk/numpad/keyboard.json
diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/keyboard.json
similarity index 100%
rename from keyboards/gon/nerd60/info.json
rename to keyboards/gon/nerd60/keyboard.json
diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/keyboard.json
similarity index 100%
rename from keyboards/gon/nerdtkl/info.json
rename to keyboards/gon/nerdtkl/keyboard.json
diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/keyboard.json
similarity index 100%
rename from keyboards/gopolar/gg86/info.json
rename to keyboards/gopolar/gg86/keyboard.json
diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/keyboard.json
similarity index 100%
rename from keyboards/gray_studio/cod67/info.json
rename to keyboards/gray_studio/cod67/keyboard.json
diff --git a/keyboards/gregandcin/teaqueen/info.json b/keyboards/gregandcin/teaqueen/keyboard.json
similarity index 100%
rename from keyboards/gregandcin/teaqueen/info.json
rename to keyboards/gregandcin/teaqueen/keyboard.json