diff --git a/boards.txt b/boards.txt
index 8c9fa060a3..bede5c3718 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1126,7 +1126,7 @@ gen4iod.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 huzzah.name=Adafruit Feather HUZZAH ESP8266
-huzzah.build.board=ESP8266_ESP12
+huzzah.build.board=ESP8266_ADAFRUIT_HUZZAH
 huzzah.build.variant=adafruit
 huzzah.upload.tool=esptool
 huzzah.upload.maximum_data_size=81920
@@ -2695,7 +2695,7 @@ espectro.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 espino.name=ESPino (ESP-12 Module)
-espino.build.board=ESP8266_ESP12
+espino.build.board=ESP8266_ESPINO_ESP12
 espino.build.variant=espino
 espino.upload.tool=esptool
 espino.upload.maximum_data_size=81920
@@ -4568,7 +4568,7 @@ d1.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
-nodemcu.build.board=ESP8266_NODEMCU
+nodemcu.build.board=ESP8266_NODEMCU_ESP12
 nodemcu.build.variant=nodemcu
 nodemcu.upload.tool=esptool
 nodemcu.upload.maximum_data_size=81920
@@ -4767,7 +4767,7 @@ nodemcu.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
-nodemcuv2.build.board=ESP8266_NODEMCU
+nodemcuv2.build.board=ESP8266_NODEMCU_ESP12E
 nodemcuv2.build.variant=nodemcu
 nodemcuv2.upload.tool=esptool
 nodemcuv2.upload.maximum_data_size=81920
@@ -6787,7 +6787,7 @@ esp210.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 espinotee.name=ThaiEasyElec's ESPino
-espinotee.build.board=ESP8266_ESP13
+espinotee.build.board=ESP8266_ESPINO_ESP13
 espinotee.build.variant=espinotee
 espinotee.upload.tool=esptool
 espinotee.upload.maximum_data_size=81920
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index 3879c9bb2c..1e87dc7faa 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -320,7 +320,7 @@
     ( 'huzzah', {
         'name': 'Adafruit Feather HUZZAH ESP8266',
         'opts': {
-            '.build.board': 'ESP8266_ESP12',
+            '.build.board': 'ESP8266_ADAFRUIT_HUZZAH',
             '.build.variant': 'adafruit',
             },
         'macro': [
@@ -428,7 +428,7 @@
     ( 'nodemcu', {
         'name': 'NodeMCU 0.9 (ESP-12 Module)',
         'opts': {
-            '.build.board': 'ESP8266_NODEMCU',
+            '.build.board': 'ESP8266_NODEMCU_ESP12',
             '.build.variant': 'nodemcu',
             },
         'macro': [
@@ -462,7 +462,7 @@
     ( 'nodemcuv2', {
         'name': 'NodeMCU 1.0 (ESP-12E Module)',
         'opts': {
-            '.build.board': 'ESP8266_NODEMCU',
+            '.build.board': 'ESP8266_NODEMCU_ESP12E',
             '.build.variant': 'nodemcu',
             },
         'macro': [
@@ -652,7 +652,7 @@
     ( 'espino', {
         'name': 'ESPino (ESP-12 Module)',
         'opts': {
-            '.build.board': 'ESP8266_ESP12',
+            '.build.board': 'ESP8266_ESPINO_ESP12',
             '.build.variant': 'espino',
             },
         'macro': [
@@ -671,7 +671,7 @@
     ( 'espinotee', {
         'name': 'ThaiEasyElec\'s ESPino',
         'opts': {
-            '.build.board': 'ESP8266_ESP13',
+            '.build.board': 'ESP8266_ESPINO_ESP13',
             '.build.variant': 'espinotee',
             },
         'macro': [