diff --git a/drivers/usbdev/composite.h b/drivers/usbdev/composite.h
index ae97b25fbf..f1adb4337c 100644
--- a/drivers/usbdev/composite.h
+++ b/drivers/usbdev/composite.h
@@ -140,7 +140,7 @@
 #  define DEV1_STRIDBASE      CONFIG_CDCACM_STRBASE
 #  define DEV1_NSTRIDS        CDCACM_NSTRIDS
 #  define DEV1_CFGDESCSIZE    SIZEOF_CDCACM_CFGDESC
-#elif defined(CONFIG_CDCACM_COMPOSITE)
+#elif defined(CONFIG_USBMSC_COMPOSITE)
 #  define DEV1_IS_USBMSC     1
 #  define DEV1_MKCFGDESC      usbmsc_mkcfgdesc
 #  define DEV1_MKSTRDESC      usbmsc_mkstrdesc
@@ -174,7 +174,7 @@
 #  define DEV2_STRIDBASE      CONFIG_CDCACM_STRBASE
 #  define DEV2_NSTRIDS        CDCACM_NSTRIDS
 #  define DEV2_CFGDESCSIZE    SIZEOF_CDCACM_CFGDESC
-#elif defined(CONFIG_CDCACM_COMPOSITE) && !defined(DEV1_IS_USBMSC)
+#elif defined(CONFIG_USBMSC_COMPOSITE) && !defined(DEV1_IS_USBMSC)
 #  define DEV2_IS_USBMSC     1
 #  define DEV2_MKCFGDESC      usbmsc_mkcfgdesc
 #  define DEV2_MKSTRDESC      usbmsc_mkstrdesc