diff --git a/keyboards/macropad/keymaps/default/readme.md b/keyboards/macropad/keymaps/default/readme.md
deleted file mode 100644
index bd3d78af21..0000000000
--- a/keyboards/macropad/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for macropad
diff --git a/keyboards/macropad/config.h b/keyboards/treasure/type9/config.h
similarity index 99%
rename from keyboards/macropad/config.h
rename to keyboards/treasure/type9/config.h
index 00f2e78110..55f0a85956 100644
--- a/keyboards/macropad/config.h
+++ b/keyboards/treasure/type9/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0x0000
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Treasure
-#define PRODUCT         Macropad Type 9
+#define PRODUCT         Type 9
 #define DESCRIPTION     A custom macropad
 
 /* key matrix size */
diff --git a/keyboards/macropad/info.json b/keyboards/treasure/type9/info.json
similarity index 90%
rename from keyboards/macropad/info.json
rename to keyboards/treasure/type9/info.json
index f946ed153e..7e7b1d0bda 100644
--- a/keyboards/macropad/info.json
+++ b/keyboards/treasure/type9/info.json
@@ -1,5 +1,5 @@
 {
-  "keyboard_name": "Macropad",
+  "keyboard_name": "Type-9",
   "url": "",
   "maintainer": "qmk",
   "width": 3,
diff --git a/keyboards/macropad/keymaps/default/config.h b/keyboards/treasure/type9/keymaps/default/config.h
similarity index 100%
rename from keyboards/macropad/keymaps/default/config.h
rename to keyboards/treasure/type9/keymaps/default/config.h
diff --git a/keyboards/macropad/keymaps/default/keymap.c b/keyboards/treasure/type9/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/macropad/keymaps/default/keymap.c
rename to keyboards/treasure/type9/keymaps/default/keymap.c
diff --git a/keyboards/treasure/type9/keymaps/default/readme.md b/keyboards/treasure/type9/keymaps/default/readme.md
new file mode 100644
index 0000000000..94784baccd
--- /dev/null
+++ b/keyboards/treasure/type9/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Type-9
diff --git a/keyboards/macropad/readme.md b/keyboards/treasure/type9/readme.md
similarity index 92%
rename from keyboards/macropad/readme.md
rename to keyboards/treasure/type9/readme.md
index 204ec1fd23..7c567f91b9 100644
--- a/keyboards/macropad/readme.md
+++ b/keyboards/treasure/type9/readme.md
@@ -1,4 +1,4 @@
-# Macropad
+# Type-9
 
 3x3 Macropad.
 
@@ -8,6 +8,6 @@ Hardware Availability: [Treasure](http://macropad.co/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make macropad:default
+    make treasure/type9: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/macropad/rules.mk b/keyboards/treasure/type9/rules.mk
similarity index 100%
rename from keyboards/macropad/rules.mk
rename to keyboards/treasure/type9/rules.mk
diff --git a/keyboards/macropad/macropad.c b/keyboards/treasure/type9/type9.c
similarity index 98%
rename from keyboards/macropad/macropad.c
rename to keyboards/treasure/type9/type9.c
index 0219746e12..58a9c8f52d 100644
--- a/keyboards/macropad/macropad.c
+++ b/keyboards/treasure/type9/type9.c
@@ -13,7 +13,7 @@
  * 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 "macropad.h"
+#include "type9.h"
 
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
diff --git a/keyboards/macropad/macropad.h b/keyboards/treasure/type9/type9.h
similarity index 96%
rename from keyboards/macropad/macropad.h
rename to keyboards/treasure/type9/type9.h
index 94471d7c57..4e3c235d11 100644
--- a/keyboards/macropad/macropad.h
+++ b/keyboards/treasure/type9/type9.h
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef MACROPAD_H
-#define MACROPAD_H
+#ifndef TYPE9_H
+#define TYPE9_H
 
 #include "quantum.h"