diff --git a/keyboards/at101_bh/at101_bh.c b/keyboards/at101_bh/at101_bh.c
new file mode 100644
index 000000000000..3b519373b070
--- /dev/null
+++ b/keyboards/at101_bh/at101_bh.c
@@ -0,0 +1 @@
+#include "at101_bh.h"
diff --git a/keyboards/at101_blackheart/at101_blackheart.h b/keyboards/at101_bh/at101_bh.h
similarity index 96%
rename from keyboards/at101_blackheart/at101_blackheart.h
rename to keyboards/at101_bh/at101_bh.h
index 24ac1b7c541b..54655cf60e8d 100644
--- a/keyboards/at101_blackheart/at101_blackheart.h
+++ b/keyboards/at101_bh/at101_bh.h
@@ -1,5 +1,4 @@
-#ifndef at101_blackheart_H
-#define at101_blackheart_H
+#pragma once
 
 #include "quantum.h"
 
@@ -24,5 +23,3 @@
 	{ K1000, K1001, KC_NO, KC_NO, KC_NO, K1005, K1006, K1007, K1008, K1009 }, \
 	{ K1100, K1101, K1102, KC_NO, KC_NO, K1105, K1106, K1107, K1108, KC_NO }  \
 }
-
-#endif
diff --git a/keyboards/at101_blackheart/config.h b/keyboards/at101_bh/config.h
similarity index 95%
rename from keyboards/at101_blackheart/config.h
rename to keyboards/at101_bh/config.h
index 83814c6486c5..6928118b7966 100644
--- a/keyboards/at101_blackheart/config.h
+++ b/keyboards/at101_bh/config.h
@@ -7,7 +7,7 @@
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    blindassassin111
-#define PRODUCT         AT101_Blackheart PCB
+#define PRODUCT         AT101_BH PCB
 #define DESCRIPTION     Replacement AT101 PCB
 
 /* key matrix size */
diff --git a/keyboards/at101_blackheart/info.json b/keyboards/at101_bh/info.json
similarity index 98%
rename from keyboards/at101_blackheart/info.json
rename to keyboards/at101_bh/info.json
index 4bef46712d17..1d28dc230bd3 100644
--- a/keyboards/at101_blackheart/info.json
+++ b/keyboards/at101_bh/info.json
@@ -1,6 +1,6 @@
 {
-  "keyboard_name": "AT101 Blackheart PCB",
-  "keyboard_folder": "at101_blackheart",
+  "keyboard_name": "AT101 BH PCB",
+  "keyboard_folder": "at101_bh",
   "url": "https://deskthority.net/group-buys-f50/programmable-vintage-board-pcbs-omnikey-at101-and-z-150-t19325.html",
   "maintainer": "qmk, blindassassin111",
   "width": 22.5,
diff --git a/keyboards/at101_blackheart/keymaps/default/keymap.c b/keyboards/at101_bh/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/at101_blackheart/keymaps/default/keymap.c
rename to keyboards/at101_bh/keymaps/default/keymap.c
diff --git a/keyboards/at101_blackheart/readme.md b/keyboards/at101_bh/readme.md
similarity index 77%
rename from keyboards/at101_blackheart/readme.md
rename to keyboards/at101_bh/readme.md
index d435d6955aa6..8a9ce2496ff2 100644
--- a/keyboards/at101_blackheart/readme.md
+++ b/keyboards/at101_bh/readme.md
@@ -1,15 +1,15 @@
-# AT101 Blackheart PCB
+# AT101 BH PCB
 
-![AT101 Blackheart PCB](https://deskthority.net/resources/image/48571)
+![AT101 BH PCB](https://deskthority.net/resources/image/48571)
 
 A replacement PCB for AT101 keyboards.
 
 Keyboard Maintainer: QMK Community and blindassassin111  
-Hardware Supported: AT101 blackheart PCB  
+Hardware Supported: AT101 BH PCB  
 Hardware Availability: https://deskthority.net/group-buys-f50/programmable-vintage-board-pcbs-omnikey-at101-and-z-150-t19325.html
 
 Make example for this keyboard (after setting up your build environment):
 
-    make at101_blackheart:default
+    make at101_bh: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/at101_blackheart/rules.mk b/keyboards/at101_bh/rules.mk
similarity index 100%
rename from keyboards/at101_blackheart/rules.mk
rename to keyboards/at101_bh/rules.mk
diff --git a/keyboards/at101_blackheart/at101_blackheart.c b/keyboards/at101_blackheart/at101_blackheart.c
deleted file mode 100644
index aa07a7864368..000000000000
--- a/keyboards/at101_blackheart/at101_blackheart.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "at101_blackheart.h"
diff --git a/keyboards/omnikey_blackheart/config.h b/keyboards/omnikey_bh/config.h
similarity index 100%
rename from keyboards/omnikey_blackheart/config.h
rename to keyboards/omnikey_bh/config.h
diff --git a/keyboards/omnikey_blackheart/info.json b/keyboards/omnikey_bh/info.json
similarity index 99%
rename from keyboards/omnikey_blackheart/info.json
rename to keyboards/omnikey_bh/info.json
index 138c954b77a1..50d64e143cf6 100644
--- a/keyboards/omnikey_blackheart/info.json
+++ b/keyboards/omnikey_bh/info.json
@@ -1,5 +1,5 @@
 {
-  "keyboard_name": "Omnikey Blackheart PCB",
+  "keyboard_name": "Omnikey BH PCB",
   "url": "",
   "maintainer": "qmk",
   "width": 25.5,
diff --git a/keyboards/omnikey_blackheart/keymaps/default/keymap.c b/keyboards/omnikey_bh/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/omnikey_blackheart/keymaps/default/keymap.c
rename to keyboards/omnikey_bh/keymaps/default/keymap.c
diff --git a/keyboards/omnikey_bh/omnikey_bh.c b/keyboards/omnikey_bh/omnikey_bh.c
new file mode 100644
index 000000000000..c2f52f30c32c
--- /dev/null
+++ b/keyboards/omnikey_bh/omnikey_bh.c
@@ -0,0 +1 @@
+#include "omnikey_bh.h"
diff --git a/keyboards/omnikey_blackheart/omnikey_blackheart.h b/keyboards/omnikey_bh/omnikey_bh.h
similarity index 96%
rename from keyboards/omnikey_blackheart/omnikey_blackheart.h
rename to keyboards/omnikey_bh/omnikey_bh.h
index 5d2d948c4954..f36184f3905a 100644
--- a/keyboards/omnikey_blackheart/omnikey_blackheart.h
+++ b/keyboards/omnikey_bh/omnikey_bh.h
@@ -1,5 +1,4 @@
-#ifndef omnikey_blackheart
-#define omnikey_blackheart
+#pragma once
 
 #include "quantum.h"
 
@@ -18,5 +17,3 @@
   { K400,  K401,  K402,  K403,  K404,  K405,   K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414,  K415,  K416,  K417,  K418,  K419,  K420,  K421,  KC_NO }, \
   { K500,  K501,  K502,  K503,  K504,  KC_NO,  KC_NO, K507,  KC_NO, KC_NO, KC_NO, KC_NO, K512,  K513,  K514,  K515,  K516,  K517,  K518,  K519,  K520,  KC_NO, KC_NO }  \
 }
-
-#endif
\ No newline at end of file
diff --git a/keyboards/omnikey_blackheart/readme.md b/keyboards/omnikey_bh/readme.md
similarity index 83%
rename from keyboards/omnikey_blackheart/readme.md
rename to keyboards/omnikey_bh/readme.md
index 04bb49818c1d..7de22f29a451 100644
--- a/keyboards/omnikey_blackheart/readme.md
+++ b/keyboards/omnikey_bh/readme.md
@@ -1,14 +1,14 @@
-Omnikey Blackheart PCB
+Omnikey BH PCB
 ===
 
 A replacement PCB for Omnikey keyboards. Supports 101, 102, Plus, Ultra T, Ultra, Prime and Stellar, as well as customs.
 
 Keyboard Maintainer: QMK Community and blindassassin111  
-Hardware Supported: Omnikey blackheart PCB  
+Hardware Supported: Omnikey BH PCB  
 Hardware Availability: https://deskthority.net/group-buys-f50/omnikey-replacement-pcb-t18276.html
 
 Make example for this keyboard (after setting up your build environment):
 
-    make omnikey_blackheart:default
+    make omnikey_bh: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/omnikey_blackheart/rules.mk b/keyboards/omnikey_bh/rules.mk
similarity index 100%
rename from keyboards/omnikey_blackheart/rules.mk
rename to keyboards/omnikey_bh/rules.mk
diff --git a/keyboards/omnikey_blackheart/omnikey_blackheart.c b/keyboards/omnikey_blackheart/omnikey_blackheart.c
deleted file mode 100644
index e54047fa68a9..000000000000
--- a/keyboards/omnikey_blackheart/omnikey_blackheart.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "omnikey_blackheart.h"
diff --git a/keyboards/z150_blackheart/config.h b/keyboards/z150_bh/config.h
similarity index 100%
rename from keyboards/z150_blackheart/config.h
rename to keyboards/z150_bh/config.h
diff --git a/keyboards/z150_blackheart/info.json b/keyboards/z150_bh/info.json
similarity index 99%
rename from keyboards/z150_blackheart/info.json
rename to keyboards/z150_bh/info.json
index 016641254c35..6e5c121f6a03 100644
--- a/keyboards/z150_blackheart/info.json
+++ b/keyboards/z150_bh/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "Z-150 Blackheart",
+    "keyboard_name": "Z-150 BH",
     "url": "",
     "maintainer": "qmk, blindassassin111",
     "width": 21.25,
diff --git a/keyboards/z150_blackheart/keymaps/default/keymap.c b/keyboards/z150_bh/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/z150_blackheart/keymaps/default/keymap.c
rename to keyboards/z150_bh/keymaps/default/keymap.c
diff --git a/keyboards/z150_blackheart/keymaps/default_tkl/keymap.c b/keyboards/z150_bh/keymaps/default_tkl/keymap.c
similarity index 100%
rename from keyboards/z150_blackheart/keymaps/default_tkl/keymap.c
rename to keyboards/z150_bh/keymaps/default_tkl/keymap.c
diff --git a/keyboards/z150_blackheart/readme.md b/keyboards/z150_bh/readme.md
similarity index 86%
rename from keyboards/z150_blackheart/readme.md
rename to keyboards/z150_bh/readme.md
index 331f85694e36..a1d484580846 100644
--- a/keyboards/z150_blackheart/readme.md
+++ b/keyboards/z150_bh/readme.md
@@ -1,14 +1,14 @@
-Z-150 Blackheart PCB
+Z-150 BH PCB
 ===
 
 A replacement PCB for Zenith Z-150 keyboards.
 
 Keyboard Maintainer: QMK Community and blindassassin111  
-Hardware Supported: Z-150 blackheart PCB  
+Hardware Supported: Z-150 BH PCB  
 Hardware Availability: [Deskthority Group Buy](https://deskthority.net/group-buys-f50/programmable-vintage-board-pcbs-omnikey-at101-and-z-150-t19325.html)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make z150_blackheart:default
+    make z150_bh: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/z150_blackheart/rules.mk b/keyboards/z150_bh/rules.mk
similarity index 100%
rename from keyboards/z150_blackheart/rules.mk
rename to keyboards/z150_bh/rules.mk
diff --git a/keyboards/z150_blackheart/z150_blackheart.c b/keyboards/z150_bh/z150_bh.c
similarity index 95%
rename from keyboards/z150_blackheart/z150_blackheart.c
rename to keyboards/z150_bh/z150_bh.c
index b754c64a12a1..6db784b56efe 100644
--- a/keyboards/z150_blackheart/z150_blackheart.c
+++ b/keyboards/z150_bh/z150_bh.c
@@ -1,4 +1,4 @@
-#include "z150_blackheart.h"
+#include "z150_bh.h"
 
 void matrix_init_kb(void) {
     setPinOutput(B0);
diff --git a/keyboards/z150_blackheart/z150_blackheart.h b/keyboards/z150_bh/z150_bh.h
similarity index 100%
rename from keyboards/z150_blackheart/z150_blackheart.h
rename to keyboards/z150_bh/z150_bh.h