diff --git a/app/boards/arm/tofu/Kconfig.board b/app/boards/arm/kbdfans_tofu65_v2/Kconfig.board
similarity index 100%
rename from app/boards/arm/tofu/Kconfig.board
rename to app/boards/arm/kbdfans_tofu65_v2/Kconfig.board
diff --git a/app/boards/arm/tofu/Kconfig.defconfig b/app/boards/arm/kbdfans_tofu65_v2/Kconfig.defconfig
similarity index 100%
rename from app/boards/arm/tofu/Kconfig.defconfig
rename to app/boards/arm/kbdfans_tofu65_v2/Kconfig.defconfig
diff --git a/app/boards/arm/tofu/tofu65_v2.dts b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.dts
similarity index 98%
rename from app/boards/arm/tofu/tofu65_v2.dts
rename to app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.dts
index 6661f80a..03a548a8 100644
--- a/app/boards/arm/tofu/tofu65_v2.dts
+++ b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.dts
@@ -1,5 +1,7 @@
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
+/*
+ * Copyright (c) 2023 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
 
 /dts-v1/;
 
diff --git a/app/boards/arm/tofu/tofu65_v2.keymap b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.keymap
similarity index 98%
rename from app/boards/arm/tofu/tofu65_v2.keymap
rename to app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.keymap
index 8d9f0188..99989754 100644
--- a/app/boards/arm/tofu/tofu65_v2.keymap
+++ b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.keymap
@@ -1,5 +1,5 @@
-# Copyright (c) 2023 The ZMK Contributors
-# SPDX-License-Identifier: MIT
+// Copyright (c) 2023 The ZMK Contributors
+// SPDX-License-Identifier: MIT
 
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
diff --git a/app/boards/arm/tofu/tofu65_v2.yaml b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.yaml
similarity index 100%
rename from app/boards/arm/tofu/tofu65_v2.yaml
rename to app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.yaml
diff --git a/app/boards/arm/tofu/tofu65_v2.zmk.yml b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.zmk.yml
similarity index 100%
rename from app/boards/arm/tofu/tofu65_v2.zmk.yml
rename to app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.zmk.yml
diff --git a/app/boards/arm/tofu/tofu65_v2_defconfig b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2_defconfig
similarity index 100%
rename from app/boards/arm/tofu/tofu65_v2_defconfig
rename to app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2_defconfig