diff --git a/arch/risc-v/src/gap8/chip.h b/arch/risc-v/src/gap8/gap.h
similarity index 99%
rename from arch/risc-v/src/gap8/chip.h
rename to arch/risc-v/src/gap8/gap.h
index 774dbb2038d..e6cc5aee1a7 100644
--- a/arch/risc-v/src/gap8/chip.h
+++ b/arch/risc-v/src/gap8/gap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/risc-v/src/gap8/chip.h
+ * arch/risc-v/src/gap8/gap8.h
  * Peripheral registers on GAP8
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_RISC_V_SRC_GAP8_CHIP_H
-#define __ARCH_RISC_V_SRC_GAP8_CHIP_H
+#ifndef __ARCH_RISC_V_SRC_GAP8_GAP8_H
+#define __ARCH_RISC_V_SRC_GAP8_GAP8_H
 
 /************************************************************************************
  * Included Files
@@ -2025,4 +2025,4 @@ typedef struct
 
 #endif
 
-#endif  /* __ARCH_RISC_V_SRC_GAP8_CHIP_H */
+#endif  /* __ARCH_RISC_V_SRC_GAP8_GAP8_H */
diff --git a/arch/risc-v/src/gap8/gap8_fll.h b/arch/risc-v/src/gap8/gap8_fll.h
index 14b573d832c..ab9ac1922f2 100644
--- a/arch/risc-v/src/gap8/gap8_fll.h
+++ b/arch/risc-v/src/gap8/gap8_fll.h
@@ -46,7 +46,7 @@
  * Included Files
  ************************************************************************************/
 
-#include "chip.h"
+#include "gap8.h"
 
 /************************************************************************************
  * Public Function Prototypes
diff --git a/arch/risc-v/src/gap8/gap8_gpio.h b/arch/risc-v/src/gap8/gap8_gpio.h
index e99b9d7aed5..bca8d3022c9 100644
--- a/arch/risc-v/src/gap8/gap8_gpio.h
+++ b/arch/risc-v/src/gap8/gap8_gpio.h
@@ -50,7 +50,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "chip.h"
+#include "gap8.h"
 
 /************************************************************************************
  * Pre-Processor Definitions
diff --git a/arch/risc-v/src/gap8/gap8_tim.h b/arch/risc-v/src/gap8/gap8_tim.h
index 8f7f299bce2..a32c77acb00 100644
--- a/arch/risc-v/src/gap8/gap8_tim.h
+++ b/arch/risc-v/src/gap8/gap8_tim.h
@@ -47,7 +47,7 @@
  * Included Files
  ************************************************************************************/
 
-#include "chip.h"
+#include "gap8.h"
 
 /************************************************************************************
  * Public Function Prototypes
diff --git a/arch/risc-v/src/gap8/gap8_uart.h b/arch/risc-v/src/gap8/gap8_uart.h
index 5d829577601..108c6997cfa 100644
--- a/arch/risc-v/src/gap8/gap8_uart.h
+++ b/arch/risc-v/src/gap8/gap8_uart.h
@@ -45,7 +45,7 @@
  * Included Files
  ************************************************************************************/
 
-#include "chip.h"
+#include "gap8.h"
 #include "gap8_udma.h"
 #include "gap8_gpio.h"
 
diff --git a/arch/risc-v/src/gap8/gap8_udma.h b/arch/risc-v/src/gap8/gap8_udma.h
index 3e2dc273e9e..362d3ce1c37 100644
--- a/arch/risc-v/src/gap8/gap8_udma.h
+++ b/arch/risc-v/src/gap8/gap8_udma.h
@@ -53,7 +53,7 @@
 
 #include <stdbool.h>
 
-#include "chip.h"
+#include "gap8.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/configs/gapuino/src/gapuino_sysinit.c b/configs/gapuino/src/gapuino_sysinit.c
index 31f6dcd6cd0..e98c5e96f18 100644
--- a/configs/gapuino/src/gapuino_sysinit.c
+++ b/configs/gapuino/src/gapuino_sysinit.c
@@ -9,7 +9,7 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include "chip.h"
+#include "gap8.h"
 #include "gap8_fll.h"
 
 /****************************************************************************