diff --git a/keyboards/ymdk/oni_hhkb/readme.md b/keyboards/ymdk/oni_hhkb/readme.md
deleted file mode 100644
index 837af767cdf..00000000000
--- a/keyboards/ymdk/oni_hhkb/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# YMDK ONI HHKB
-
-![ONI HHKB PCB, Hotswap Tsangan/HHKB PCB with RGB Matrix and backlight](https://imgur.com/DB87on8.jpg)
-
-Customizable 60% HHKB Hotswap by PCB by [YMDK](https://ymdkey.com).
-
-- Keyboard Maintainer: [chrisgve](https://github.com/chrisgve)
-- Hardware Supported: YMDK ONI HHKB
-- Hardware Availability: [YMDK ONI HHKB](https://ymdkey.com/products/ymdk-gh60-hhkb-style-tsangan-oni-hot-swappable-both-underglow-switch-rgb-via-programmable-pcb-compatible-with-tokyo-60)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make ymdk/oni_hhkb:default
-
-The keyboard uses a DFU bootloader. To make a keymap and use dfu to flash it:
-
-    make ymdk/oni_hhkb:default:flash
-
-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/ymdk/oni_hhkb/keyboard.json b/keyboards/ymdk/oni_tsangan/keyboard.json
similarity index 99%
rename from keyboards/ymdk/oni_hhkb/keyboard.json
rename to keyboards/ymdk/oni_tsangan/keyboard.json
index 71dfb9e5fd7..e3814bc51f7 100644
--- a/keyboards/ymdk/oni_hhkb/keyboard.json
+++ b/keyboards/ymdk/oni_tsangan/keyboard.json
@@ -1,6 +1,6 @@
 {
     "manufacturer": "YMDK",
-    "keyboard_name": "Oni HHKB",
+    "keyboard_name": "Oni Tsangan",
     "maintainer": "chrisgve",
     "bootloader": "atmel-dfu",
     "diode_direction": "ROW2COL",
diff --git a/keyboards/ymdk/oni_hhkb/keymaps/default/keymap.c b/keyboards/ymdk/oni_tsangan/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ymdk/oni_hhkb/keymaps/default/keymap.c
rename to keyboards/ymdk/oni_tsangan/keymaps/default/keymap.c
diff --git a/keyboards/ymdk/oni_hhkb/oni_hhkb.c b/keyboards/ymdk/oni_tsangan/oni_hhkb.c
similarity index 100%
rename from keyboards/ymdk/oni_hhkb/oni_hhkb.c
rename to keyboards/ymdk/oni_tsangan/oni_hhkb.c
diff --git a/keyboards/ymdk/oni_tsangan/readme.md b/keyboards/ymdk/oni_tsangan/readme.md
new file mode 100644
index 00000000000..f70a9cde2cd
--- /dev/null
+++ b/keyboards/ymdk/oni_tsangan/readme.md
@@ -0,0 +1,19 @@
+# YMDK ONI Tsangan
+
+![ONI Tsangan PCB, Hotswap Tsangan/HHKB-like PCB with RGB Matrix and backlight](https://imgur.com/DB87on8.jpg)
+
+Customizable 60% Tsangan/HHKB-like Hotswap PCB by [YMDK](https://ymdkey.com).
+
+- Keyboard Maintainer: [chrisgve](https://github.com/chrisgve)
+- Hardware Supported: YMDK ONI Tsangan/HHKB-like
+- Hardware Availability: [YMDK ONI Tsangan/HHKB-like](https://ymdkey.com/products/ymdk-gh60-hhkb-style-tsangan-oni-hot-swappable-both-underglow-switch-rgb-via-programmable-pcb-compatible-with-tokyo-60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ymdk/oni_tsangan:default
+
+The keyboard uses a DFU bootloader. To make a keymap and use dfu to flash it:
+
+    make ymdk/oni_tsangan:default:flash
+
+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).