diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index c804dd6c5dd..3d8a5dc10d0 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -2602,20 +2602,20 @@ void cdcacm_get_composite_devdesc(struct composite_devdesc_s *dev)
 {
   /* The callback functions for the CDC/ACM class */
 
-  dev->mkconfdesc         = cdcacm_mkcfgdesc;
-  dev->mkstrdesc          = cdcacm_mkstrdesc;
-  dev->board_classobject  = 0;
-  dev->board_uninitialize = 0;
+  dev->mkconfdesc   = cdcacm_mkcfgdesc;
+  dev->mkstrdesc    = cdcacm_mkstrdesc;
+  dev->classobject  = 0;
+  dev->uninitialize = 0;
 
-  dev->nconfigs = CDCACM_NCONFIGS;               /* Number of configurations supported */
-  dev->configid = CDCACM_CONFIGID;               /* The only supported configuration ID */
+  dev->nconfigs     = CDCACM_NCONFIGS;               /* Number of configurations supported */
+  dev->configid     = CDCACM_CONFIGID;               /* The only supported configuration ID */
 
   /* Let the construction function calculate the size of the config descriptor */
 
 #ifdef CONFIG_USBDEV_DUALSPEED
-  dev->cfgdescsize = cdcacm_mkcfgdesc(NULL, NULL, USB_SPEED_UNKNOWN, 0);
+  dev->cfgdescsize  = cdcacm_mkcfgdesc(NULL, NULL, USB_SPEED_UNKNOWN, 0);
 #else
-  dev->cfgdescsize = cdcacm_mkcfgdesc(NULL, NULL);
+  dev->cfgdescsize  = cdcacm_mkcfgdesc(NULL, NULL);
 #endif
 
   dev->minor = 0;                                /* The minor interface number */
diff --git a/drivers/usbdev/composite.c b/drivers/usbdev/composite.c
index 94462e71676..6448d31d93d 100644
--- a/drivers/usbdev/composite.c
+++ b/drivers/usbdev/composite.c
@@ -838,9 +838,9 @@ FAR void *composite_initialize(uint8_t ndevices,
       memcpy(&priv->device[i].compdesc, &pdevices[i],
              sizeof(struct composite_devdesc_s));
 
-      ret = priv->device[i].compdesc.board_classobject(priv->device[i].compdesc.minor,
-                                                      &priv->device[i].compdesc.devdesc,
-                                                      &priv->device[i].dev);
+      ret = priv->device[i].compdesc.classobject(priv->device[i].compdesc.minor,
+                                                 &priv->device[i].compdesc.devdesc,
+                                                 &priv->device[i].dev);
       if (ret < 0)
         {
           usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_CLASSOBJECT),
@@ -912,7 +912,7 @@ void composite_uninitialize(FAR void *handle)
 
   for (i = 0; i < priv->ndevices; i++)
     {
-      priv->device[i].compdesc.board_uninitialize(priv->device[i].dev);
+      priv->device[i].compdesc.uninitialize(priv->device[i].dev);
     }
 
   /* Then unregister and destroy the composite class */
@@ -926,7 +926,7 @@ void composite_uninitialize(FAR void *handle)
 
   for (i = 0; i < priv->ndevices; i++)
     {
-      priv->device[i].compdesc.board_uninitialize(priv->device[i].dev);
+      priv->device[i].compdesc.uninitialize(priv->device[i].dev);
     }
 
   /* Then free the composite driver state structure itself */
diff --git a/drivers/usbdev/composite_desc.c b/drivers/usbdev/composite_desc.c
index f7e8a7dc838..3a86099fd93 100644
--- a/drivers/usbdev/composite_desc.c
+++ b/drivers/usbdev/composite_desc.c
@@ -252,7 +252,7 @@ int16_t composite_mkcfgdesc(FAR struct composite_dev_s *priv, FAR uint8_t *buf)
 
   /* Copy all contained interface descriptors into the buffer too */
 
-  for (i = 0; i < priv->numDevices; i++)
+  for (i = 0; i < priv->ndevices; i++)
     {
 #ifdef CONFIG_USBDEV_DUALSPEED
       len = priv->device[i].compdesc.mkconfdesc(buf,
diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c
index acc2e96451e..20ca6ad702b 100644
--- a/drivers/usbdev/usbmsc.c
+++ b/drivers/usbdev/usbmsc.c
@@ -1881,15 +1881,15 @@ void usbmsc_get_composite_devdesc(FAR struct composite_devdesc_s *dev)
 {
   /* The callback functions for the CDC/ACM class */
 
-  dev->mkconfdesc         = usbmsc_mkcfgdesc;
-  dev->mkstrdesc          = usbmsc_mkstrdesc;
-  dev->board_classobject  = 0;
-  dev->board_uninitialize = 0;
+  dev->mkconfdesc          = usbmsc_mkcfgdesc;
+  dev->mkstrdesc           = usbmsc_mkstrdesc;
+  dev->classobject         = 0;
+  dev->uninitialize        = 0;
 
-  dev->nconfigs           = USBMSC_NCONFIGS;          /* Number of configurations supported */
-  dev->configid           = USBMSC_CONFIGID;          /* The only supported configuration ID */
-  dev->cfgdescsize        = SIZEOF_USBMSC_CFGDESC;    /* The size of the config descriptor */
-  dev->minor              = 0;                        /* The minor interface number */
+  dev->nconfigs            = USBMSC_NCONFIGS;          /* Number of configurations supported */
+  dev->configid            = USBMSC_CONFIGID;          /* The only supported configuration ID */
+  dev->cfgdescsize         = SIZEOF_USBMSC_CFGDESC;    /* The size of the config descriptor */
+  dev->minor               = 0;                        /* The minor interface number */
 
   /* Interfaces */