diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c
index 5d4cfad7e7..ff60cae714 100644
--- a/arch/arm/src/sam34/sam_udp.c
+++ b/arch/arm/src/sam34/sam_udp.c
@@ -598,7 +598,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
  * Name: sam_printreg
  *
  * Description:
- *   Print the contents of a SAM34 EHCI register
+ *   Print the contents of a SAM34 UDP registers
  *
  *******************************************************************************/
 
@@ -614,7 +614,7 @@ static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
  *
  * Description:
  *   Check if it is time to output debug information for accesses to a SAM34
- *   EHCI register
+ *   UDP registers
  *
  *******************************************************************************/
 
diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c
index 9785bef42c..1e3af07a34 100644
--- a/arch/arm/src/sama5/sam_ohci.c
+++ b/arch/arm/src/sama5/sam_ohci.c
@@ -1677,10 +1677,10 @@ static int sam_ctrltd(struct sam_rhport_s *rhport, uint32_t dirpid,
       sam_putreg(regval, SAM_USBHOST_CMDST);
 
       /* Release the OHCI semaphore while we wait.  Other threads need the
-       * opportunity to access the EHCI resources while we wait.
+       * opportunity to access the OHCI resources while we wait.
        *
        * REVISIT:  Is this safe?  NO.  This is a bug and needs rethinking.
-       * We need to lock all of the port-resources (not EHCI common) until
+       * We need to lock all of the port-resources (not OHCI common) until
        * the transfer is complete.  But we can't use the common OHCI exclsem
        * or we will deadlock while waiting (because the working thread that
        * wakes this thread up needs the exclsem).
@@ -1972,7 +1972,7 @@ static void sam_ohci_bottomhalf(void *arg)
 {
   uint32_t pending = (uint32_t)arg;
 
-  /* We need to have exclusive access to the EHCI data structures.  Waiting here
+  /* We need to have exclusive access to the OHCI data structures.  Waiting here
    * is not a good thing to do on the worker thread, but there is no real option
    * (other than to reschedule and delay).
    */
@@ -2979,10 +2979,10 @@ static int sam_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
         }
 
       /* Release the OHCI semaphore while we wait.  Other threads need the
-       * opportunity to access the EHCI resources while we wait.
+       * opportunity to access the OHCI resources while we wait.
        *
        * REVISIT:  Is this safe?  NO.  This is a bug and needs rethinking.
-       * We need to lock all of the port-resources (not EHCI common) until
+       * We need to lock all of the port-resources (not OHCI common) until
        * the transfer is complete.  But we can't use the common OHCI exclsem
        * or we will deadlock while waiting (because the working thread that
        * wakes this thread up needs the exclsem).
diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c
index 47f7891f46..7d4d700cd9 100644
--- a/arch/arm/src/sama5/sam_udphs.c
+++ b/arch/arm/src/sama5/sam_udphs.c
@@ -664,7 +664,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
  * Name: sam_printreg
  *
  * Description:
- *   Print the contents of a SAMA5 EHCI register
+ *   Print the contents of a SAMA5 UDPHS register
  *
  *******************************************************************************/
 
@@ -680,7 +680,7 @@ static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
  *
  * Description:
  *   Check if it is time to output debug information for accesses to a SAMA5
- *   EHCI register
+ *   UDPHS register
  *
  *******************************************************************************/
 
@@ -4285,7 +4285,7 @@ static void sam_sw_setup(struct sam_usbdev_s *priv)
   int epno;
 
 #ifdef CONFIG_SAMA5_UDPHS_SCATTERGATHER
-#ifndef CONFIG_SAMA5_EHCI_PREALLOCATE
+#ifndef CONFIG_SAMA5_UDPHS_PREALLOCATE
   int i;
 
   /* Allocate a pool of free DMA transfer descriptors */
@@ -4318,7 +4318,7 @@ static void sam_sw_setup(struct sam_usbdev_s *priv)
       sam_td_free(&g_dtdpool[i]);
     }
 
-#endif /* CONFIG_SAMA5_EHCI_PREALLOCATE */
+#endif /* CONFIG_SAMA5_UDPHS_PREALLOCATE */
 #endif /* CONFIG_SAMA5_UDPHS_SCATTERGATHER */
 
   /* Initialize the device state structure.  NOTE: many fields
diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c
index 98a85d1fb3..e6c20e11ea 100644
--- a/arch/arm/src/samv7/sam_usbdevhs.c
+++ b/arch/arm/src/samv7/sam_usbdevhs.c
@@ -677,7 +677,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
  * Name: sam_printreg
  *
  * Description:
- *   Print the contents of a SAMV7 EHCI register
+ *   Print the contents of a SAMV7 USBHS register
  *
  *******************************************************************************/
 
@@ -693,7 +693,7 @@ static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
  *
  * Description:
  *   Check if it is time to output debug information for accesses to a SAMV7
- *   EHCI register
+ *   USBHS register
  *
  *******************************************************************************/
 
@@ -4445,7 +4445,7 @@ static void sam_sw_setup(struct sam_usbdev_s *priv)
   int epno;
 
 #ifdef CONFIG_SAMV7_USBDEVHS_SCATTERGATHER
-#ifndef CONFIG_SAMV7_EHCI_PREALLOCATE
+#ifndef CONFIG_SAMV7_USBDEVHS_PREALLOCATE
   int i;
 
   /* Allocate a pool of free DMA transfer descriptors */
@@ -4478,7 +4478,7 @@ static void sam_sw_setup(struct sam_usbdev_s *priv)
       sam_td_free(&g_dtdpool[i]);
     }
 
-#endif /* CONFIG_SAMV7_EHCI_PREALLOCATE */
+#endif /* CONFIG_SAMV7_USBDEVHS_PREALLOCATE */
 #endif /* CONFIG_SAMV7_USBDEVHS_SCATTERGATHER */
 
   /* Initialize the device state structure.  NOTE: many fields