diff --git a/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c b/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c
index 6fb0787..104bb45 100644
--- a/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c
+++ b/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c
@@ -994,8 +994,8 @@ static void services_init(void)
     ble_dis_init_t dis_init;
     memset(&dis_init, 0, sizeof(dis_init));
 
-    ascii_to_utf8(&dis_init.manufact_name_str, DIS_MANUFACTURER);
-    ascii_to_utf8(&dis_init.model_num_str, DIS_MODEL);
+    ascii_to_utf8(&dis_init.manufact_name_str, BLEDIS_MANUFACTURER);
+    ascii_to_utf8(&dis_init.model_num_str, BLEDIS_MODEL);
 
     uint32_t const sd_id      = SD_ID_GET(MBR_SIZE);
     uint32_t const sd_version = SD_VERSION_GET(MBR_SIZE);
diff --git a/src/boards/electronut_labs_papyr/board.h b/src/boards/electronut_labs_papyr/board.h
index 2f9289a..bc398ea 100644
--- a/src/boards/electronut_labs_papyr/board.h
+++ b/src/boards/electronut_labs_papyr/board.h
@@ -57,10 +57,10 @@
 #define HWFC                false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER    "Electronut Labs"
-#define DIS_MODEL           "Papyr"
+#define BLEDIS_MANUFACTURER    "Electronut Labs"
+#define BLEDIS_MODEL           "Papyr"
 
-#define UF2_PRODUCT_NAME    "Electronut Labs  Papyr"
+#define UF2_PRODUCT_NAME    "Electronut Labs Papyr"
 #define UF2_BOARD_ID        "nRF52840-Papyr-v1"
 #define UF2_INDEX_URL       "https://docs.electronut.in/papyr"
 
diff --git a/src/boards/feather_nrf52832/board.h b/src/boards/feather_nrf52832/board.h
index d8ac9db..9acec40 100644
--- a/src/boards/feather_nrf52832/board.h
+++ b/src/boards/feather_nrf52832/board.h
@@ -51,8 +51,8 @@
 #define HWFC               false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER   "Adafruit Industries"
-#define DIS_MODEL          "Bluefruit Feather nRF52832"
+#define BLEDIS_MANUFACTURER   "Adafruit Industries"
+#define BLEDIS_MODEL          "Feather nRF52832"
 
 #define UF2_PRODUCT_NAME   "Adafruit Feather nRF52832"
 #define UF2_INDEX_URL      "https://www.adafruit.com/product/3406"
diff --git a/src/boards/feather_nrf52840_express/board.h b/src/boards/feather_nrf52840_express/board.h
index 3ea204b..090ef50 100644
--- a/src/boards/feather_nrf52840_express/board.h
+++ b/src/boards/feather_nrf52840_express/board.h
@@ -55,8 +55,8 @@
 #define HWFC                  false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER   "Adafruit Industries"
-#define DIS_MODEL          "Bluefruit Feather nRF52840 Express"
+#define BLEDIS_MANUFACTURER   "Adafruit Industries"
+#define BLEDIS_MODEL          "Feather nRF52840 Express"
 
 #define UF2_PRODUCT_NAME   "Adafruit Feather nRF52840 Express"
 #define UF2_VOLUME_LABEL   "FTHR840BOOT"
diff --git a/src/boards/mdk_nrf52840_dongle/board.h b/src/boards/mdk_nrf52840_dongle/board.h
index 6d906be..3f3c6a3 100644
--- a/src/boards/mdk_nrf52840_dongle/board.h
+++ b/src/boards/mdk_nrf52840_dongle/board.h
@@ -49,12 +49,12 @@
 #define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER   "MakerDiary"
-#define DIS_MODEL          "nRF52840 Micro Dev Kit USB Dongle"
+#define BLEDIS_MANUFACTURER   "MakerDiary"
+#define BLEDIS_MODEL          "nRF52840 Micro Dev Kit USB Dongle"
 
 #define UF2_PRODUCT_NAME   "MDK nRF52840 USB Dongle"
 #define UF2_VOLUME_LABEL   "MDK840DONGL"
-#define UF2_BOARD_ID       "MakerDiary-nRF52840-USB-Dongle"
+#define UF2_BOARD_ID       "nRF52840-Dongle-v1"
 #define UF2_INDEX_URL      "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"
 
 #endif /* _MDK_NRF52840_DONGLE_H_ */
diff --git a/src/boards/metro_nrf52840_express/board.h b/src/boards/metro_nrf52840_express/board.h
index 7ff4344..786b8d6 100644
--- a/src/boards/metro_nrf52840_express/board.h
+++ b/src/boards/metro_nrf52840_express/board.h
@@ -55,8 +55,8 @@
 #define HWFC                  false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER   "Adafruit Industries"
-#define DIS_MODEL          "Bluefruit Metro nRF52840 Express"
+#define BLEDIS_MANUFACTURER   "Adafruit Industries"
+#define BLEDIS_MODEL          "Metro nRF52840 Express"
 
 #define UF2_PRODUCT_NAME   "Adafruit Metro nRF52840 Express"
 #define UF2_VOLUME_LABEL   "METR840BOOT"
diff --git a/src/boards/particle_argon/board.h b/src/boards/particle_argon/board.h
index 4f83b30..a644e82 100644
--- a/src/boards/particle_argon/board.h
+++ b/src/boards/particle_argon/board.h
@@ -57,8 +57,8 @@
 #define HWFC           false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER   "Particle Industries"
-#define DIS_MODEL          "Argon"
+#define BLEDIS_MANUFACTURER   "Particle Industries"
+#define BLEDIS_MODEL          "Argon"
 
 #define UF2_PRODUCT_NAME   "Particle Argon"
 #define UF2_VOLUME_LABEL   "ARGONBOOT  "
diff --git a/src/boards/particle_boron/board.h b/src/boards/particle_boron/board.h
index 76787e3..62c1713 100644
--- a/src/boards/particle_boron/board.h
+++ b/src/boards/particle_boron/board.h
@@ -57,8 +57,8 @@
 #define HWFC           false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER   "Particle Industries"
-#define DIS_MODEL          "Boron"
+#define BLEDIS_MANUFACTURER   "Particle Industries"
+#define BLEDIS_MODEL          "Boron"
 
 #define UF2_PRODUCT_NAME   "Particle Boron"
 #define UF2_VOLUME_LABEL   "BORONBOOT  "
diff --git a/src/boards/particle_xenon/board.h b/src/boards/particle_xenon/board.h
index 96e1dd4..d00b6a4 100644
--- a/src/boards/particle_xenon/board.h
+++ b/src/boards/particle_xenon/board.h
@@ -57,8 +57,8 @@
 #define HWFC           false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER   "Particle Industries"
-#define DIS_MODEL          "Xenon"
+#define BLEDIS_MANUFACTURER   "Particle Industries"
+#define BLEDIS_MODEL          "Xenon"
 
 #define UF2_PRODUCT_NAME   "Particle Xenon"
 #define UF2_VOLUME_LABEL   "XENONBOOT  "
diff --git a/src/boards/pca10056/board.h b/src/boards/pca10056/board.h
index e9be765..089aa2e 100644
--- a/src/boards/pca10056/board.h
+++ b/src/boards/pca10056/board.h
@@ -51,8 +51,8 @@
 #define HWFC                false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER    "Nordic"
-#define DIS_MODEL           "PCA10056"
+#define BLEDIS_MANUFACTURER    "Nordic"
+#define BLEDIS_MODEL           "PCA10056"
 
 #define UF2_PRODUCT_NAME    "Nordic nRF52840 DK"
 #define UF2_BOARD_ID        "nRF52840-pca10056-v1"
diff --git a/src/boards/pca10059/board.h b/src/boards/pca10059/board.h
index b64c360..8c7a5c7 100644
--- a/src/boards/pca10059/board.h
+++ b/src/boards/pca10059/board.h
@@ -54,8 +54,8 @@
 #define HWFC           false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER  "Nordic"
-#define DIS_MODEL         "PCA10059"
+#define BLEDIS_MANUFACTURER  "Nordic"
+#define BLEDIS_MODEL         "PCA10059"
 
 #define UF2_PRODUCT_NAME  "Nordic nRF52840 Dongle"
 #define UF2_BOARD_ID      "nRF52840-pca10059-v1"