diff --git a/ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld b/ports/nrf/boards/adafruit_nrf52840_s140_v6.ld
similarity index 100%
rename from ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld
rename to ports/nrf/boards/adafruit_nrf52840_s140_v6.ld
diff --git a/ports/nrf/boards/feather52840/mpconfigboard.mk b/ports/nrf/boards/feather52840/mpconfigboard.mk
index 3af9ff71b7..1edc09a607 100644
--- a/ports/nrf/boards/feather52840/mpconfigboard.mk
+++ b/ports/nrf/boards/feather52840/mpconfigboard.mk
@@ -9,7 +9,7 @@ BOOT_SETTING_ADDR = 0xFF000
 ifeq ($(SD),)
 	LD_FILE = boards/nrf52840_1M_256k.ld
 else
-	LD_FILE = boards/bluefruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_$(SOFTDEV_VERSION).ld
+	LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
 endif
 
 NRF_DEFINES += -DNRF52840_XXAA
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/pca10056/mpconfigboard.mk
index 3af9ff71b7..1edc09a607 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10056/mpconfigboard.mk
@@ -9,7 +9,7 @@ BOOT_SETTING_ADDR = 0xFF000
 ifeq ($(SD),)
 	LD_FILE = boards/nrf52840_1M_256k.ld
 else
-	LD_FILE = boards/bluefruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_$(SOFTDEV_VERSION).ld
+	LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
 endif
 
 NRF_DEFINES += -DNRF52840_XXAA