diff --git a/arch/arm/src/armv7-a/Kconfig b/arch/arm/src/armv7-a/Kconfig
index d205b57a657..85ad10bbee0 100644
--- a/arch/arm/src/armv7-a/Kconfig
+++ b/arch/arm/src/armv7-a/Kconfig
@@ -5,7 +5,7 @@
 
 comment "ARMv7-A Configuration Options"
 
-config ARMV7A_HAVE_GIC
+config ARMV7A_HAVE_GICv2
 	bool
 	default n
 	---help---
diff --git a/arch/arm/src/armv7-a/arm_gic.c b/arch/arm/src/armv7-a/arm_gicv2.c
similarity index 99%
rename from arch/arm/src/armv7-a/arm_gic.c
rename to arch/arm/src/armv7-a/arm_gicv2.c
index eeb1ccd22fe..949f3f8600b 100644
--- a/arch/arm/src/armv7-a/arm_gic.c
+++ b/arch/arm/src/armv7-a/arm_gicv2.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv7-a/arm_gic.c
+ * arch/arm/src/armv7-a/arm_gicv2.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
 #include "up_internal.h"
 #include "gic.h"
 
-#ifdef CONFIG_ARMV7A_HAVE_GIC
+#ifdef CONFIG_ARMV7A_HAVE_GICv2
 
 /****************************************************************************
  * Public Functions
@@ -534,4 +534,4 @@ int arm_cpu_sgi(int sgi, unsigned int cpuset)
   return OK;
 }
 
-#endif /* CONFIG_ARMV7A_HAVE_GIC */
+#endif /* CONFIG_ARMV7A_HAVE_GICv2 */
diff --git a/arch/arm/src/armv7-a/gic.h b/arch/arm/src/armv7-a/gic.h
index 03dca452ca8..a833c324bcf 100644
--- a/arch/arm/src/armv7-a/gic.h
+++ b/arch/arm/src/armv7-a/gic.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  * arch/arm/src/armv7-a/gic.h
- * Generic Interrupt Controller Definitions
+ * Generic Interrupt Controller Version 2 Definitions
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
 #include <stdint.h>
 #include "mpcore.h"
 
-#ifdef CONFIG_ARMV7A_HAVE_GIC
+#ifdef CONFIG_ARMV7A_HAVE_GICv2
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -631,5 +631,5 @@ int arm_pause_handler(int irq, FAR void *context);
 #endif
 #endif /* __ASSEMBLY__ */
 
-#endif /* CONFIG_ARMV7A_HAVE_GIC */
+#endif /* CONFIG_ARMV7A_HAVE_GICv2 */
 #endif /* __ARCH_ARM_SRC_ARMV7_A_GIC_H */
diff --git a/arch/arm/src/imx6/Kconfig b/arch/arm/src/imx6/Kconfig
index 046d117bd43..91606c57784 100644
--- a/arch/arm/src/imx6/Kconfig
+++ b/arch/arm/src/imx6/Kconfig
@@ -20,21 +20,21 @@ config ARCH_CHIP_IMX6_6SOLO
 config ARCH_CHIP_IMX6_6DUALLITE
 	bool "i.MX 6DualLite"
 	select ARCH_HAVE_MULTICPU
-	select ARMV7A_HAVE_GIC
+	select ARMV7A_HAVE_GICv2
 	select ARMV7A_HAVE_GTM
 	select ARMV7A_HAVE_PTM
 
 config ARCH_CHIP_IMX6_6DUAL
 	bool "i.MX 6Dual"
 	select ARCH_HAVE_MULTICPU
-	select ARMV7A_HAVE_GIC
+	select ARMV7A_HAVE_GICv2
 	select ARMV7A_HAVE_GTM
 	select ARMV7A_HAVE_PTM
 
 config ARCH_CHIP_IMX6_6QUAD
 	bool "i.MX 6Quad"
 	select ARCH_HAVE_MULTICPU
-	select ARMV7A_HAVE_GIC
+	select ARMV7A_HAVE_GICv2
 	select ARMV7A_HAVE_GTM
 	select ARMV7A_HAVE_PTM
 
diff --git a/arch/arm/src/imx6/Make.defs b/arch/arm/src/imx6/Make.defs
index d1dde7eadbd..fb176d44a50 100644
--- a/arch/arm/src/imx6/Make.defs
+++ b/arch/arm/src/imx6/Make.defs
@@ -71,7 +71,7 @@ CMN_CSRCS += up_puts.c up_mdelay.c up_stackframe.c up_udelay.c
 CMN_CSRCS += up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c
 
 CMN_CSRCS += arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_dataabort.c
-CMN_CSRCS += arm_doirq.c arm_gic.c arm_initialstate.c arm_mmu.c
+CMN_CSRCS += arm_doirq.c arm_gicv2.c arm_initialstate.c arm_mmu.c
 CMN_CSRCS += arm_prefetchabort.c arm_releasepending.c arm_reprioritizertr.c
 CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_syscall.c
 CMN_CSRCS += arm_unblocktask.c arm_undefinedinsn.c