diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 8b68a58482..94a94157c0 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -68,20 +68,8 @@
         "type": "number"
     },
     "keyboard": {
-        "oneOf": [
-            {
-                "type": "string",
-                "enum": [
-                    "converter/numeric_keypad_IIe",
-                    "emptystring/NQG",
-                    "maple_computing/christmas_tree/V2017"
-                ]
-            },
-            {
-                "type": "string",
-                "pattern": "^[0-9a-z][0-9a-z_/]*$"
-            }
-        ]
+        "type": "string",
+        "pattern": "^[0-9a-z][0-9a-z_/]*$"
     },
     "mcu_pin_array": {
         "type": "array",
diff --git a/keyboards/converter/numeric_keypad_IIe/config.h b/keyboards/converter/numeric_keypad_iie/config.h
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/config.h
rename to keyboards/converter/numeric_keypad_iie/config.h
diff --git a/keyboards/converter/numeric_keypad_IIe/info.json b/keyboards/converter/numeric_keypad_iie/info.json
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/info.json
rename to keyboards/converter/numeric_keypad_iie/info.json
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/default/keymap.c b/keyboards/converter/numeric_keypad_iie/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/keymaps/default/keymap.c
rename to keyboards/converter/numeric_keypad_iie/keymaps/default/keymap.c
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/default/readme.md b/keyboards/converter/numeric_keypad_iie/keymaps/default/readme.md
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/keymaps/default/readme.md
rename to keyboards/converter/numeric_keypad_iie/keymaps/default/readme.md
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/newbold/config.h b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/config.h
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/keymaps/newbold/config.h
rename to keyboards/converter/numeric_keypad_iie/keymaps/newbold/config.h
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/newbold/keymap.c b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/keymaps/newbold/keymap.c
rename to keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/newbold/readme.md b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/readme.md
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/keymaps/newbold/readme.md
rename to keyboards/converter/numeric_keypad_iie/keymaps/newbold/readme.md
diff --git a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c
similarity index 95%
rename from keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
rename to keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c
index a2f8a5bd6e..341af05b31 100644
--- a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
+++ b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c
@@ -13,4 +13,4 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "numeric_keypad_IIe.h"
+#include "numeric_keypad_iie.h"
diff --git a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.h b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.h
rename to keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h
diff --git a/keyboards/converter/numeric_keypad_IIe/readme.md b/keyboards/converter/numeric_keypad_iie/readme.md
similarity index 96%
rename from keyboards/converter/numeric_keypad_IIe/readme.md
rename to keyboards/converter/numeric_keypad_iie/readme.md
index 9eba41610a..0de562d808 100644
--- a/keyboards/converter/numeric_keypad_IIe/readme.md
+++ b/keyboards/converter/numeric_keypad_iie/readme.md
@@ -11,6 +11,6 @@ Hardware Supported: Internal Numeric Keypad IIe PCB (Apple part 820.0081.c), ATm
 
 Make example for this keyboard (after setting up your build environment):
 
-    make converter/numeric_keypad_IIe:default
+    make converter/numeric_keypad_iie: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/converter/numeric_keypad_IIe/rules.mk b/keyboards/converter/numeric_keypad_iie/rules.mk
similarity index 100%
rename from keyboards/converter/numeric_keypad_IIe/rules.mk
rename to keyboards/converter/numeric_keypad_iie/rules.mk
diff --git a/keyboards/emptystring/NQG/NQG.c b/keyboards/emptystring/NQG/NQG.c
deleted file mode 100644
index eedf25e881..0000000000
--- a/keyboards/emptystring/NQG/NQG.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "NQG.h"
diff --git a/keyboards/emptystring/NQG/.noci b/keyboards/emptystring/nqg/.noci
similarity index 100%
rename from keyboards/emptystring/NQG/.noci
rename to keyboards/emptystring/nqg/.noci
diff --git a/keyboards/emptystring/NQG/config.h b/keyboards/emptystring/nqg/config.h
similarity index 100%
rename from keyboards/emptystring/NQG/config.h
rename to keyboards/emptystring/nqg/config.h
diff --git a/keyboards/emptystring/NQG/info.json b/keyboards/emptystring/nqg/info.json
similarity index 100%
rename from keyboards/emptystring/NQG/info.json
rename to keyboards/emptystring/nqg/info.json
diff --git a/keyboards/emptystring/NQG/keymaps/default/keymap.c b/keyboards/emptystring/nqg/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/emptystring/NQG/keymaps/default/keymap.c
rename to keyboards/emptystring/nqg/keymaps/default/keymap.c
diff --git a/keyboards/emptystring/NQG/keymaps/default/rules.mk b/keyboards/emptystring/nqg/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/emptystring/NQG/keymaps/default/rules.mk
rename to keyboards/emptystring/nqg/keymaps/default/rules.mk
diff --git a/keyboards/emptystring/nqg/nqg.c b/keyboards/emptystring/nqg/nqg.c
new file mode 100644
index 0000000000..85eb47e6d3
--- /dev/null
+++ b/keyboards/emptystring/nqg/nqg.c
@@ -0,0 +1 @@
+#include "nqg.h"
diff --git a/keyboards/emptystring/NQG/NQG.h b/keyboards/emptystring/nqg/nqg.h
similarity index 100%
rename from keyboards/emptystring/NQG/NQG.h
rename to keyboards/emptystring/nqg/nqg.h
diff --git a/keyboards/emptystring/NQG/readme.md b/keyboards/emptystring/nqg/readme.md
similarity index 96%
rename from keyboards/emptystring/NQG/readme.md
rename to keyboards/emptystring/nqg/readme.md
index 5e78420e2b..b2ceeeb87d 100644
--- a/keyboards/emptystring/NQG/readme.md
+++ b/keyboards/emptystring/nqg/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: Kits are available from [SA_EndlessGame](http://twitter.c
 
 Make example for this keyboard (after setting up your build environment):
 
-    make emptystring/NQG:default
+    make emptystring/nqg: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/emptystring/NQG/rules.mk b/keyboards/emptystring/nqg/rules.mk
similarity index 100%
rename from keyboards/emptystring/NQG/rules.mk
rename to keyboards/emptystring/nqg/rules.mk
diff --git a/keyboards/maple_computing/christmas_tree/V2017/V2017.c b/keyboards/maple_computing/christmas_tree/V2017/V2017.c
deleted file mode 100644
index e367270592..0000000000
--- a/keyboards/maple_computing/christmas_tree/V2017/V2017.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "V2017.h"
\ No newline at end of file
diff --git a/keyboards/maple_computing/christmas_tree/readme.md b/keyboards/maple_computing/christmas_tree/readme.md
index 3ba255a18c..2ede444ce4 100644
--- a/keyboards/maple_computing/christmas_tree/readme.md
+++ b/keyboards/maple_computing/christmas_tree/readme.md
@@ -9,6 +9,6 @@ Keyboard Maintainer: [That-Canadian](https://github.com/That-Canadian)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make maple_computing/christmas_tree/V2017:default
+    make maple_computing/christmas_tree/v2017:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/maple_computing/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk
index 45ac883163..ed78c6fabe 100644
--- a/keyboards/maple_computing/christmas_tree/rules.mk
+++ b/keyboards/maple_computing/christmas_tree/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
-DEFAULT_FOLDER = maple_computing/christmas_tree/V2017
+DEFAULT_FOLDER = maple_computing/christmas_tree/v2017
diff --git a/keyboards/maple_computing/christmas_tree/V2017/info.json b/keyboards/maple_computing/christmas_tree/v2017/info.json
similarity index 100%
rename from keyboards/maple_computing/christmas_tree/V2017/info.json
rename to keyboards/maple_computing/christmas_tree/v2017/info.json
diff --git a/keyboards/maple_computing/christmas_tree/V2017/rules.mk b/keyboards/maple_computing/christmas_tree/v2017/rules.mk
similarity index 100%
rename from keyboards/maple_computing/christmas_tree/V2017/rules.mk
rename to keyboards/maple_computing/christmas_tree/v2017/rules.mk
diff --git a/keyboards/maple_computing/christmas_tree/v2017/v2017.c b/keyboards/maple_computing/christmas_tree/v2017/v2017.c
new file mode 100644
index 0000000000..22067e5367
--- /dev/null
+++ b/keyboards/maple_computing/christmas_tree/v2017/v2017.c
@@ -0,0 +1 @@
+#include "v2017.h"
\ No newline at end of file
diff --git a/keyboards/maple_computing/christmas_tree/V2017/V2017.h b/keyboards/maple_computing/christmas_tree/v2017/v2017.h
similarity index 100%
rename from keyboards/maple_computing/christmas_tree/V2017/V2017.h
rename to keyboards/maple_computing/christmas_tree/v2017/v2017.h