diff --git a/drivers/usbdev/usbdev_scsi.c b/drivers/usbdev/usbdev_scsi.c
index 4b0a3862d326a6b8be0efc1aed5f7fa4103bb799..c35a50183e0fddf9edb9cac7f392a41122a44239 100644
--- a/drivers/usbdev/usbdev_scsi.c
+++ b/drivers/usbdev/usbdev_scsi.c
@@ -742,13 +742,13 @@ static int inline usbstrg_cmdmodesense6(FAR struct usbstrg_dev_s *priv,
 
           /* There are no block descriptors, only the following mode page: */
 
-          ret = usbstrg_modepage(priv, &buf[SCSIREP_MODEPARAMETERHDR6_SIZEOF], modesense->pcpgcode, &mdlen);
+          ret = usbstrg_modepage(priv, &buf[SCSIRESP_MODEPARAMETERHDR6_SIZEOF], modesense->pcpgcode, &mdlen);
           if (ret == OK)
             {
                /* Store the mode data length and return the total message size */
 
                mph->mdlen      = mdlen - 1;
-               priv->nreqbytes = mdlen + SCSIREP_MODEPARAMETERHDR6_SIZEOF;
+               priv->nreqbytes = mdlen + SCSIRESP_MODEPARAMETERHDR6_SIZEOF;
             }
         }
     }
@@ -1187,18 +1187,18 @@ static int inline usbstrg_cmdmodesense10(FAR struct usbstrg_dev_s *priv,
            * (3) A variable lengtth list of mode page formats
            */
 
-          memset(mph, 0, SCSIREP_MODEPARAMETERHDR10_SIZEOF);
+          memset(mph, 0, SCSIRESP_MODEPARAMETERHDR10_SIZEOF);
           mph->param = (priv->lun->readonly ? SCSIRESP_MODEPARMHDR_DAPARM_WP : 0x00);
 
           /* There are no block descriptors, only the following mode page: */
 
-          ret = usbstrg_modepage(priv, &buf[SCSIREP_MODEPARAMETERHDR10_SIZEOF], modesense->pcpgcode, &mdlen);
+          ret = usbstrg_modepage(priv, &buf[SCSIRESP_MODEPARAMETERHDR10_SIZEOF], modesense->pcpgcode, &mdlen);
           if (ret == OK)
             {
                /* Store the mode data length and return the total message size */
 
               usbstrg_putbe16(mph->mdlen, mdlen - 2);
-              priv->nreqbytes = mdlen + SCSIREP_MODEPARAMETERHDR10_SIZEOF;
+              priv->nreqbytes = mdlen + SCSIRESP_MODEPARAMETERHDR10_SIZEOF;
             }
         }
     }
diff --git a/include/nuttx/scsi.h b/include/nuttx/scsi.h
index ac8cd5a035b5e4bfad91bcfa1379dc378eef9e45..f253494cd12fc33b9a3f1953cfacfd4512ad7bfd 100644
--- a/include/nuttx/scsi.h
+++ b/include/nuttx/scsi.h
@@ -735,7 +735,7 @@ struct scsiresp_modeparameterhdr6_s
   uint8_t param;         /* 2: Device-specific parameter */
   uint8_t bdlen;         /* 3: Block descriptor length */
 };
-#define SCSIREP_MODEPARAMETERHDR6_SIZEOF 4
+#define SCSIRESP_MODEPARAMETERHDR6_SIZEOF 4
 
 struct scsiresp_blockdesc_s
 {
@@ -744,7 +744,7 @@ struct scsiresp_blockdesc_s
   uint8_t reserved;      /* 4: reserved */
   uint8_t blklen[3];     /* 5-7: Block len */
 };
-#define SCSIREP_BLOCKDESC_SIZEOF 8
+#define SCSIRESP_BLOCKDESC_SIZEOF 8
 
 struct scsiresp_pageformat_s
 {
@@ -933,7 +933,7 @@ struct scsiresp_modeparameterhdr10_s
   uint8_t reserved[2];   /* 4-5: reserved */
   uint8_t bdlen[2];      /* 6-7: Block descriptor length */
 };
-#define SCSIREP_MODEPARAMETERHDR10_SIZEOF 8
+#define SCSIRESP_MODEPARAMETERHDR10_SIZEOF 8
 
 struct scsicmd_modesense10_s
 {