diff --git a/arch/avr/include/irq.h b/arch/avr/include/irq.h
index de9981cd50..ac3b4b6cac 100644
--- a/arch/avr/include/irq.h
+++ b/arch/avr/include/irq.h
@@ -56,7 +56,7 @@
  * save structure and irqsave()/irqrestore() macros
  */
 
-#ifdef CONFIG_ARCH_AVR32
+#ifdef CONFIG_ARCH_FAMILY_AVR32
 # include <arch/avr32/irq.h>
 #else
 # include <arch/avr/irq.h>
diff --git a/arch/avr/include/limits.h b/arch/avr/include/limits.h
index 2089bf9379..8c3f7f7607 100644
--- a/arch/avr/include/limits.h
+++ b/arch/avr/include/limits.h
@@ -46,7 +46,7 @@
 
 /* Include AVR architecture-specific limits */
 
-#ifdef CONFIG_ARCH_AVR32
+#ifdef CONFIG_ARCH_FAMILY_AVR32
 # include <arch/avr32/limits.h>
 #else
 # include <arch/avr/limits.h>
diff --git a/arch/avr/include/syscall.h b/arch/avr/include/syscall.h
index aa6c501d1f..104ca83272 100644
--- a/arch/avr/include/syscall.h
+++ b/arch/avr/include/syscall.h
@@ -46,7 +46,7 @@
 
 /* Include AVR architecture-specific syscall macros */
 
-#ifdef CONFIG_ARCH_AVR32
+#ifdef CONFIG_ARCH_FAMILY_AVR32
 # include <arch/avr32/syscall.h>
 #else
 # include <arch/avr/syscall.h>
diff --git a/arch/avr/include/types.h b/arch/avr/include/types.h
index 8089c96c13..bd7af18cf6 100644
--- a/arch/avr/include/types.h
+++ b/arch/avr/include/types.h
@@ -46,7 +46,7 @@
 
 /* Include AVR architecture-specific types definitions */
 
-#ifdef CONFIG_ARCH_AVR32
+#ifdef CONFIG_ARCH_FAMILY_AVR32
 # include <arch/avr32/types.h>
 #else
 # include <arch/avr/types.h>
diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index c3d2f9816e..2220bbfde2 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -36,9 +36,9 @@
 -include $(TOPDIR)/Make.defs
 -include chip/Make.defs
 
-ifeq ($(CONFIG_ARCH_AVR32),y)
+ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
 ARCH_SUBDIR = avr32
-else ifeq ($(CONFIG_ARCH_AVR),y)
+else ifeq ($(CONFIG_ARCH_FAMILY_AVR),y)
 ARCH_SUBDIR = avr
 endif
 
diff --git a/arch/avr/src/common/up_internal.h b/arch/avr/src/common/up_internal.h
index 9f1172e62b..77d75afeb8 100644
--- a/arch/avr/src/common/up_internal.h
+++ b/arch/avr/src/common/up_internal.h
@@ -46,7 +46,7 @@
 #  include <stdint.h>
 #endif
 
-#ifdef CONFIG_ARCH_AVR32
+#ifdef CONFIG_ARCH_FAMILY_AVR32
 # include "avr32_internal.h"
 #else
 # include "avr_internal.h"