diff --git a/keyboards/cannonkeys/petrichor/info.json b/keyboards/cannonkeys/petrichor/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/petrichor/info.json
rename to keyboards/cannonkeys/petrichor/keyboard.json
diff --git a/keyboards/cannonkeys/petrichor/rules.mk b/keyboards/cannonkeys/petrichor/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/petrichor/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/chew/info.json b/keyboards/chew/keyboard.json
similarity index 100%
rename from keyboards/chew/info.json
rename to keyboards/chew/keyboard.json
diff --git a/keyboards/cipulot/chroma/info.json b/keyboards/cipulot/chroma/keyboard.json
similarity index 100%
rename from keyboards/cipulot/chroma/info.json
rename to keyboards/cipulot/chroma/keyboard.json
diff --git a/keyboards/cipulot/chroma/rules.mk b/keyboards/cipulot/chroma/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/cipulot/ec_660c/info.json b/keyboards/cipulot/ec_660c/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_660c/info.json
rename to keyboards/cipulot/ec_660c/keyboard.json
diff --git a/keyboards/cipulot/ec_980c/info.json b/keyboards/cipulot/ec_980c/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_980c/info.json
rename to keyboards/cipulot/ec_980c/keyboard.json
diff --git a/keyboards/cipulot/ec_dolice/info.json b/keyboards/cipulot/ec_dolice/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_dolice/info.json
rename to keyboards/cipulot/ec_dolice/keyboard.json
diff --git a/keyboards/cipulot/ec_menhir/info.json b/keyboards/cipulot/ec_menhir/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_menhir/info.json
rename to keyboards/cipulot/ec_menhir/keyboard.json
diff --git a/keyboards/cipulot/ec_tkl/info.json b/keyboards/cipulot/ec_tkl/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_tkl/info.json
rename to keyboards/cipulot/ec_tkl/keyboard.json
diff --git a/keyboards/cipulot/ec_typeb/info.json b/keyboards/cipulot/ec_typeb/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_typeb/info.json
rename to keyboards/cipulot/ec_typeb/keyboard.json
diff --git a/keyboards/cipulot/ec_vero/info.json b/keyboards/cipulot/ec_vero/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_vero/info.json
rename to keyboards/cipulot/ec_vero/keyboard.json
diff --git a/keyboards/cipulot/ec_virgo/info.json b/keyboards/cipulot/ec_virgo/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_virgo/info.json
rename to keyboards/cipulot/ec_virgo/keyboard.json
diff --git a/keyboards/dcpedit/masonry/info.json b/keyboards/dcpedit/masonry/keyboard.json
similarity index 100%
rename from keyboards/dcpedit/masonry/info.json
rename to keyboards/dcpedit/masonry/keyboard.json
diff --git a/keyboards/dcpedit/masonry/rules.mk b/keyboards/dcpedit/masonry/rules.mk
deleted file mode 100644
index cfa2d9632f9..00000000000
--- a/keyboards/dcpedit/masonry/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Intentionally left blank
\ No newline at end of file
diff --git a/keyboards/druah/dk_saver_redux/info.json b/keyboards/druah/dk_saver_redux/keyboard.json
similarity index 100%
rename from keyboards/druah/dk_saver_redux/info.json
rename to keyboards/druah/dk_saver_redux/keyboard.json
diff --git a/keyboards/druah/dk_saver_redux/rules.mk b/keyboards/druah/dk_saver_redux/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/druah/dk_saver_redux/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/era/linx3/n87/info.json b/keyboards/era/linx3/n87/keyboard.json
similarity index 100%
rename from keyboards/era/linx3/n87/info.json
rename to keyboards/era/linx3/n87/keyboard.json
diff --git a/keyboards/era/linx3/n87/rules.mk b/keyboards/era/linx3/n87/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/era/linx3/n87/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/info.json b/keyboards/era/sirind/tomak/keyboard.json
similarity index 100%
rename from keyboards/era/sirind/tomak/info.json
rename to keyboards/era/sirind/tomak/keyboard.json
diff --git a/keyboards/fatotesa/info.json b/keyboards/fatotesa/keyboard.json
similarity index 100%
rename from keyboards/fatotesa/info.json
rename to keyboards/fatotesa/keyboard.json
diff --git a/keyboards/fatotesa/rules.mk b/keyboards/fatotesa/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/fatotesa/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jaykeeb/jk65/info.json b/keyboards/jaykeeb/jk65/keyboard.json
similarity index 100%
rename from keyboards/jaykeeb/jk65/info.json
rename to keyboards/jaykeeb/jk65/keyboard.json
diff --git a/keyboards/jaykeeb/jk65/rules.mk b/keyboards/jaykeeb/jk65/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/jaykeeb/jk65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jlw/bruce_le_clavier/info.json b/keyboards/jlw/bruce_le_clavier/keyboard.json
similarity index 100%
rename from keyboards/jlw/bruce_le_clavier/info.json
rename to keyboards/jlw/bruce_le_clavier/keyboard.json
diff --git a/keyboards/jlw/bruce_le_clavier/rules.mk b/keyboards/jlw/bruce_le_clavier/rules.mk
deleted file mode 100644
index d4f87a82781..00000000000
--- a/keyboards/jlw/bruce_le_clavier/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-#This file intentionally left blank
diff --git a/keyboards/jlw/bruce_the_keyboard/info.json b/keyboards/jlw/bruce_the_keyboard/keyboard.json
similarity index 100%
rename from keyboards/jlw/bruce_the_keyboard/info.json
rename to keyboards/jlw/bruce_the_keyboard/keyboard.json
diff --git a/keyboards/jlw/bruce_the_keyboard/rules.mk b/keyboards/jlw/bruce_the_keyboard/rules.mk
deleted file mode 100644
index 218d8921e51..00000000000
--- a/keyboards/jlw/bruce_the_keyboard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank.
diff --git a/keyboards/jlw/vault35_wkl_universal/info.json b/keyboards/jlw/vault35_wkl_universal/keyboard.json
similarity index 100%
rename from keyboards/jlw/vault35_wkl_universal/info.json
rename to keyboards/jlw/vault35_wkl_universal/keyboard.json
diff --git a/keyboards/jlw/vault35_wkl_universal/rules.mk b/keyboards/jlw/vault35_wkl_universal/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/jlw/vault35_wkl_universal/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keyten/imi60/info.json b/keyboards/keyten/imi60/keyboard.json
similarity index 100%
rename from keyboards/keyten/imi60/info.json
rename to keyboards/keyten/imi60/keyboard.json
diff --git a/keyboards/keyten/imi60/rules.mk b/keyboards/keyten/imi60/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechwild/bb65/f401/info.json b/keyboards/mechwild/bb65/f401/keyboard.json
similarity index 100%
rename from keyboards/mechwild/bb65/f401/info.json
rename to keyboards/mechwild/bb65/f401/keyboard.json
diff --git a/keyboards/mechwild/bb65/f401/rules.mk b/keyboards/mechwild/bb65/f401/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mechwild/bb65/f401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechwild/bb65/f411/info.json b/keyboards/mechwild/bb65/f411/keyboard.json
similarity index 100%
rename from keyboards/mechwild/bb65/f411/info.json
rename to keyboards/mechwild/bb65/f411/keyboard.json
diff --git a/keyboards/mechwild/bb65/f411/rules.mk b/keyboards/mechwild/bb65/f411/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mechwild/bb65/f411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/novelkeys/nk_classic_tkl/info.json b/keyboards/novelkeys/nk_classic_tkl/keyboard.json
similarity index 100%
rename from keyboards/novelkeys/nk_classic_tkl/info.json
rename to keyboards/novelkeys/nk_classic_tkl/keyboard.json
diff --git a/keyboards/rarepotato8de/3x3macropad/info.json b/keyboards/rarepotato8de/3x3macropad/keyboard.json
similarity index 100%
rename from keyboards/rarepotato8de/3x3macropad/info.json
rename to keyboards/rarepotato8de/3x3macropad/keyboard.json
diff --git a/keyboards/rarepotato8de/3x3macropad/rules.mk b/keyboards/rarepotato8de/3x3macropad/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/scottokeebs/scottowing/info.json b/keyboards/scottokeebs/scottowing/keyboard.json
similarity index 100%
rename from keyboards/scottokeebs/scottowing/info.json
rename to keyboards/scottokeebs/scottowing/keyboard.json
diff --git a/keyboards/scottokeebs/scottowing/rules.mk b/keyboards/scottokeebs/scottowing/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/scottokeebs/scottowing/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/info.json b/keyboards/sharkoon/skiller_sgk50_s4/keyboard.json
similarity index 100%
rename from keyboards/sharkoon/skiller_sgk50_s4/info.json
rename to keyboards/sharkoon/skiller_sgk50_s4/keyboard.json
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/rules.mk b/keyboards/sharkoon/skiller_sgk50_s4/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/sharkoon/skiller_sgk50_s4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ymdk/ymd62/info.json b/keyboards/ymdk/ymd62/keyboard.json
similarity index 100%
rename from keyboards/ymdk/ymd62/info.json
rename to keyboards/ymdk/ymd62/keyboard.json