diff --git a/CODEOWNERS b/CODEOWNERS
index 97fdd4792f5..069e56af660 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -437,7 +437,7 @@
 /drivers/timer/*hpet*                     @dcpleung
 /drivers/usb/                             @jfischer-no
 /drivers/usb/device/usb_dc_stm32.c        @ydamigos @loicpoulain
-/drivers/usbc/                            @sambhurst
+/drivers/usb_c/                           @sambhurst
 /drivers/video/                           @loicpoulain
 /drivers/i2c/*b91*                        @andy-liu-telink
 /drivers/i2c/i2c_ll_stm32*                @ydamigos
diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
index 901f6fc9668..16b73d07f75 100644
--- a/drivers/CMakeLists.txt
+++ b/drivers/CMakeLists.txt
@@ -7,7 +7,7 @@ add_subdirectory(misc)
 add_subdirectory(pcie)
 add_subdirectory(disk)
 add_subdirectory(usb)
-add_subdirectory(usbc)
+add_subdirectory(usb_c)
 
 add_subdirectory_ifdef(CONFIG_ADC adc)
 add_subdirectory_ifdef(CONFIG_CLOCK_CONTROL clock_control)
diff --git a/drivers/Kconfig b/drivers/Kconfig
index adac8c02a31..992ff33d9b2 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -139,7 +139,7 @@ source "drivers/mm/Kconfig"
 
 source "drivers/power_domain/Kconfig"
 
-source "drivers/usbc/Kconfig"
+source "drivers/usb_c/Kconfig"
 
 source "drivers/reset/Kconfig"
 
diff --git a/drivers/usbc/CMakeLists.txt b/drivers/usb_c/CMakeLists.txt
similarity index 100%
rename from drivers/usbc/CMakeLists.txt
rename to drivers/usb_c/CMakeLists.txt
diff --git a/drivers/usbc/Kconfig b/drivers/usb_c/Kconfig
similarity index 75%
rename from drivers/usbc/Kconfig
rename to drivers/usb_c/Kconfig
index 88a1b1b2fc4..cef6296b9d3 100644
--- a/drivers/usbc/Kconfig
+++ b/drivers/usb_c/Kconfig
@@ -3,4 +3,4 @@
 # Copyright 2022 The Chromium OS Authors
 # SPDX-License-Identifier: Apache-2.0
 
-source "drivers/usbc/tcpc/Kconfig"
+source "drivers/usb_c/tcpc/Kconfig"
diff --git a/drivers/usbc/tcpc/CMakeLists.txt b/drivers/usb_c/tcpc/CMakeLists.txt
similarity index 100%
rename from drivers/usbc/tcpc/CMakeLists.txt
rename to drivers/usb_c/tcpc/CMakeLists.txt
diff --git a/drivers/usbc/tcpc/Kconfig b/drivers/usb_c/tcpc/Kconfig
similarity index 75%
rename from drivers/usbc/tcpc/Kconfig
rename to drivers/usb_c/tcpc/Kconfig
index 241149bf64d..1e30c3cef1e 100644
--- a/drivers/usbc/tcpc/Kconfig
+++ b/drivers/usb_c/tcpc/Kconfig
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig USBC_TCPC_DRIVER
-	bool "USBC TCPC drivers"
+	bool "USB-C TCPC drivers"
 	help
-	  Enable USBC TypeC Port Controller (TCPC) drivers
+	  Enable USB TypeC Port Controller (TCPC) drivers
 
 if USBC_TCPC_DRIVER
 
@@ -14,12 +14,12 @@ config USBC_INIT_PRIORITY
 	int "USBC driver init priority"
 	default 80
 	help
-	  USBC device driver initialization priority.
+	  USB-C device driver initialization priority.
 	  Do not mess with it unless you know what you are doing.
 	  Note that the priority needs to be lower than the USBC stack
 	  so that it can start before the USBC sub-system.
 
-source "drivers/usbc/tcpc/Kconfig.tcpc_stm32"
+source "drivers/usb_c/tcpc/Kconfig.tcpc_stm32"
 
 module = USBC
 module-str = usbc
diff --git a/drivers/usbc/tcpc/Kconfig.tcpc_stm32 b/drivers/usb_c/tcpc/Kconfig.tcpc_stm32
similarity index 100%
rename from drivers/usbc/tcpc/Kconfig.tcpc_stm32
rename to drivers/usb_c/tcpc/Kconfig.tcpc_stm32
diff --git a/drivers/usbc/tcpc/ucpd_stm32.c b/drivers/usb_c/tcpc/ucpd_stm32.c
similarity index 100%
rename from drivers/usbc/tcpc/ucpd_stm32.c
rename to drivers/usb_c/tcpc/ucpd_stm32.c
diff --git a/drivers/usbc/tcpc/ucpd_stm32_priv.h b/drivers/usb_c/tcpc/ucpd_stm32_priv.h
similarity index 99%
rename from drivers/usbc/tcpc/ucpd_stm32_priv.h
rename to drivers/usb_c/tcpc/ucpd_stm32_priv.h
index abca1d2ae15..58f70b6faaf 100644
--- a/drivers/usbc/tcpc/ucpd_stm32_priv.h
+++ b/drivers/usb_c/tcpc/ucpd_stm32_priv.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_USBC_DEVICE_UCPD_STM32_PRIV_H_
 
 #include <zephyr/sys/util.h>
-#include <zephyr/drivers/usbc/usbc_tcpc.h>
+#include <zephyr/drivers/usb_c/usbc_tcpc.h>
 #include <stm32_ll_ucpd.h>
 
 /**
diff --git a/include/zephyr/drivers/usbc/usbc_pd.h b/include/zephyr/drivers/usb_c/usbc_pd.h
similarity index 99%
rename from include/zephyr/drivers/usbc/usbc_pd.h
rename to include/zephyr/drivers/usb_c/usbc_pd.h
index f9900dd330c..17f194b0455 100644
--- a/include/zephyr/drivers/usbc/usbc_pd.h
+++ b/include/zephyr/drivers/usb_c/usbc_pd.h
@@ -5,7 +5,7 @@
 
 /**
  * @file
- * @brief USBC Power Delivery API used for USBC drivers
+ * @brief USB-C Power Delivery API used for USB-C drivers
  *
  * The information in this file was taken from the USB PD
  * Specification Revision 3.0, Version 2.0
diff --git a/include/zephyr/drivers/usbc/usbc_tc.h b/include/zephyr/drivers/usb_c/usbc_tc.h
similarity index 99%
rename from include/zephyr/drivers/usbc/usbc_tc.h
rename to include/zephyr/drivers/usb_c/usbc_tc.h
index de56da61b44..b8a54746214 100644
--- a/include/zephyr/drivers/usbc/usbc_tc.h
+++ b/include/zephyr/drivers/usb_c/usbc_tc.h
@@ -5,7 +5,7 @@
 
 /**
  * @file
- * @brief USBC Type-C Cable and Connector API used for USBC drivers
+ * @brief USB Type-C Cable and Connector API used for USB-C drivers
  *
  * The information in this file was taken from the USB Type-C
  * Cable and Connector Specification Release 2.1
diff --git a/include/zephyr/drivers/usbc/usbc_tcpc.h b/include/zephyr/drivers/usb_c/usbc_tcpc.h
similarity index 100%
rename from include/zephyr/drivers/usbc/usbc_tcpc.h
rename to include/zephyr/drivers/usb_c/usbc_tcpc.h