diff --git a/src/boards/electronut_labs_papyr/board.h b/src/boards/electronut_labs_papyr/board.h
index 6faa675..2f9289a 100644
--- a/src/boards/electronut_labs_papyr/board.h
+++ b/src/boards/electronut_labs_papyr/board.h
@@ -60,7 +60,8 @@
 #define DIS_MANUFACTURER    "Electronut Labs"
 #define DIS_MODEL           "Papyr"
 
-#define UF2_BOARD_ID        "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"
 
 #define USB_DESC_VID        0x239A
diff --git a/src/boards/feather_nrf52832/board.h b/src/boards/feather_nrf52832/board.h
index 1d048dd..d8ac9db 100644
--- a/src/boards/feather_nrf52832/board.h
+++ b/src/boards/feather_nrf52832/board.h
@@ -54,7 +54,7 @@
 #define DIS_MANUFACTURER   "Adafruit Industries"
 #define DIS_MODEL          "Bluefruit Feather nRF52832"
 
-#define PRODUCT_NAME       "Adafruit Bluefruit Feather nRF52832"
+#define UF2_PRODUCT_NAME   "Adafruit Feather nRF52832"
 #define UF2_INDEX_URL      "https://www.adafruit.com/product/3406"
 
 #endif // _FEATHER_NRF52832_H
diff --git a/src/boards/feather_nrf52840_express/board.h b/src/boards/feather_nrf52840_express/board.h
index 33a6508..3ea204b 100644
--- a/src/boards/feather_nrf52840_express/board.h
+++ b/src/boards/feather_nrf52840_express/board.h
@@ -58,7 +58,7 @@
 #define DIS_MANUFACTURER   "Adafruit Industries"
 #define DIS_MODEL          "Bluefruit Feather nRF52840 Express"
 
-#define PRODUCT_NAME       "Adafruit Feather nRF52840 Express"
+#define UF2_PRODUCT_NAME   "Adafruit Feather nRF52840 Express"
 #define UF2_VOLUME_LABEL   "FTHR840BOOT"
 #define UF2_BOARD_ID       "nRF52840-Feather-revD"
 #define UF2_INDEX_URL      "https://www.adafruit.com/product/4062"
diff --git a/src/boards/mdk_nrf52840_dongle/board.h b/src/boards/mdk_nrf52840_dongle/board.h
index d49006e..6d906be 100644
--- a/src/boards/mdk_nrf52840_dongle/board.h
+++ b/src/boards/mdk_nrf52840_dongle/board.h
@@ -52,7 +52,7 @@
 #define DIS_MANUFACTURER   "MakerDiary"
 #define DIS_MODEL          "nRF52840 Micro Dev Kit USB Dongle"
 
-#define PRODUCT_NAME       "MDK nRF52840 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_INDEX_URL      "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"
diff --git a/src/boards/metro_nrf52840_express/board.h b/src/boards/metro_nrf52840_express/board.h
index c3d0059..7ff4344 100644
--- a/src/boards/metro_nrf52840_express/board.h
+++ b/src/boards/metro_nrf52840_express/board.h
@@ -58,7 +58,7 @@
 #define DIS_MANUFACTURER   "Adafruit Industries"
 #define DIS_MODEL          "Bluefruit Metro nRF52840 Express"
 
-#define PRODUCT_NAME       "Adafruit Metro nRF52840 Express"
+#define UF2_PRODUCT_NAME   "Adafruit Metro nRF52840 Express"
 #define UF2_VOLUME_LABEL   "METR840BOOT"
 #define UF2_BOARD_ID       "nRF52840-Metro-revA"
 
diff --git a/src/boards/particle_argon/board.h b/src/boards/particle_argon/board.h
index 638c5e7..4f83b30 100644
--- a/src/boards/particle_argon/board.h
+++ b/src/boards/particle_argon/board.h
@@ -60,6 +60,7 @@
 #define DIS_MANUFACTURER   "Particle Industries"
 #define DIS_MODEL          "Argon"
 
+#define UF2_PRODUCT_NAME   "Particle Argon"
 #define UF2_VOLUME_LABEL   "ARGONBOOT  "
 #define UF2_BOARD_ID       "nRF52840-Argon-v1"
 #define UF2_INDEX_URL      "https://www.particle.io/mesh/"
diff --git a/src/boards/particle_boron/board.h b/src/boards/particle_boron/board.h
index aa92257..76787e3 100644
--- a/src/boards/particle_boron/board.h
+++ b/src/boards/particle_boron/board.h
@@ -60,6 +60,7 @@
 #define DIS_MANUFACTURER   "Particle Industries"
 #define DIS_MODEL          "Boron"
 
+#define UF2_PRODUCT_NAME   "Particle Boron"
 #define UF2_VOLUME_LABEL   "BORONBOOT  "
 #define UF2_BOARD_ID       "nRF52840-Boron-v1"
 #define UF2_INDEX_URL      "https://www.particle.io/mesh/"
diff --git a/src/boards/particle_xenon/board.h b/src/boards/particle_xenon/board.h
index 460322f..96e1dd4 100644
--- a/src/boards/particle_xenon/board.h
+++ b/src/boards/particle_xenon/board.h
@@ -60,6 +60,7 @@
 #define DIS_MANUFACTURER   "Particle Industries"
 #define DIS_MODEL          "Xenon"
 
+#define UF2_PRODUCT_NAME   "Particle Xenon"
 #define UF2_VOLUME_LABEL   "XENONBOOT  "
 #define UF2_BOARD_ID       "nRF52840-Xenon-v1"
 #define UF2_INDEX_URL      "https://www.particle.io/mesh/"
diff --git a/src/boards/pca10056/board.h b/src/boards/pca10056/board.h
index b4d20b2..e9be765 100644
--- a/src/boards/pca10056/board.h
+++ b/src/boards/pca10056/board.h
@@ -54,6 +54,7 @@
 #define DIS_MANUFACTURER    "Nordic"
 #define DIS_MODEL           "PCA10056"
 
+#define UF2_PRODUCT_NAME    "Nordic nRF52840 DK"
 #define UF2_BOARD_ID        "nRF52840-pca10056-v1"
 #define UF2_INDEX_URL       "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK"
 
diff --git a/src/boards/pca10059/board.h b/src/boards/pca10059/board.h
index 0ca9c45..b64c360 100644
--- a/src/boards/pca10059/board.h
+++ b/src/boards/pca10059/board.h
@@ -38,7 +38,7 @@
 /*------------------------------------------------------------------*/
 /* BUTTON
  *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER 2
+#define BUTTONS_NUMBER  2
 
 #define BUTTON_1       _PINNUM(1, 6)
 #define BUTTON_2       _PINNUM(1, 10)
@@ -57,6 +57,7 @@
 #define DIS_MANUFACTURER  "Nordic"
 #define DIS_MODEL         "PCA10059"
 
+#define UF2_PRODUCT_NAME  "Nordic nRF52840 Dongle"
 #define UF2_BOARD_ID      "nRF52840-pca10059-v1"
 #define UF2_INDEX_URL     "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle"
 
diff --git a/src/usb/uf2/ghostfat.c b/src/usb/uf2/ghostfat.c
index 7bda507..6f13980 100644
--- a/src/usb/uf2/ghostfat.c
+++ b/src/usb/uf2/ghostfat.c
@@ -62,7 +62,7 @@ struct TextFile {
 
 const char infoUf2File[] = //
     "UF2 Bootloader " UF2_VERSION "\r\n"
-    "Model: " PRODUCT_NAME "\r\n"
+    "Model: " UF2_PRODUCT_NAME "\r\n"
     "Board-ID: " UF2_BOARD_ID "\r\n"
     "Date: " __DATE__ "\r\n";
 
diff --git a/src/usb/uf2/uf2cfg.h b/src/usb/uf2/uf2cfg.h
index dec5f79..a100f44 100644
--- a/src/usb/uf2/uf2cfg.h
+++ b/src/usb/uf2/uf2cfg.h
@@ -1,15 +1,9 @@
 #include "boards.h"
 
-#ifndef PRODUCT_NAME
-  #define PRODUCT_NAME     DIS_MODEL
-#endif
-
-#define BOOTLOADER_ID      MK_DIS_FIRMWARE
-
 #define UF2_NUM_BLOCKS     8000   // at least 4,1 MB for FAT16
 
 #ifndef UF2_VOLUME_LABEL
-#define UF2_VOLUME_LABEL       "NRF52BOOT  "
+#define UF2_VOLUME_LABEL   "NRF52BOOT  "
 #endif
 
 #define FLASH_SIZE         (USER_FLASH_END-USER_FLASH_START) // Max flash size