diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c
index df52464c227..540e29e73cf 100644
--- a/drivers/i2c/i2c_esp32.c
+++ b/drivers/i2c/i2c_esp32.c
@@ -120,8 +120,8 @@ static int i2c_esp32_configure_pins(int pin, int matrix_out, int matrix_in)
 		return ret;
 	}
 
-	esp32_rom_gpio_matrix_out(pin, matrix_out, false, false);
-	esp32_rom_gpio_matrix_in(pin, matrix_in, false);
+	esp_rom_gpio_matrix_out(pin, matrix_out, false, false);
+	esp_rom_gpio_matrix_in(pin, matrix_in, false);
 
 	return 0;
 }
diff --git a/drivers/pwm/pwm_led_esp32.c b/drivers/pwm/pwm_led_esp32.c
index f97b23e975a..2f2e7885abc 100644
--- a/drivers/pwm/pwm_led_esp32.c
+++ b/drivers/pwm/pwm_led_esp32.c
@@ -245,7 +245,7 @@ static int pwm_led_esp32_channel_set(int pin, bool speed_mode, int channel,
 	} else {
 		sig_out_idx = LEDC_LS_SIG_OUT0_IDX + channel;
 	}
-	esp32_rom_gpio_matrix_out(pin, sig_out_idx, 0, 0);
+	esp_rom_gpio_matrix_out(pin, sig_out_idx, 0, 0);
 
 	return 0;
 }
diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c
index 4d577370f1c..f98aecefed4 100644
--- a/drivers/serial/uart_esp32.c
+++ b/drivers/serial/uart_esp32.c
@@ -221,24 +221,24 @@ static int uart_esp32_configure_pins(const struct device *dev)
 {
 	const struct uart_esp32_config *const cfg = DEV_CFG(dev);
 
-	esp32_rom_gpio_matrix_out(cfg->pins.tx,
+	esp_rom_gpio_matrix_out(cfg->pins.tx,
 				  cfg->signals.tx_out,
 				  false,
 				  false);
 
-	esp32_rom_gpio_matrix_in(cfg->pins.rx,
+	esp_rom_gpio_matrix_in(cfg->pins.rx,
 				 cfg->signals.rx_in,
 				 false);
 
 	if (cfg->pins.cts) {
-		esp32_rom_gpio_matrix_out(cfg->pins.cts,
+		esp_rom_gpio_matrix_out(cfg->pins.cts,
 					  cfg->signals.cts_in,
 					  false,
 					  false);
 	}
 
 	if (cfg->pins.rts) {
-		esp32_rom_gpio_matrix_in(cfg->pins.rts,
+		esp_rom_gpio_matrix_in(cfg->pins.rts,
 					 cfg->signals.rts_out,
 					 false);
 	}
diff --git a/drivers/spi/spi_esp32_spim.c b/drivers/spi/spi_esp32_spim.c
index f283d7d9424..dd6bd30a3cb 100644
--- a/drivers/spi/spi_esp32_spim.c
+++ b/drivers/spi/spi_esp32_spim.c
@@ -149,9 +149,9 @@ static int spi_esp32_configure_pin(gpio_pin_t pin, int pin_sig,
 	}
 
 	if (pin_mode == GPIO_INPUT) {
-		esp32_rom_gpio_matrix_in(pin, pin_sig, false);
+		esp_rom_gpio_matrix_in(pin, pin_sig, false);
 	} else {
-		esp32_rom_gpio_matrix_out(pin, pin_sig, false, false);
+		esp_rom_gpio_matrix_out(pin, pin_sig, false, false);
 	}
 
 	return 0;
diff --git a/soc/xtensa/esp32/soc.h b/soc/xtensa/esp32/soc.h
index 9e988d98ada..2ec36497f6b 100644
--- a/soc/xtensa/esp32/soc.h
+++ b/soc/xtensa/esp32/soc.h
@@ -31,9 +31,9 @@ static inline void esp32_clear_mask32(uint32_t v, uint32_t mem_addr)
 
 extern void esp32_rom_intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num);
 
-extern int esp32_rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_index,
+extern int esp_rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_index,
 				    bool inverted);
-extern int esp32_rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_index,
+extern int esp_rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_index,
 				     bool out_inverted,
 				     bool out_enabled_inverted);