diff --git a/ports/stm32/boards/PYBLITEV10/board.json b/ports/stm32/boards/PYBLITEV10/board.json
index ce98ba7de7..38bb7fe1a0 100644
--- a/ports/stm32/boards/PYBLITEV10/board.json
+++ b/ports/stm32/boards/PYBLITEV10/board.json
@@ -15,10 +15,10 @@
     "thumbnail": "",
     "url": "https://store.micropython.org/product/PYBLITEv1.0",
     "variants": {
-        "dp": "Double-precision float",
-        "dp-thread": "Double precision float + Threads",
-        "network": "Wiznet 5200 Driver",
-        "thread": "Threading"
+        "DP": "Double-precision float",
+        "DP_THREAD": "Double precision float + Threads",
+        "NETWORK": "Wiznet 5200 Driver",
+        "THREAD": "Threading"
     },
     "vendor": "George Robotics"
 }
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
index afee27e94f..1fe609cbb5 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -6,20 +6,20 @@ TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
 
 # Provide different variants for the downloads page.
-ifeq ($(BOARD_VARIANT),dp)
+ifeq ($(BOARD_VARIANT),DP)
 MICROPY_FLOAT_IMPL=double
 endif
 
-ifeq ($(BOARD_VARIANT),thread)
+ifeq ($(BOARD_VARIANT),THREAD)
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),dp-thread)
+ifeq ($(BOARD_VARIANT),DP_THREAD)
 MICROPY_FLOAT_IMPL=double
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),network)
+ifeq ($(BOARD_VARIANT),NETWORK)
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
 
diff --git a/ports/stm32/boards/PYBV10/board.json b/ports/stm32/boards/PYBV10/board.json
index 2907b8fc45..5f8f906172 100644
--- a/ports/stm32/boards/PYBV10/board.json
+++ b/ports/stm32/boards/PYBV10/board.json
@@ -13,10 +13,10 @@
     "thumbnail": "",
     "url": "",
     "variants": {
-        "dp": "Double-precision float",
-        "dp-thread": "Double precision float + Threads",
-        "network": "Wiznet 5200 Driver",
-        "thread": "Threading"
+        "DP": "Double-precision float",
+        "DP_THREAD": "Double precision float + Threads",
+        "NETWORK": "Wiznet 5200 Driver",
+        "THREAD": "Threading"
     },
     "vendor": "George Robotics"
 }
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index d26ebd5ae9..1a4d676319 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -16,20 +16,20 @@ endif
 MICROPY_VFS_LFS2 = 1
 
 # Provide different variants for the downloads page.
-ifeq ($(BOARD_VARIANT),dp)
+ifeq ($(BOARD_VARIANT),DP)
 MICROPY_FLOAT_IMPL=double
 endif
 
-ifeq ($(BOARD_VARIANT),thread)
+ifeq ($(BOARD_VARIANT),THREAD)
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),dp-thread)
+ifeq ($(BOARD_VARIANT),DP_THREAD)
 MICROPY_FLOAT_IMPL=double
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),network)
+ifeq ($(BOARD_VARIANT),NETWORK)
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
 
diff --git a/ports/stm32/boards/PYBV11/board.json b/ports/stm32/boards/PYBV11/board.json
index fe59a7b16d..1fd04310fd 100644
--- a/ports/stm32/boards/PYBV11/board.json
+++ b/ports/stm32/boards/PYBV11/board.json
@@ -15,10 +15,10 @@
     "thumbnail": "",
     "url": "https://store.micropython.org/product/PYBv1.1",
     "variants": {
-        "dp": "Double-precision float",
-        "dp-thread": "Double precision float + Threads",
-        "network": "Wiznet 5200 Driver",
-        "thread": "Threading"
+        "DP": "Double-precision float",
+        "DP_THREAD": "Double precision float + Threads",
+        "NETWORK": "Wiznet 5200 Driver",
+        "THREAD": "Threading"
     },
     "vendor": "George Robotics"
 }
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index df2d70cda1..6dcb2fd1b4 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -16,20 +16,20 @@ endif
 MICROPY_VFS_LFS2 = 1
 
 # Provide different variants for the downloads page.
-ifeq ($(BOARD_VARIANT),dp)
+ifeq ($(BOARD_VARIANT),DP)
 MICROPY_FLOAT_IMPL=double
 endif
 
-ifeq ($(BOARD_VARIANT),thread)
+ifeq ($(BOARD_VARIANT),THREAD)
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),dp-thread)
+ifeq ($(BOARD_VARIANT),DP_THREAD)
 MICROPY_FLOAT_IMPL=double
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),network)
+ifeq ($(BOARD_VARIANT),NETWORK)
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif