diff --git a/arch/risc-v/src/esp32c3/esp32c3_config.h b/arch/risc-v/src/esp32c3/esp32c3_config.h
index a44c510af07..04c792fcbb7 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_config.h
+++ b/arch/risc-v/src/esp32c3/esp32c3_config.h
@@ -60,4 +60,4 @@
 #  undef CONFIG_UART1_SERIAL_CONSOLE
 #endif
 
-#endif /* __ARCH_XTENSA_SRC_ESP32C3_ESP32C3_CONFIG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_CONFIG_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_gpio.h b/arch/risc-v/src/esp32c3/esp32c3_gpio.h
index 91632ec1039..2665e938ec4 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_gpio.h
+++ b/arch/risc-v/src/esp32c3/esp32c3_gpio.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32/esp32c3_gpio.h
+ * arch/risc-v/src/esp32c3/esp32c3_gpio.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/arch/risc-v/src/esp32c3/esp32c3_serial.c b/arch/risc-v/src/esp32c3/esp32c3_serial.c
index 9f5ae7219e8..540f3121828 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_serial.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_serial.c
@@ -352,7 +352,7 @@ static int esp32c3_attach(struct uart_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: esp32_detach
+ * Name: esp32c3_detach
  *
  * Description:
  *   Detach UART interrupts.  This method is called when the serial port is
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
index 5a7f705a7ec..d05c9dafc61 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_GPIO_H
-#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_GPIO_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_H
 
 /****************************************************************************
  * Included Files
@@ -5311,4 +5311,4 @@
 #define GPIO_DATE_V  0xfffffff
 #define GPIO_DATE_S  0
 
-#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_GPIO_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio_sigmap.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio_sigmap.h
index 56a3beb2842..17dc40e8de9 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio_sigmap.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio_sigmap.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32_HARDWARE_ESP32_GPIO_SIGMAP_H
-#define __ARCH_RISCV_SRC_ESP32_HARDWARE_ESP32_GPIO_SIGMAP_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_SIGMAP_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_SIGMAP_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -193,4 +193,4 @@
 #define SIG_GPIO_OUT_IDX              128
 #define GPIO_MAP_DATE_IDX             0x2006130
 
-#endif  /* __ARCH_RISCV_SRC_ESP32_HARDWARE_ESP32_GPIO_SIGMAP_H */
+#endif  /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_SIGMAP_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_iomux.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_iomux.h
index 8682afbb7b3..bfaf1ff5f2d 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_iomux.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_iomux.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32_HARDWARE_ESP32_IOMUX_H
-#define __ARCH_RISCV_SRC_ESP32_HARDWARE_ESP32_IOMUX_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_IOMUX_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_IOMUX_H
 
 /****************************************************************************
  * Included Files
@@ -307,4 +307,4 @@
 #define IO_MUX_DATE_S 0
 #define IO_MUX_DATE_VERSION 0x2006050
 
-#endif
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_IOMUX_H */