diff --git a/src/class/custom/custom_device.c b/src/class/vendor/vendor_device.c
similarity index 99%
rename from src/class/custom/custom_device.c
rename to src/class/vendor/vendor_device.c
index cf9aa3b3..2f7bba16 100644
--- a/src/class/custom/custom_device.c
+++ b/src/class/vendor/vendor_device.c
@@ -29,7 +29,7 @@
 #if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_VENDOR)
 
 #include "common/tusb_common.h"
-#include "custom_device.h"
+#include "vendor_device.h"
 #include "device/usbd_pvt.h"
 
 /*------------------------------------------------------------------*/
diff --git a/src/class/custom/custom_device.h b/src/class/vendor/vendor_device.h
similarity index 100%
rename from src/class/custom/custom_device.h
rename to src/class/vendor/vendor_device.h
diff --git a/src/class/custom/custom_host.c b/src/class/vendor/vendor_host.c
similarity index 99%
rename from src/class/custom/custom_host.c
rename to src/class/vendor/vendor_host.c
index ebe257e6..3e8dac0f 100644
--- a/src/class/custom/custom_host.c
+++ b/src/class/vendor/vendor_host.c
@@ -32,7 +32,7 @@
 // INCLUDE
 //--------------------------------------------------------------------+
 #include "common/tusb_common.h"
-#include "custom_host.h"
+#include "vendor_host.h"
 
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
diff --git a/src/class/custom/custom_host.h b/src/class/vendor/vendor_host.h
similarity index 100%
rename from src/class/custom/custom_host.h
rename to src/class/vendor/vendor_host.h
diff --git a/src/tusb.h b/src/tusb.h
index 3f6673ae..fe867372 100644
--- a/src/tusb.h
+++ b/src/tusb.h
@@ -55,7 +55,7 @@
   #endif
 
   #if CFG_TUH_VENDOR
-    #include "class/custom_host.h"
+    #include "class/vendor/vendor_host.h"
   #endif
 
 #endif
@@ -81,7 +81,7 @@
   #endif
 
   #if CFG_TUD_VENDOR
-    #include "class/custom/custom_device.h"
+    #include "class/vendor/vendor_device.h"
   #endif
 #endif