diff --git a/boards.txt b/boards.txt
index 3a6d427..e360faf 100644
--- a/boards.txt
+++ b/boards.txt
@@ -331,7 +331,7 @@ leonardoeth.build.f_cpu=16000000L
 leonardoeth.build.vid=0x2a03
 leonardoeth.build.pid=0x8040
 leonardoeth.build.usb_product="Arduino Leonardo ETH"
-leonardoeth.build.board=AVR_LEONARDO
+leonardoeth.build.board=AVR_LEONARDO_ETH
 leonardoeth.build.core=arduino
 leonardoeth.build.variant=leonardo
 leonardoeth.build.extra_flags={build.usb_flags}
@@ -940,7 +940,7 @@ yunmini.build.f_cpu=16000000L
 yunmini.build.vid=0x2a03
 yunmini.build.pid=0x8050
 yunmini.build.usb_product="Arduino Yún Mini"
-yunmini.build.board=AVR_YUN
+yunmini.build.board=AVR_YUNMINI
 yunmini.build.core=arduino
 yunmini.build.variant=yun
 yunmini.build.extra_flags={build.usb_flags}
@@ -977,7 +977,7 @@ chiwawa.build.f_cpu=16000000L
 chiwawa.build.vid=0x2a03
 chiwawa.build.pid=0x8056
 chiwawa.build.usb_product="Arduino Industrial 101"
-chiwawa.build.board=AVR_YUN
+chiwawa.build.board=AVR_INDUSTRIAL101
 chiwawa.build.core=arduino
 chiwawa.build.variant=yun
 chiwawa.build.extra_flags={build.usb_flags}
@@ -1014,7 +1014,7 @@ one.build.f_cpu=16000000L
 one.build.vid=0x2a03
 one.build.pid=0x8001
 one.build.usb_product="Linino One"
-one.build.board=AVR_YUN
+one.build.board=AVR_LININO_ONE
 one.build.core=arduino
 one.build.variant=yun
 one.build.extra_flags={build.usb_flags}