diff --git a/configs/amber/README.txt b/configs/amber/README.txt
index d0f3940f610..0b8dddd1d2e 100644
--- a/configs/amber/README.txt
+++ b/configs/amber/README.txt
@@ -203,7 +203,7 @@ Buildroot:
   at ../buildroot/build_avr.  Edit the setenv.sh file if
   this is not the case.
 
-  After configuring NuttX, make sure that CONFIG_AVR_BUILDROOT=y is set in your
+  After configuring NuttX, make sure that CONFIG_AVR_BUILDROOT_TOOLCHAIN=y is set in your
   .config file.
 
 WinAVR:
@@ -214,7 +214,7 @@ WinAVR:
   It is assumed in some places that WinAVR is installed at C:/WinAVR.  Edit the
   setenv.sh file if this is not the case.
 
-  After configuring NuttX, make sure that CONFIG_AVR_WINAVR=y is set in your
+  After configuring NuttX, make sure that CONFIG_AVR_WINAVR_TOOLCHAIN=y is set in your
   .config file.
 
   WARNING:  There is an incompatible version of cygwin.dll in the WinAVR/bin
@@ -226,7 +226,7 @@ Linux:
   For Linux, there are widely available avr-gcc packages.  On Ubuntu, use:
   sudo apt-get install gcc-avr gdb-avr avr-libc
 
-  After configuring NuttX, make sure that CONFIG_AVR_LINUXGCC=y is set in your
+  After configuring NuttX, make sure that CONFIG_AVR_LINUXGCC_TOOLCHAIN=y is set in your
   .config file.
 
 Mac OS X:
@@ -522,7 +522,7 @@ Common Configuration Notes
 
         CONFIG_HOST_WINDOWS=y
         CONFIG_WINDOWS_CYGWIN=y
-        CONFIG_AVR_BUILDROOT=y
+        CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
 
 Configuration Sub-Directories
 -----------------------------
diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig
index 07a53417a67..6865de07420 100644
--- a/configs/amber/hello/defconfig
+++ b/configs/amber/hello/defconfig
@@ -79,8 +79,8 @@ CONFIG_ARCH_CHIP_ATMEGA=y
 #
 # AVR Configuration Options
 #
-# CONFIG_AVR_WINAVR is not set
-CONFIG_AVR_BUILDROOT=y
+# CONFIG_AVR_WINAVR_TOOLCHAIN is not set
+CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
 # CONFIG_AVR_USART1 is not set
 
 #
diff --git a/configs/arduino-mega2560/hello/defconfig b/configs/arduino-mega2560/hello/defconfig
index 2785bb85560..4dae1eb1e90 100644
--- a/configs/arduino-mega2560/hello/defconfig
+++ b/configs/arduino-mega2560/hello/defconfig
@@ -81,8 +81,8 @@ CONFIG_ARCH_FAMILY_AVR=y
 #
 # AVR Configuration Options
 #
-CONFIG_AVR_WINAVR=y
-# CONFIG_AVR_BUILDROOT is not set
+CONFIG_AVR_WINAVR_TOOLCHAIN=y
+# CONFIG_AVR_BUILDROOT_TOOLCHAIN is not set
 # CONFIG_AVR_USART1 is not set
 
 #
diff --git a/configs/arduino-mega2560/ostest/defconfig b/configs/arduino-mega2560/ostest/defconfig
index 0cbd193a210..1c340c5aeca 100644
--- a/configs/arduino-mega2560/ostest/defconfig
+++ b/configs/arduino-mega2560/ostest/defconfig
@@ -104,9 +104,9 @@ CONFIG_ARCH_FAMILY_AVR=y
 #
 # AVR Configuration Options
 #
-# CONFIG_AVR_WINAVR is not set
+# CONFIG_AVR_WINAVR_TOOLCHAIN is not set
 CONFIG_AVR_ATMEL_AVR_TOOLCHAIN=y
-# CONFIG_AVR_BUILDROOT is not set
+# CONFIG_AVR_BUILDROOT_TOOLCHAIN is not set
 
 #
 # Atmel AVR Toolchain options
diff --git a/configs/micropendous3/README.txt b/configs/micropendous3/README.txt
index 94789f924a2..72167fb3a60 100644
--- a/configs/micropendous3/README.txt
+++ b/configs/micropendous3/README.txt
@@ -216,7 +216,7 @@ Buildroot:
   at ../buildroot/build_avr.  Edit the setenv.sh file if
   this is not the case.
 
-  After configuring NuttX, make sure that CONFIG_AVR_BUILDROOT=y is set in your
+  After configuring NuttX, make sure that CONFIG_AVR_BUILDROOT_TOOLCHAIN=y is set in your
   .config file.
 
 WinAVR:
@@ -227,7 +227,7 @@ WinAVR:
   It is assumed in some places that WinAVR is installed at C:/WinAVR.  Edit the
   setenv.sh file if this is not the case.
 
-  After configuring NuttX, make sure that CONFIG_AVR_WINAVR=y is set in your
+  After configuring NuttX, make sure that CONFIG_AVR_WINAVR_TOOLCHAIN=y is set in your
   .config file.
 
   WARNING:  There is an incompatible version of cygwin.dll in the WinAVR/bin
@@ -239,7 +239,7 @@ Linux:
   For Linux, there are widely available avr-gcc packages.  On Ubuntu, use:
   sudo apt-get install gcc-avr gdb-avr avr-libc
 
-  After configuring NuttX, make sure that CONFIG_AVR_LINUXGCC=y is set in your
+  After configuring NuttX, make sure that CONFIG_AVR_LINUXGCC_TOOLCHAIN=y is set in your
   .config file.
 
 Mac OS X:
@@ -542,7 +542,7 @@ Common Configuration Notes
 
         CONFIG_HOST_WINDOWS=y
         CONFIG_WINDOWS_CYGWIN=y
-        CONFIG_AVR_BUILDROOT=y
+        CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
 
 Configuration Sub-Directories
 -----------------------------
diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig
index bf5f3e5ee1b..2ea542c41d7 100644
--- a/configs/micropendous3/hello/defconfig
+++ b/configs/micropendous3/hello/defconfig
@@ -79,8 +79,8 @@ CONFIG_ARCH_CHIP_AT90USB=y
 #
 # AVR Configuration Options
 #
-# CONFIG_AVR_WINAVR is not set
-CONFIG_AVR_BUILDROOT=y
+# CONFIG_AVR_WINAVR_TOOLCHAIN is not set
+CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
 
 #
 # AT90USB Configuration Options
diff --git a/configs/moteino-mega/hello/defconfig b/configs/moteino-mega/hello/defconfig
index 9eff39abb7e..92f08cc16e7 100644
--- a/configs/moteino-mega/hello/defconfig
+++ b/configs/moteino-mega/hello/defconfig
@@ -74,7 +74,7 @@ CONFIG_ARCH_FAMILY_AVR=y
 #
 # AVR Configuration Options
 #
-CONFIG_AVR_CROSSPACK=y
+CONFIG_AVR_CROSSPACK_TOOLCHAIN=y
 # CONFIG_AVR_USART1 is not set
 
 #
diff --git a/configs/moteino-mega/nsh/defconfig b/configs/moteino-mega/nsh/defconfig
index 7eca17be7da..79645d1f5a9 100644
--- a/configs/moteino-mega/nsh/defconfig
+++ b/configs/moteino-mega/nsh/defconfig
@@ -74,7 +74,7 @@ CONFIG_ARCH_FAMILY_AVR=y
 #
 # AVR Configuration Options
 #
-CONFIG_AVR_CROSSPACK=y
+CONFIG_AVR_CROSSPACK_TOOLCHAIN=y
 # CONFIG_AVR_USART1 is not set
 
 #
diff --git a/configs/teensy-2.0/README.txt b/configs/teensy-2.0/README.txt
index 9ea42f290d4..049a3c653a5 100644
--- a/configs/teensy-2.0/README.txt
+++ b/configs/teensy-2.0/README.txt
@@ -220,7 +220,7 @@ Buildroot:
   at ../buildroot/build_avr.  Edit the setenv.sh file if
   this is not the case.
 
-  After configuring NuttX, make sure that CONFIG_AVR_BUILDROOT=y is set in your
+  After configuring NuttX, make sure that CONFIG_AVR_BUILDROOT_TOOLCHAIN=y is set in your
   .config file.
 
 WinAVR:
@@ -231,7 +231,7 @@ WinAVR:
   It is assumed in some places that WinAVR is installed at C:/WinAVR.  Edit the
   setenv.sh file if this is not the case.
 
-  After configuring NuttX, make sure that CONFIG_AVR_WINAVR=y is set in your
+  After configuring NuttX, make sure that CONFIG_AVR_WINAVR_TOOLCHAIN=y is set in your
   .config file.
 
   WARNING:  There is an incompatible version of cygwin.dll in the WinAVR/bin
@@ -249,7 +249,7 @@ Linux:
   For Linux, there are widely available avr-gcc packages.  On Ubuntu, use:
   sudo apt-get install gcc-avr gdb-avr avr-libc
 
-  After configuring NuttX, make sure that CONFIG_AVR_LINUXGCC=y is set in your
+  After configuring NuttX, make sure that CONFIG_AVR_LINUXGCC_TOOLCHAIN=y is set in your
   .config file.
 
 Mac OS X:
@@ -579,7 +579,7 @@ Common Configuration Notes
 
         CONFIG_HOST_WINDOWS=y
         CONFIG_WINDOWS_CYGWIN=y
-        CONFIG_AVR_BUILDROOT=y
+        CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
 
 Configuration Sub-Directories
 -----------------------------
diff --git a/configs/teensy-2.0/hello/defconfig b/configs/teensy-2.0/hello/defconfig
index f44193c08fa..64751ba42e2 100644
--- a/configs/teensy-2.0/hello/defconfig
+++ b/configs/teensy-2.0/hello/defconfig
@@ -80,9 +80,9 @@ CONFIG_ARCH_FAMILY_AVR=y
 #
 # AVR Configuration Options
 #
-# CONFIG_AVR_WINAVR is not set
+# CONFIG_AVR_WINAVR_TOOLCHAIN is not set
 # CONFIG_AVR_ATMEL_AVR_TOOLCHAIN is not set
-CONFIG_AVR_BUILDROOT=y
+CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
 
 #
 # AT90USB Configuration Options
diff --git a/configs/teensy-2.0/nsh/defconfig b/configs/teensy-2.0/nsh/defconfig
index 1daa2528c3e..035fde618a6 100644
--- a/configs/teensy-2.0/nsh/defconfig
+++ b/configs/teensy-2.0/nsh/defconfig
@@ -80,9 +80,9 @@ CONFIG_ARCH_FAMILY_AVR=y
 #
 # AVR Configuration Options
 #
-# CONFIG_AVR_WINAVR is not set
+# CONFIG_AVR_WINAVR_TOOLCHAIN is not set
 # CONFIG_AVR_ATMEL_AVR_TOOLCHAIN is not set
-CONFIG_AVR_BUILDROOT=y
+CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
 
 #
 # AT90USB Configuration Options
diff --git a/configs/teensy-2.0/usbmsc/defconfig b/configs/teensy-2.0/usbmsc/defconfig
index 84f44727419..8672582f3c9 100644
--- a/configs/teensy-2.0/usbmsc/defconfig
+++ b/configs/teensy-2.0/usbmsc/defconfig
@@ -80,9 +80,9 @@ CONFIG_ARCH_FAMILY_AVR=y
 #
 # AVR Configuration Options
 #
-# CONFIG_AVR_WINAVR is not set
+# CONFIG_AVR_WINAVR_TOOLCHAIN is not set
 # CONFIG_AVR_ATMEL_AVR_TOOLCHAIN is not set
-CONFIG_AVR_BUILDROOT=y
+CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
 
 #
 # AT90USB Configuration Options