diff --git a/Makefile b/Makefile
index 1dd88e3..94468af 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ BETA_DIR        = bin/$(BOARD)/beta
 RELEASE_DIR     = bin/$(BOARD)/$(SD_VERSION_FULL)
 
 
-MK_DIS_FIRMWARE = "$(SD_NAME) $(SD_VERSION_FULL)"
+MK_DIS_FIRMWARE = "$(SD_NAME) $(SD_VERSION) r$(SD_VER4)"
 
 #******************************************************************************
 # Tool configure
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 0444ef8..fb68b1b 100644
--- a/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c
+++ b/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c
@@ -14,7 +14,7 @@
 #include "dfu.h"
 #include <dfu_types.h>
 #include <stddef.h>
-#include "boards/boards.h"
+#include "boards.h"
 #include "nrf.h"
 #include "nrf_sdm.h"
 #include "nrf_gpio.h"
diff --git a/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c b/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c
index 1d6beee..ba7cc68 100644
--- a/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c
+++ b/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c
@@ -19,7 +19,7 @@
 #include "hci_transport.h"
 #include "app_timer.h"
 #include "app_scheduler.h"
-#include "boards/boards.h"
+#include "boards.h"
 
 #define MAX_BUFFERS          4u                                                      /**< Maximum number of buffers that can be received queued without being consumed. */
 
diff --git a/src/boards/boards.h b/src/boards.h
similarity index 100%
rename from src/boards/boards.h
rename to src/boards.h
diff --git a/src/main.c b/src/main.c
index 29234c7..27322bf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -53,7 +53,7 @@
 #include "app_timer.h"
 #include "nrf_error.h"
 
-#include "boards/boards.h"
+#include "boards.h"
 
 #include "pstorage_platform.h"
 #include "nrf_mbr.h"
diff --git a/src/usb/uf2/ghostfat.c b/src/usb/uf2/ghostfat.c
index 3256b09..52245d9 100644
--- a/src/usb/uf2/ghostfat.c
+++ b/src/usb/uf2/ghostfat.c
@@ -3,7 +3,7 @@
 #include "nrf_nvmc.h"
 #include <string.h>
 
-#include "boards/boards.h"
+#include "boards.h"
 #include "tusb.h"
 
 #include "bootloader_settings.h"