diff --git a/res/localization/ChangeLog.txt b/res/localization/ChangeLog.txt
index 3e9908d9..6ddd8ec5 100644
--- a/res/localization/ChangeLog.txt
+++ b/res/localization/ChangeLog.txt
@@ -19,7 +19,7 @@ o Version 1.0.23 (2018.??.??)
   - All positioning ('m', 's') has now been removed as well as some controls, for the 3.0 UI redesign
   - Removed: MSG_086, MSG_087, MSG_163
   - *NEW*      IDS_DRIVE_PROPERTIES_TXT "Drive Properties"
-  - *NEW*      IDS_BOOT_TYPE_TXT "Boot selection"
+  - *NEW*      IDS_BOOT_SELECTION_TXT "Boot selection"
   - *NEW*      IDC_SELECT "SELECT"
   - *NEW*      IDS_IMAGE_OPTION_TXT "Image Option"
   - *UPDATED*  IDS_PARTITION_TYPE_TXT Partition scheme and target system type -> "Partition scheme"
diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc
index a9d58ad3..f903e955 100644
--- a/res/localization/rufus.loc
+++ b/res/localization/rufus.loc
@@ -100,7 +100,7 @@ g IDD_DIALOG
 t IDS_DRIVE_PROPERTIES_TXT "Drive Properties"
 t IDS_DEVICE_TXT "Device"
 # TODO: use MSG_278 for translations
-t IDS_BOOT_TYPE_TXT "Boot selection"
+t IDS_BOOT_SELECTION_TXT "Boot selection"
 t IDC_SELECT "Select"
 t IDS_IMAGE_OPTION_TXT "Image Option"
 t IDS_PARTITION_TYPE_TXT "Partition scheme"
@@ -114,11 +114,11 @@ t IDC_OLD_BIOS_FIXES "Add fixes for old BIOSes (extra partition, align, etc.)"
 # to specify a custom disk ID for the BIOS. Note: the tooltip for this control is MSG_167.
 t IDC_RUFUS_MBR "Use Rufus MBR with BIOS ID"
 t IDS_FORMAT_OPTIONS_TXT "Format Options"
-t IDS_FILESYSTEM_TXT "File system"
-t IDS_CLUSTERSIZE_TXT "Cluster size"
+t IDS_FILE_SYSTEM_TXT "File system"
+t IDS_CLUSTER_SIZE_TXT "Cluster size"
 t IDS_LABEL_TXT "Volume label"
-t IDC_QUICKFORMAT "Quick format"
-t IDC_BADBLOCKS "Check device for bad blocks"
+t IDC_QUICK_FORMAT "Quick format"
+t IDC_BAD_BLOCKS "Check device for bad blocks"
 t IDC_EXTENDED_LABEL "Create extended label and icon files"
 t IDS_STATUS_TXT "Status"
 t IDCANCEL "Close"
@@ -322,7 +322,7 @@ t MSG_106 "Please select folder"
 t MSG_107 "All files"
 t MSG_108 "Rufus log"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS cannot boot from a drive using a 64 kilobytes Cluster size.\n"
 	"Please change the Cluster size or use FreeDOS."
@@ -577,12 +577,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "الجهاز"
 t IDS_PARTITION_TYPE_TXT "مخطط التقسيم ونوع النظام المستهدف"
-t IDS_FILESYSTEM_TXT "نظام الملفات"
-t IDS_CLUSTERSIZE_TXT "حجم الكلستر"
+t IDS_FILE_SYSTEM_TXT "نظام الملفات"
+t IDS_CLUSTER_SIZE_TXT "حجم الكلستر"
 t IDS_LABEL_TXT "تسمية وحدة التخزين"
 t IDS_FORMAT_OPTIONS_TXT "خيارات الفورمات"
-t IDC_BADBLOCKS "فحص الجهاز من الأجزاء التالفة"
-t IDC_QUICKFORMAT "فورمات سريع"
+t IDC_BAD_BLOCKS "فحص الجهاز من الأجزاء التالفة"
+t IDC_QUICK_FORMAT "فورمات سريع"
 t IDC_EXTENDED_LABEL "إنشاء تسمية موسّعة وأيقونة ملفات"
 t IDCANCEL "إغلاق"
 t IDC_START "إبدأ"
@@ -788,7 +788,7 @@ t MSG_107 "جميع الملفات"
 t MSG_108 "سجلّ روفوس"
 # LTR & RTL before and after "0x%02X"
 t MSG_109 "‎0x%02X‏ (قرص %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS لا يمكنه التمهيد من محرك أقراص يستخدم حجم الكلستر64  كيلو بايت.\n"
 	"الرجاء تغيير حجم الكلستر أو استخدام FreeDOS."
@@ -1018,12 +1018,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Cihaz"
 t IDS_PARTITION_TYPE_TXT "Disk Hissəsi və Hədəf Sistem Növü"
-t IDS_FILESYSTEM_TXT "Fayl Sistemi"
-t IDS_CLUSTERSIZE_TXT "Ayırma Tək Ölçüsü"
+t IDS_FILE_SYSTEM_TXT "Fayl Sistemi"
+t IDS_CLUSTER_SIZE_TXT "Ayırma Tək Ölçüsü"
 t IDS_LABEL_TXT "Yeni Tək Etiketi"
 t IDS_FORMAT_OPTIONS_TXT "Formatlama Variantları"
-t IDC_BADBLOCKS "Səhvli Bloklar üçün Cihazı Yoxla"
-t IDC_QUICKFORMAT "Sürətli Formatla"
+t IDC_BAD_BLOCKS "Səhvli Bloklar üçün Cihazı Yoxla"
+t IDC_QUICK_FORMAT "Sürətli Formatla"
 t IDC_EXTENDED_LABEL "Genişləndirilmiş Etiket və Simvol Faylları Yarat"
 t IDCANCEL "Bağla"
 t IDC_START "Başlat"
@@ -1240,7 +1240,7 @@ t MSG_106 "Lütfən Qovluq Seçin"
 t MSG_107 "Bütün Fayllar"
 t MSG_108 "Rufus günlüyü"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS, 64 kilobyte Ayırma Seçimi Ölçüsü istifadə edən bir sürücüdən başlamaz.\n"
 	"Lütfən fərqli bir Seçim, Ölçü seçin yada FreeDOS istifadə edin."
@@ -1468,12 +1468,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Устройство"
 t IDS_PARTITION_TYPE_TXT "Схема на дяла и тип на интерфейса"
-t IDS_FILESYSTEM_TXT "Файлова система"
-t IDS_CLUSTERSIZE_TXT "Размер на клъстера"
+t IDS_FILE_SYSTEM_TXT "Файлова система"
+t IDS_CLUSTER_SIZE_TXT "Размер на клъстера"
 t IDS_LABEL_TXT "Нов етикет на тома"
 t IDS_FORMAT_OPTIONS_TXT "Свойства на форматирането"
-t IDC_BADBLOCKS "Провери за лоши сектори"
-t IDC_QUICKFORMAT "Бърз Формат"
+t IDC_BAD_BLOCKS "Провери за лоши сектори"
+t IDC_QUICK_FORMAT "Бърз Формат"
 t IDC_EXTENDED_LABEL "Създай разширен етикет и икони файлове"
 t IDCANCEL "Затвори"
 t IDC_START "Старт"
@@ -1694,7 +1694,7 @@ t MSG_106 "Моля изберете папка"
 t MSG_107 "Всички файлове"
 t MSG_108 "Rufus архив"
 t MSG_109 "0x%02X (Диск %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS не може да стартира устройството с 64 килобит /ов  размер на клъстера.\n"
 	"Моля използвайте друг размер на клъстера или използвайте FreeDOS."
@@ -1923,13 +1923,13 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "设备"
 t IDS_PARTITION_TYPE_TXT "分区方案和目标系统类型"
-t IDS_FILESYSTEM_TXT "文件系统"
-t IDS_CLUSTERSIZE_TXT "簇大小"
+t IDS_FILE_SYSTEM_TXT "文件系统"
+t IDS_CLUSTER_SIZE_TXT "簇大小"
 t IDS_LABEL_TXT "新卷标"
 t IDS_FORMAT_OPTIONS_TXT "格式化选项"
 # 注: 出现在 "Format Options" 旁边的按钮 (IDC_ADVANCED) 是自动重新定位的。。
-t IDC_BADBLOCKS "检查设备坏块"
-t IDC_QUICKFORMAT "快速格式化"
+t IDC_BAD_BLOCKS "检查设备坏块"
+t IDC_QUICK_FORMAT "快速格式化"
 t IDC_EXTENDED_LABEL "创建扩展的标签和图标文件"
 t IDCANCEL "关闭"
 t IDC_START "开始"
@@ -2139,7 +2139,7 @@ t MSG_106 "请选择文件夹"
 t MSG_107 "全部文件"
 t MSG_108 "Rufus 日志"
 t MSG_109 "0x%02X (磁盘 %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS 无法从 64 KB 簇大小磁盘启动。\n"
 	"请更改簇大小或改用 FreeDOS。"
@@ -2360,12 +2360,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "裝置"
 t IDS_PARTITION_TYPE_TXT "資料分割配置及系統類型"
-t IDS_FILESYSTEM_TXT "檔案系統"
-t IDS_CLUSTERSIZE_TXT "配置單元大小"
+t IDS_FILE_SYSTEM_TXT "檔案系統"
+t IDS_CLUSTER_SIZE_TXT "配置單元大小"
 t IDS_LABEL_TXT "磁碟區標籤"
 t IDS_FORMAT_OPTIONS_TXT "選項"
-t IDC_BADBLOCKS "檢查損毀磁區，測試次數"
-t IDC_QUICKFORMAT "快速格式化"
+t IDC_BAD_BLOCKS "檢查損毀磁區，測試次數"
+t IDC_QUICK_FORMAT "快速格式化"
 t IDC_EXTENDED_LABEL "建立延伸標籤及圖示"
 t IDC_LOG "記錄檔"
 t IDCANCEL "離開"
@@ -2556,7 +2556,7 @@ t MSG_106 "請選擇資料夾"
 t MSG_107 "所有檔案"
 t MSG_108 "Rufus 記錄檔"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS 無法自 64 kilobytes 配置單元大小的磁區開機，請更改配置單元大小或改用 FreeDOS\n"
 t MSG_111 "不相容的配置單元大小"
@@ -2762,12 +2762,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Uređaj"
 t IDS_PARTITION_TYPE_TXT "Shema particije i ciljani datotečni sustav"
-t IDS_FILESYSTEM_TXT "Sustav datoteka"
-t IDS_CLUSTERSIZE_TXT "Veličina grupiranja"
+t IDS_FILE_SYSTEM_TXT "Sustav datoteka"
+t IDS_CLUSTER_SIZE_TXT "Veličina grupiranja"
 t IDS_LABEL_TXT "Naziv nove particije"
 t IDS_FORMAT_OPTIONS_TXT "Dodatno"
-t IDC_BADBLOCKS "Provjeri blokove"
-t IDC_QUICKFORMAT "Brzo formatiranje"
+t IDC_BAD_BLOCKS "Provjeri blokove"
+t IDC_QUICK_FORMAT "Brzo formatiranje"
 t IDC_EXTENDED_LABEL "Stvori produženu oznaku i ikone"
 t IDCANCEL "Zatvori"
 t IDC_START "Početak"
@@ -2973,7 +2973,7 @@ t MSG_106 "Molimo odaberite mapu"
 t MSG_107 "Sve datoteke"
 t MSG_108 "Rufus zapisnik"
 t MSG_109 "0x%02X (Disk %d)"
-# "Veličina grupiranja" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Veličina grupiranja" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobajta" should be the same as in MSG_027
 t MSG_110 "MS-DOS ne može boot-ati s uređaja s grupiranjem od 64 kilobajta.\n"
 	"Promijenite vel. grupiranja ili odaberite FreeDOS."
@@ -3200,12 +3200,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Zařízení"
 t IDS_PARTITION_TYPE_TXT "Oddíl a typ cílového systému"
-t IDS_FILESYSTEM_TXT "Souborový systém"
-t IDS_CLUSTERSIZE_TXT "Velikost clusteru"
+t IDS_FILE_SYSTEM_TXT "Souborový systém"
+t IDS_CLUSTER_SIZE_TXT "Velikost clusteru"
 t IDS_LABEL_TXT "Nový název svazku"
 t IDS_FORMAT_OPTIONS_TXT "Nastavení formátování"
-t IDC_BADBLOCKS "Zkontrolovat chybné bloky"
-t IDC_QUICKFORMAT "Rychlé formátování"
+t IDC_BAD_BLOCKS "Zkontrolovat chybné bloky"
+t IDC_QUICK_FORMAT "Rychlé formátování"
 t IDC_EXTENDED_LABEL "Vytvořit soubory s jmenovkou a ikonou svazku"
 t IDCANCEL "Zavřít"
 t IDC_START "Spustit"
@@ -3414,7 +3414,7 @@ t MSG_106 "Prosím vyberte složku"
 t MSG_107 "Všechny soubory"
 t MSG_108 "Záznam programu Rufus"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS nelze spustit z disku používajíciho alokační jednotku o velikostí 64KB.\n"
 	"Změňte velikost alokační jednotky nebo použijte FreeDOS."
@@ -3645,12 +3645,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Enhed"
 t IDS_PARTITION_TYPE_TXT "Partitionsordning og destinationssystem"
-t IDS_FILESYSTEM_TXT "Filsystem"
-t IDS_CLUSTERSIZE_TXT "Klyngestørrelse"
+t IDS_FILE_SYSTEM_TXT "Filsystem"
+t IDS_CLUSTER_SIZE_TXT "Klyngestørrelse"
 t IDS_LABEL_TXT "Ny volume-etiket"
 t IDS_FORMAT_OPTIONS_TXT "Formateringsindstillinger"
-t IDC_BADBLOCKS "Søg efter fejlbehæftede blokke"
-t IDC_QUICKFORMAT "Ekspresformatering"
+t IDC_BAD_BLOCKS "Søg efter fejlbehæftede blokke"
+t IDC_QUICK_FORMAT "Ekspresformatering"
 t IDC_EXTENDED_LABEL "Brug udvidet etiket og ikon-filer"
 t IDCANCEL "Afslut"
 t IDC_LIST_USB_HDD "Vis USB-harddiske"
@@ -3865,7 +3865,7 @@ t MSG_106 "Vælg en mappe"
 t MSG_107 "Alle filer"
 t MSG_108 "Rufus log"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS kan ikke boote fra et drev der bruger 64 kilobyte klyngestørrelse.\n"
 	"Vær venlig at ændre klyngestørrelsen eller brug FreeDOS."
@@ -4081,12 +4081,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Apparaat"
 t IDS_PARTITION_TYPE_TXT "Partitie-indeling en type doelsysteem"
-t IDS_FILESYSTEM_TXT "Bestandssysteem"
-t IDS_CLUSTERSIZE_TXT "Clustergrootte"
+t IDS_FILE_SYSTEM_TXT "Bestandssysteem"
+t IDS_CLUSTER_SIZE_TXT "Clustergrootte"
 t IDS_LABEL_TXT "Nieuw volumelabel"
 t IDS_FORMAT_OPTIONS_TXT "Formatteer Opties"
-t IDC_BADBLOCKS "Controleer apparaat op slechte blokken"
-t IDC_QUICKFORMAT "Snelformatteren"
+t IDC_BAD_BLOCKS "Controleer apparaat op slechte blokken"
+t IDC_QUICK_FORMAT "Snelformatteren"
 t IDC_EXTENDED_LABEL "Creëer uitgebreide label- en icoon bestanden"
 t IDCANCEL "Sluit"
 t IDC_LIST_USB_HDD "Laat USB HD's zien"
@@ -4521,12 +4521,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Laite"
 t IDS_PARTITION_TYPE_TXT "Osion ja kohdejärjestelmän tyyppi"
-t IDS_FILESYSTEM_TXT "Tiedostojärjestelmä"
-t IDS_CLUSTERSIZE_TXT "Tilanvarausyksikkö"
+t IDS_FILE_SYSTEM_TXT "Tiedostojärjestelmä"
+t IDS_CLUSTER_SIZE_TXT "Tilanvarausyksikkö"
 t IDS_LABEL_TXT "Uuden aseman nimi"
 t IDS_FORMAT_OPTIONS_TXT "Alustusasetukset"
-t IDC_BADBLOCKS "Vioittuneiden lohkojen tarkistus"
-t IDC_QUICKFORMAT "Pika-alustus"
+t IDC_BAD_BLOCKS "Vioittuneiden lohkojen tarkistus"
+t IDC_QUICK_FORMAT "Pika-alustus"
 t IDC_EXTENDED_LABEL "Luo laajennetut nimi- ja kuvaketiedostot"
 t IDCANCEL "Sulje"
 t IDC_START "Aloita"
@@ -4733,7 +4733,7 @@ t MSG_106 "Valitse kansio"
 t MSG_107 "Kaikki tiedostot"
 t MSG_108 "Rufuksen loki"
 t MSG_109 "0x%02X (Levy %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS ei voi käynnistyä laitteelta, joka käyttää 64 kilotavun tilanvarausyksikköä.\n"
 	"Vaihda tilanvarausyksikköä tai käytä FreeDOSia."
@@ -4959,17 +4959,17 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DRIVE_PROPERTIES_TXT "Options de Périphérique"
 t IDS_DEVICE_TXT "Périphérique"
-t IDS_BOOT_TYPE_TXT "Type de démarrage"
+t IDS_BOOT_SELECTION_TXT "Type de démarrage"
 t IDC_SELECT "Sélection"
 t IDS_IMAGE_OPTION_TXT "Option d'image"
 t IDS_PARTITION_TYPE_TXT "Schéma de partition"
 t IDS_TARGET_SYSTEM_TXT "Système de destination"
-t IDS_FILESYSTEM_TXT "Système de fichiers"
-t IDS_CLUSTERSIZE_TXT "Taille d'unité d'allocation"
+t IDS_FILE_SYSTEM_TXT "Système de fichiers"
+t IDS_CLUSTER_SIZE_TXT "Taille d'unité d'allocation"
 t IDS_LABEL_TXT "Nom de volume"
 t IDS_FORMAT_OPTIONS_TXT "Options de Formatage"
-t IDC_BADBLOCKS "Vérification de mauvais blocs"
-t IDC_QUICKFORMAT "Formatage rapide"
+t IDC_BAD_BLOCKS "Vérification de mauvais blocs"
+t IDC_QUICK_FORMAT "Formatage rapide"
 t IDC_EXTENDED_LABEL "Ajouter un label étendu et une icône"
 t IDS_STATUS_TXT "Statut"
 t IDCANCEL "Fermer"
@@ -5391,12 +5391,12 @@ g IDD_DIALOG
 t IDS_DEVICE_TXT "Laufwerk"
 t IDS_PARTITION_TYPE_TXT "Partitionsschema"
 t IDS_TARGET_SYSTEM_TXT "Zielsystem"
-t IDS_FILESYSTEM_TXT "Dateisystem"
-t IDS_CLUSTERSIZE_TXT "Größe der Zuordnungseinheit"
+t IDS_FILE_SYSTEM_TXT "Dateisystem"
+t IDS_CLUSTER_SIZE_TXT "Größe der Zuordnungseinheit"
 t IDS_LABEL_TXT "Neue Laufwerksbezeichnung"
 t IDS_FORMAT_OPTIONS_TXT "Formatierungseinstellungen"
-t IDC_BADBLOCKS "Auf defekte Blöcke prüfen"
-t IDC_QUICKFORMAT "Schnellformatierung"
+t IDC_BAD_BLOCKS "Auf defekte Blöcke prüfen"
+t IDC_QUICK_FORMAT "Schnellformatierung"
 t IDC_EXTENDED_LABEL "Erweiterte Bezeichnung und Symbole erstellen"
 t IDCANCEL "Schließen"
 t IDC_LIST_USB_HDD "USB-Festplatten anzeigen"
@@ -5814,12 +5814,12 @@ g IDD_DIALOG
 t IDS_DEVICE_TXT "Συσκευή"
 t IDS_PARTITION_TYPE_TXT "Σύστημα διαμερισμού"
 t IDS_TARGET_SYSTEM_TXT "Τύπος συστήματος"
-t IDS_FILESYSTEM_TXT "Σύστημα αρχείων"
-t IDS_CLUSTERSIZE_TXT "Μέγεθος μονάδας εκχώρησης"
+t IDS_FILE_SYSTEM_TXT "Σύστημα αρχείων"
+t IDS_CLUSTER_SIZE_TXT "Μέγεθος μονάδας εκχώρησης"
 t IDS_LABEL_TXT "Ετικέτα τόμου"
 t IDS_FORMAT_OPTIONS_TXT "Επιλογές διαμόρφωσης"
-t IDC_BADBLOCKS "Ελέγξτε τη συσκευή για κατεστραμμένους τομείς"
-t IDC_QUICKFORMAT "Γρήγορη διαμόρφωση"
+t IDC_BAD_BLOCKS "Ελέγξτε τη συσκευή για κατεστραμμένους τομείς"
+t IDC_QUICK_FORMAT "Γρήγορη διαμόρφωση"
 t IDC_EXTENDED_LABEL "Δημιουργία εκτεταμένης ετικέτας και εικονιδίων"
 t IDCANCEL "Κλείσιμο"
 t IDC_START "Εκκίνηση"
@@ -6262,12 +6262,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "התקן"
 t IDS_PARTITION_TYPE_TXT "תוכנית המחיצות וסוג מערכת היעד"
-t IDS_FILESYSTEM_TXT "מערכת קבצים"
-t IDS_CLUSTERSIZE_TXT "גודל אשכול"
+t IDS_FILE_SYSTEM_TXT "מערכת קבצים"
+t IDS_CLUSTER_SIZE_TXT "גודל אשכול"
 t IDS_LABEL_TXT "תווית חדשה לאמצעי האחסון"
 t IDS_FORMAT_OPTIONS_TXT "אפשרויות אתחול"
-t IDC_BADBLOCKS "בדוק את ההתקן לאיזורים פגומים"
-t IDC_QUICKFORMAT "אתחול מהיר"
+t IDC_BAD_BLOCKS "בדוק את ההתקן לאיזורים פגומים"
+t IDC_QUICK_FORMAT "אתחול מהיר"
 t IDC_EXTENDED_LABEL "צור תווית מורחבת וקבצי תמונה"
 t IDCANCEL "סגור"
 t IDC_START "התחל"
@@ -6473,7 +6473,7 @@ t MSG_107 "כל הקבצים"
 t MSG_108 "יומן Rufus"
 # LTR & RTL before and after "0x%02X"
 t MSG_109 "‎0x%02X‏ (דיסק %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS לא יכול לאתחל מהתקן שמשתמש בגודל אשכול של 64 קילו בתים.\n"
 	"בבקשה שנה את גודל המקטע או השתמש ב FreeDOS."
@@ -6713,12 +6713,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Eszköz"
 t IDS_PARTITION_TYPE_TXT "Partíciós séma és a cél rendszer típusa"
-t IDS_FILESYSTEM_TXT "Fájlrendszer"
-t IDS_CLUSTERSIZE_TXT "Klaszter mérete"
+t IDS_FILE_SYSTEM_TXT "Fájlrendszer"
+t IDS_CLUSTER_SIZE_TXT "Klaszter mérete"
 t IDS_LABEL_TXT "Új kötetcímke"
 t IDS_FORMAT_OPTIONS_TXT "Formázási beállítások"
-t IDC_BADBLOCKS "Hibás blokkok keresése"
-t IDC_QUICKFORMAT "Gyorsformázás"
+t IDC_BAD_BLOCKS "Hibás blokkok keresése"
+t IDC_QUICK_FORMAT "Gyorsformázás"
 t IDC_EXTENDED_LABEL "Kiterjesztett címke és ikon fájlok létrehozása"
 t IDCANCEL "Bezárás"
 t IDC_START "Indítás"
@@ -6923,7 +6923,7 @@ t MSG_106 "Kérlek, válassz mappát"
 t MSG_107 "Minden fájl"
 t MSG_108 "Rufus log"
 t MSG_109 "0x%02X (Lemez: %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "Az MS-DOS nem tud bootolni 64 kilobájt klaszter méretű eszközről.\n"
 	"Kérlek, változtasd meg a Klaszter méret beállítást, vagy használj FreeDOS-t."
@@ -7138,13 +7138,13 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Perangkat"
 t IDS_PARTITION_TYPE_TXT "Skema partisi dan tipe sistem target"
-t IDS_FILESYSTEM_TXT "Sistem berkas"
-t IDS_CLUSTERSIZE_TXT "Ukuran klaster"
+t IDS_FILE_SYSTEM_TXT "Sistem berkas"
+t IDS_CLUSTER_SIZE_TXT "Ukuran klaster"
 t IDS_LABEL_TXT "Label volume baru"
 t IDS_FORMAT_OPTIONS_TXT "Opsi Format"
 # Note: The button (IDC_ADVANCED) that appears next to "Format Options" is repositioned automatically.
-t IDC_BADBLOCKS "Periksa perangkat untuk blok buruk"
-t IDC_QUICKFORMAT "Format cepat"
+t IDC_BAD_BLOCKS "Periksa perangkat untuk blok buruk"
+t IDC_QUICK_FORMAT "Format cepat"
 t IDC_EXTENDED_LABEL "Buat label tambahan dan berkas ikon"
 t IDCANCEL "Tutup"
 t IDC_START "Mulai"
@@ -7360,7 +7360,7 @@ t MSG_106 "Silakan pilih folder"
 t MSG_107 "Semua berkas"
 t MSG_108 "Log Rufus"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS tidak dapat boot dari perangkat yang menggunakan ukuran Klaster 64 kilobyte.\n"
 	"Silakan ubah ukuran Klaster atau gunakan FreeDOS."
@@ -7591,12 +7591,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Dispositivo/unità"
 t IDS_PARTITION_TYPE_TXT "Schema partizione e tipo sistema destinazione"
-t IDS_FILESYSTEM_TXT "File system"
-t IDS_CLUSTERSIZE_TXT "Dimensione cluster"
+t IDS_FILE_SYSTEM_TXT "File system"
+t IDS_CLUSTER_SIZE_TXT "Dimensione cluster"
 t IDS_LABEL_TXT "Nuova etichetta volume"
 t IDS_FORMAT_OPTIONS_TXT "Opzioni formattazione"
-t IDC_BADBLOCKS "Test controllo blocchi errati unità"
-t IDC_QUICKFORMAT "Formattazione rapida"
+t IDC_BAD_BLOCKS "Test controllo blocchi errati unità"
+t IDC_QUICK_FORMAT "Formattazione rapida"
 t IDC_EXTENDED_LABEL "Crea etichetta estesa e file icone"
 t IDCANCEL "Chiudi"
 t IDC_START "Avvia"
@@ -7796,7 +7796,7 @@ t MSG_106 "Seleziona la cartella"
 t MSG_107 "Tutti i file"
 t MSG_108 "Registro eventi Rufus"
 t MSG_109 "0x%02X (disco %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "Non si può avviare MS-DOS da una unità che usa una dimensione del cluster di 64 kilobyte.\n"
 	"Modifica la dimensione del cluster o usa FreeDOS."
@@ -8013,12 +8013,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "デバイス"
 t IDS_PARTITION_TYPE_TXT "パーティション構成とターゲットシステムの種類"
-t IDS_FILESYSTEM_TXT "ファイルシステム"
-t IDS_CLUSTERSIZE_TXT "クラスタサイズ"
+t IDS_FILE_SYSTEM_TXT "ファイルシステム"
+t IDS_CLUSTER_SIZE_TXT "クラスタサイズ"
 t IDS_LABEL_TXT "新しいボリュームのラベル"
 t IDS_FORMAT_OPTIONS_TXT "フォーマット設定"
-t IDC_BADBLOCKS "不良ブロックを検出します"
-t IDC_QUICKFORMAT "クイックフォーマット"
+t IDC_BAD_BLOCKS "不良ブロックを検出します"
+t IDC_QUICK_FORMAT "クイックフォーマット"
 t IDC_EXTENDED_LABEL "機能拡張されたラベルとアイコンファイルを作成します"
 t IDCANCEL "閉じる"
 t IDC_START "スタート"
@@ -8237,7 +8237,7 @@ t MSG_106 "フォルダを選択してください。"
 t MSG_107 "全てのファイル"
 t MSG_108 "Rufusのログ"
 t MSG_109 "0x%02X (ディスク %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "クラスタサイズが64KBです。MS-DOSはこの場合、ドライブからブートできません。\n"
 	"クラスタサイズを変えてください、またはFreeDOSを使用してください。"
@@ -8467,12 +8467,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "장치"
 t IDS_PARTITION_TYPE_TXT "디스크 형식과 부팅 시스템 유형"
-t IDS_FILESYSTEM_TXT "파일 시스템"
-t IDS_CLUSTERSIZE_TXT "할당 단위 크기"
+t IDS_FILE_SYSTEM_TXT "파일 시스템"
+t IDS_CLUSTER_SIZE_TXT "할당 단위 크기"
 t IDS_LABEL_TXT "새 볼륨 레이블"
 t IDS_FORMAT_OPTIONS_TXT "포맷 옵션"
-t IDC_BADBLOCKS "배드 섹터 검사"
-t IDC_QUICKFORMAT "빠른 포맷"
+t IDC_BAD_BLOCKS "배드 섹터 검사"
+t IDC_QUICK_FORMAT "빠른 포맷"
 t IDC_EXTENDED_LABEL "확장 레이블 및 아이콘 파일 만들기"
 t IDCANCEL "닫기"
 t IDC_START "시작"
@@ -8682,7 +8682,7 @@ t MSG_106 "폴더를 선택하십시오"
 t MSG_107 "모든 파일"
 t MSG_108 "로그"
 t MSG_109 "0x%02X (디스크 %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS는 64KB 클러스터 크기를 사용하는 드라이브에서 부팅 할 수 없습니다.\n"
 	"클러스터 크기를 변경하거나 FreeDOS를 사용하십시오."
@@ -8905,12 +8905,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Ierīce"
 t IDS_PARTITION_TYPE_TXT "Partīcijas veids un sistēmas tips"
-t IDS_FILESYSTEM_TXT "Failu sistēma"
-t IDS_CLUSTERSIZE_TXT "Bloka izmērs"
+t IDS_FILE_SYSTEM_TXT "Failu sistēma"
+t IDS_CLUSTER_SIZE_TXT "Bloka izmērs"
 t IDS_LABEL_TXT "Datu nesēja nosaukums"
 t IDS_FORMAT_OPTIONS_TXT "Formatēšanas opcijas"
-t IDC_BADBLOCKS "Pārbaudīt ierīci uz bojātiem sektoriem"
-t IDC_QUICKFORMAT "Ātrā formatēšana"
+t IDC_BAD_BLOCKS "Pārbaudīt ierīci uz bojātiem sektoriem"
+t IDC_QUICK_FORMAT "Ātrā formatēšana"
 t IDC_EXTENDED_LABEL "Izveidot papildus nosaukumu un failu ikonas"
 t IDCANCEL "Aizvērt"
 t IDC_START "Sākt"
@@ -9124,7 +9124,7 @@ t MSG_106 "Izvēlieties mapi"
 t MSG_107 "Visi faili"
 t MSG_108 "Rufus logs"
 t MSG_109 "0x%02X (Disks %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS nevar ielādēties no nesēja ar klastera izmēru 64 Kb.\n"
 	"Pamainiet klastera izmēru izmantojot FreeDOS."
@@ -9352,12 +9352,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Įrenginys"
 t IDS_PARTITION_TYPE_TXT "Skaidinių schema ir paskirties sistemos tipas"
-t IDS_FILESYSTEM_TXT "Failų sistema"
-t IDS_CLUSTERSIZE_TXT "Klasterio dydis"
+t IDS_FILE_SYSTEM_TXT "Failų sistema"
+t IDS_CLUSTER_SIZE_TXT "Klasterio dydis"
 t IDS_LABEL_TXT "Nauja tomo žymė"
 t IDS_FORMAT_OPTIONS_TXT "Suženklinimo parinktys"
-t IDC_BADBLOCKS "Tikrinti, ar įrenginyje yra blogų blokų"
-t IDC_QUICKFORMAT "Greitasis suženklinimas"
+t IDC_BAD_BLOCKS "Tikrinti, ar įrenginyje yra blogų blokų"
+t IDC_QUICK_FORMAT "Greitasis suženklinimas"
 t IDC_EXTENDED_LABEL "Kurti išplėstinių žymių ir piktogramų failus"
 t IDCANCEL "Užverti"
 t IDC_START "Pradėti"
@@ -9571,7 +9571,7 @@ t MSG_106 "Pasirinkite katalogą"
 t MSG_107 "Visi failai"
 t MSG_108 "Rufus dienynas"
 t MSG_109 "0x%02X (Diskas %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS negali įsikelti iš disko naudojant 64 kilobaitų klasterio dydį.\n"
 	"Pakeiskite klasterio dydį arba naudokite FreeDOS."
@@ -9809,12 +9809,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Peranti"
 t IDS_PARTITION_TYPE_TXT "Skema partisyen dan jenis sistem sasaran"
-t IDS_FILESYSTEM_TXT "Sistem fail"
-t IDS_CLUSTERSIZE_TXT "Saiz gugusan"
+t IDS_FILE_SYSTEM_TXT "Sistem fail"
+t IDS_CLUSTER_SIZE_TXT "Saiz gugusan"
 t IDS_LABEL_TXT "Label jilid baharu"
 t IDS_FORMAT_OPTIONS_TXT "Pilihan format"
-t IDC_BADBLOCKS "Semak peranti untuk blok rosak"
-t IDC_QUICKFORMAT "Format pantas"
+t IDC_BAD_BLOCKS "Semak peranti untuk blok rosak"
+t IDC_QUICK_FORMAT "Format pantas"
 t IDC_EXTENDED_LABEL "Cipta label lanjut dan fail ikon"
 t IDCANCEL "Tutup"
 t IDC_START "Mula"
@@ -10033,7 +10033,7 @@ t MSG_106 "Sila pilih folder"
 t MSG_107 "Semua fail"
 t MSG_108 "Log Rufus"
 t MSG_109 "0x%02X (Cakera %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS tidak boleh boot daripada cakera yang menggunakan saiz gugusan 64 kilobait.\n"
 	"Sila tukarkan saiz gugusan atau gunakan FreeDOS."
@@ -10256,12 +10256,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Enhet"
 t IDS_PARTITION_TYPE_TXT "Partisjonskjema og målsystem-type"
-t IDS_FILESYSTEM_TXT "Filsystem"
-t IDS_CLUSTERSIZE_TXT "Cluster-størrelse"
+t IDS_FILE_SYSTEM_TXT "Filsystem"
+t IDS_CLUSTER_SIZE_TXT "Cluster-størrelse"
 t IDS_LABEL_TXT "Nytt volumnavn"
 t IDS_FORMAT_OPTIONS_TXT "Format-valg"
-t IDC_BADBLOCKS "Sjekk enhet for dårlige blokker"
-t IDC_QUICKFORMAT "Hurtigformatering"
+t IDC_BAD_BLOCKS "Sjekk enhet for dårlige blokker"
+t IDC_QUICK_FORMAT "Hurtigformatering"
 t IDC_EXTENDED_LABEL "Lager utvidet merke og ikon-filer"
 t IDCANCEL "Lukk"
 t IDC_START "Start"
@@ -10477,7 +10477,7 @@ t MSG_106 "Vennligst velg en mappe"
 t MSG_107 "Alle filer"
 t MSG_108 "Rufus logg"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS kan ikke boote fra en stasjon  som brukeren  64 kilobytes Cluster størrelse.\n"
 	"Vennligst bytt Cluster-størrelse eller bruk FreeDOS."
@@ -10712,13 +10712,13 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "درایو USB (حافظه فلش یا سایر ابزارهای ذخیره‌سازی قابل‌حمل)"
 t IDS_PARTITION_TYPE_TXT "روش پارتیشن‌بندی و نوع ثابت‌افزار (Firmware) رایانه موردنظر"
-t IDS_FILESYSTEM_TXT "سیستم فایل"
-t IDS_CLUSTERSIZE_TXT "اندازه کلاستر"
+t IDS_FILE_SYSTEM_TXT "سیستم فایل"
+t IDS_CLUSTER_SIZE_TXT "اندازه کلاستر"
 t IDS_LABEL_TXT "نام دلخواه برای درایو USB موردنظر"
 t IDS_FORMAT_OPTIONS_TXT "گزینه‌ها و تنظیمات"
 # Note: The button (IDC_ADVANCED) that appears next to "Format Options" is repositioned automatically.
-t IDC_BADBLOCKS "بررسی وجود بدسکتور در درایو به روشِ"
-t IDC_QUICKFORMAT "فرمت کردن سریع (Quick format)"
+t IDC_BAD_BLOCKS "بررسی وجود بدسکتور در درایو به روشِ"
+t IDC_QUICK_FORMAT "فرمت کردن سریع (Quick format)"
 t IDC_EXTENDED_LABEL "ایجاد آیکون و نام‌گذاری درایو USB با استفاده از فایل autorun.inf"
 t IDCANCEL "خروج"
 t IDC_START "شروع"
@@ -10960,7 +10960,7 @@ t MSG_106 "لطفاً یک پوشه انتخاب کنید"
 t MSG_107 "همه فایل‌ها"
 t MSG_108 "گزارش Rufus"
 t MSG_109 "0x%02X (دیسک %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS با استفاده از درایوی که اندازه کلاستر آن ۶۴ کیلوبایت است؛ راه‌اندازی (Boot) نمی‌شود.\n"
 	"لطفاً اندازه کلاستر را تغییر دهید یا از FreeDOS استفاده کنید."
@@ -11227,12 +11227,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Urządzenie"
 t IDS_PARTITION_TYPE_TXT "Schemat partycjonowania i typ systemu docelowego"
-t IDS_FILESYSTEM_TXT "System plików"
-t IDS_CLUSTERSIZE_TXT "Rozmiar jednostki alokacji"
+t IDS_FILE_SYSTEM_TXT "System plików"
+t IDS_CLUSTER_SIZE_TXT "Rozmiar jednostki alokacji"
 t IDS_LABEL_TXT "Nowa nazwa woluminu"
 t IDS_FORMAT_OPTIONS_TXT "Opcje Formatowania"
-t IDC_BADBLOCKS "Szukaj błędnych sektorów na urządzeniu"
-t IDC_QUICKFORMAT "Szybkie formatowanie"
+t IDC_BAD_BLOCKS "Szukaj błędnych sektorów na urządzeniu"
+t IDC_QUICK_FORMAT "Szybkie formatowanie"
 t IDC_EXTENDED_LABEL "Utwórz rozszerzoną nazwę i pliki ikon"
 t IDCANCEL "Zamknij"
 t IDC_START "Start"
@@ -11447,7 +11447,7 @@ t MSG_106 "Proszę wybrać folder"
 t MSG_107 "Wszystkie pliki"
 t MSG_108 "Rufus log"
 t MSG_109 "0x%02X (Dysk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS nie może być uruchomiony z dysku korzystającego z 64 kilobajtowego Rozmiaru jednostki alokacji.\n"
 	"Proszę zmienić Rozmiar jednostki alokacji lub użyć FreeDOSa."
@@ -11678,13 +11678,13 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Dispositivo"
 t IDS_PARTITION_TYPE_TXT "Esquema de partição e tipo do sistema de destino"
-t IDS_FILESYSTEM_TXT "Sistema de arquivos"
-t IDS_CLUSTERSIZE_TXT "Tamanho do cluster"
+t IDS_FILE_SYSTEM_TXT "Sistema de arquivos"
+t IDS_CLUSTER_SIZE_TXT "Tamanho do cluster"
 t IDS_LABEL_TXT "Novo nome do volume"
 t IDS_FORMAT_OPTIONS_TXT "Opções de formatação"
 # Note: The button (IDC_ADVANCED) that appears next to "Format Options" is repositioned automatically.
-t IDC_BADBLOCKS "Procurar blocos defeituosos"
-t IDC_QUICKFORMAT "Formatação rápida"
+t IDC_BAD_BLOCKS "Procurar blocos defeituosos"
+t IDC_QUICK_FORMAT "Formatação rápida"
 t IDC_EXTENDED_LABEL "Criar arquivos de nome estendido e ícone"
 t IDCANCEL "Fechar"
 t IDC_START "Iniciar"
@@ -11905,7 +11905,7 @@ t MSG_106 "Selecione a pasta"
 t MSG_107 "Todos os arquivos"
 t MSG_108 "Registro de eventos do Rufus"
 t MSG_109 "0x%02X (Disco %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "O MS-DOS não se inicializa a partir de um drive com um Tamanho do cluster de 64 quilobytes.\n"
 	"Por favor, altere o Tamanho do cluster ou use o FreeDOS."
@@ -12162,12 +12162,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Dispositivo/Disco"
 t IDS_PARTITION_TYPE_TXT "Tipo de partição e tipo de sistema destino"
-t IDS_FILESYSTEM_TXT "Sistema de ficheiros"
-t IDS_CLUSTERSIZE_TXT "Tamanho de cluster"
+t IDS_FILE_SYSTEM_TXT "Sistema de ficheiros"
+t IDS_CLUSTER_SIZE_TXT "Tamanho de cluster"
 t IDS_LABEL_TXT "Novo nome"
 t IDS_FORMAT_OPTIONS_TXT "Opções de formatação"
-t IDC_BADBLOCKS "Procurar erros no disco USB"
-t IDC_QUICKFORMAT "Formatação rápida"
+t IDC_BAD_BLOCKS "Procurar erros no disco USB"
+t IDC_QUICK_FORMAT "Formatação rápida"
 t IDC_EXTENDED_LABEL "Criar nomes estendidos e ícones"
 t IDCANCEL "Fechar"
 t IDC_START "Iniciar"
@@ -12380,7 +12380,7 @@ t MSG_106 "Selecione a pasta"
 t MSG_107 "Todos os ficheiros"
 t MSG_108 "Registro de eventos de Rufus"
 t MSG_109 "0x%02X (Disco %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS não arranca de um disco com um tamanho de cluster de 64 kilobytes.\n"
 	"Por favor altere o tamanho de cluster ou use FreeDOS."
@@ -12612,12 +12612,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Dispozitiv"
 t IDS_PARTITION_TYPE_TXT "Schema de partiționare și tipul sistemului țintă"
-t IDS_FILESYSTEM_TXT "Sistemul de fișiere"
-t IDS_CLUSTERSIZE_TXT "Mărimea unității de alocare"
+t IDS_FILE_SYSTEM_TXT "Sistemul de fișiere"
+t IDS_CLUSTER_SIZE_TXT "Mărimea unității de alocare"
 t IDS_LABEL_TXT "Eticheta noului volum"
 t IDS_FORMAT_OPTIONS_TXT "Opțiuni de formatare"
-t IDC_BADBLOCKS "Testează blocuri defecte"
-t IDC_QUICKFORMAT "Formatare rapidă"
+t IDC_BAD_BLOCKS "Testează blocuri defecte"
+t IDC_QUICK_FORMAT "Formatare rapidă"
 t IDC_EXTENDED_LABEL "Creează etichete extinse și pictograme"
 t IDCANCEL "Închide"
 t IDC_START "Începe"
@@ -13022,12 +13022,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Устройство"
 t IDS_PARTITION_TYPE_TXT "Схема раздела и тип системного интерфейса"
-t IDS_FILESYSTEM_TXT "Файловая система"
-t IDS_CLUSTERSIZE_TXT "Размер кластера"
+t IDS_FILE_SYSTEM_TXT "Файловая система"
+t IDS_CLUSTER_SIZE_TXT "Размер кластера"
 t IDS_LABEL_TXT "Новая метка тома"
 t IDS_FORMAT_OPTIONS_TXT "Параметры форматирования"
-t IDC_BADBLOCKS "Проверить на плохие блоки"
-t IDC_QUICKFORMAT "Быстрое форматирование"
+t IDC_BAD_BLOCKS "Проверить на плохие блоки"
+t IDC_QUICK_FORMAT "Быстрое форматирование"
 t IDC_EXTENDED_LABEL "Создать расширенную метку и значок устройства"
 t IDCANCEL "Закрыть"
 t IDC_START "Старт"
@@ -13445,13 +13445,13 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Uređaj"
 t IDS_PARTITION_TYPE_TXT "Particijska šema i ciljani sistem datoteka"
-t IDS_FILESYSTEM_TXT "Sistem datoteka"
-t IDS_CLUSTERSIZE_TXT "Veličina klastera"
+t IDS_FILE_SYSTEM_TXT "Sistem datoteka"
+t IDS_CLUSTER_SIZE_TXT "Veličina klastera"
 t IDS_LABEL_TXT "Naziv novog volumena"
 t IDS_FORMAT_OPTIONS_TXT "Podešavanja formata"
 # Note: The button (IDC_ADVANCED) that appears next to "Format Options" is repositioned automatically.
-t IDC_BADBLOCKS "Provjeri prisutnost neispravnih blokova"
-t IDC_QUICKFORMAT "Brzo formatiranje"
+t IDC_BAD_BLOCKS "Provjeri prisutnost neispravnih blokova"
+t IDC_QUICK_FORMAT "Brzo formatiranje"
 t IDC_EXTENDED_LABEL "Izradi produženu oznaku i ikone"
 t IDC_LOG "Zapisnik"
 t IDCANCEL "Zatvori"
@@ -13671,7 +13671,7 @@ t MSG_106 "Molimo odaberite folder"
 t MSG_107 "Sve datoteke"
 t MSG_108 "Rufus zapisnik"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS se ne može podići sa uređaja kod kojeg je veličina klastera 64 kilobajti.\n"
 	"Molimo promijenite veličinu klastera ili odaberite FreeDOS."
@@ -13912,12 +13912,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Zariadenie"
 t IDS_PARTITION_TYPE_TXT "Schéma oddielu a typ cieľového systému"
-t IDS_FILESYSTEM_TXT "Súborový systém"
-t IDS_CLUSTERSIZE_TXT "Veľkosť klastra"
+t IDS_FILE_SYSTEM_TXT "Súborový systém"
+t IDS_CLUSTER_SIZE_TXT "Veľkosť klastra"
 t IDS_LABEL_TXT "Nový názov zväzku"
 t IDS_FORMAT_OPTIONS_TXT "Nastavenia formátovania"
-t IDC_BADBLOCKS "Skontrolovať chybné bloky"
-t IDC_QUICKFORMAT "Rýchle formátovanie"
+t IDC_BAD_BLOCKS "Skontrolovať chybné bloky"
+t IDC_QUICK_FORMAT "Rýchle formátovanie"
 t IDC_EXTENDED_LABEL "Použiť poskytnutú menovku a súbory miniatúry"
 t IDCANCEL "Zatvoriť"
 t IDC_START "Štart"
@@ -14130,7 +14130,7 @@ t MSG_106 "Vyberte priečinok"
 t MSG_107 "Všetky súbory"
 t MSG_108 "Záznam programu Rufus"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS nemôže byť bootovaný z jednotky používajúcich klastre s veľkosťou 64kb.\n"
 	"Zmeňte veľkosť klastra alebo použite FREDOS."
@@ -14359,12 +14359,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Naprava"
 t IDS_PARTITION_TYPE_TXT "Particijska shema in vrsta ciljnega sistema"
-t IDS_FILESYSTEM_TXT "Datotečni sistem"
-t IDS_CLUSTERSIZE_TXT "Velikost gruče"
+t IDS_FILE_SYSTEM_TXT "Datotečni sistem"
+t IDS_CLUSTER_SIZE_TXT "Velikost gruče"
 t IDS_LABEL_TXT "Oznaka novega nosilca"
 t IDS_FORMAT_OPTIONS_TXT "Možnosti formatiranja"
-t IDC_BADBLOCKS "Odkrij slabe bloke"
-t IDC_QUICKFORMAT "Hitro formatiranje"
+t IDC_BAD_BLOCKS "Odkrij slabe bloke"
+t IDC_QUICK_FORMAT "Hitro formatiranje"
 t IDC_EXTENDED_LABEL "Ustvari datoteki za ikono in podaljšano oznako"
 t IDCANCEL "Zapri"
 t IDC_START "Začni"
@@ -14579,7 +14579,7 @@ t MSG_106 "Prosim, izberite mapo"
 t MSG_107 "Vse datoteke"
 t MSG_108 "Rufusov zapisnik"
 t MSG_109 "0x%02X (disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS se ne more zagnati s pogona, na katerem so gruče velike 64 KB.\n"
 	"Prosim, spremenite velikost gruče ali uporabite FreeDOS."
@@ -14792,12 +14792,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Dispositivo"
 t IDS_PARTITION_TYPE_TXT "Tipo de partición y del sistema destino"
-t IDS_FILESYSTEM_TXT "Sistema de archivos"
-t IDS_CLUSTERSIZE_TXT "Tamaño del clúster"
+t IDS_FILE_SYSTEM_TXT "Sistema de archivos"
+t IDS_CLUSTER_SIZE_TXT "Tamaño del clúster"
 t IDS_LABEL_TXT "Etiqueta nueva"
 t IDS_FORMAT_OPTIONS_TXT "Opciones de formateo"
-t IDC_BADBLOCKS "Buscar bloques dañados en USB"
-t IDC_QUICKFORMAT "Formateo rápido"
+t IDC_BAD_BLOCKS "Buscar bloques dañados en USB"
+t IDC_QUICK_FORMAT "Formateo rápido"
 t IDC_EXTENDED_LABEL "Añadir etiquetas extendidas e iconos"
 t IDCANCEL "Cerrar"
 t IDC_START "Empezar"
@@ -15006,7 +15006,7 @@ t MSG_106 "Seleccione una carpeta"
 t MSG_107 "Todos los archivos"
 t MSG_108 "Registro de eventos de Rufus"
 t MSG_109 "0x%02X (Disco %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS no puede arrancar desde un disco con un tamaño de clúster de 64 kilobytes.\n"
 	"Por favor cambie el tamaño del clúster o use FreeDOS."
@@ -15238,12 +15238,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Enhet"
 t IDS_PARTITION_TYPE_TXT "Partitionsschema och måltypssystem"
-t IDS_FILESYSTEM_TXT "Filsystem"
-t IDS_CLUSTERSIZE_TXT "Klusterstorlek"
+t IDS_FILE_SYSTEM_TXT "Filsystem"
+t IDS_CLUSTER_SIZE_TXT "Klusterstorlek"
 t IDS_LABEL_TXT "Ny volymetikett"
 t IDS_FORMAT_OPTIONS_TXT "Formateringsinställningar"
-t IDC_BADBLOCKS "Kontrollera enheten efter trasiga block"
-t IDC_QUICKFORMAT "Snabbformatering"
+t IDC_BAD_BLOCKS "Kontrollera enheten efter trasiga block"
+t IDC_QUICK_FORMAT "Snabbformatering"
 t IDC_EXTENDED_LABEL "Skapa utökat namn och ikonfiler"
 t IDCANCEL "Stäng"
 t IDC_START "Starta"
@@ -15456,7 +15456,7 @@ t MSG_106 "Välj mapp"
 t MSG_107 "Alla filer"
 t MSG_108 "Rufus logg"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS kan inte starta från en enhet som använder 64 kilobytes klusterstorlek.\n"
 	"Ändra klusterstorleken eller använd FreeDOS."
@@ -15684,13 +15684,13 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "อุปกรณ์"
 t IDS_PARTITION_TYPE_TXT "รูปแบบของพาร์ทิชั่นและรูปแบบของระบบของเครื่องเป้าหมาย"
-t IDS_FILESYSTEM_TXT "ระบบไฟล์"
-t IDS_CLUSTERSIZE_TXT "ขนาดของคลัสเตอร์"
+t IDS_FILE_SYSTEM_TXT "ระบบไฟล์"
+t IDS_CLUSTER_SIZE_TXT "ขนาดของคลัสเตอร์"
 t IDS_LABEL_TXT "ตั้งชื่อของไดร์ฟใหม่"
 t IDS_FORMAT_OPTIONS_TXT "ตัวเลือกการฟอร์แมท"
 # Note: The button (IDC_ADVANCED) that appears next to "Format Options" is repositioned automatically.
-t IDC_BADBLOCKS "ตรวจหาข้อบกพร่องของอุปกรณ์"
-t IDC_QUICKFORMAT "ฟอร์แมทอย่างรวดเร็ว"
+t IDC_BAD_BLOCKS "ตรวจหาข้อบกพร่องของอุปกรณ์"
+t IDC_QUICK_FORMAT "ฟอร์แมทอย่างรวดเร็ว"
 t IDC_EXTENDED_LABEL "สร้างชื่อไดร์ฟมาตรฐานอัตโนมัติและไอคอนของไดร์ฟ"
 t IDCANCEL "ปิด"
 t IDC_START "เริ่ม"
@@ -15902,7 +15902,7 @@ t MSG_106 "กรุณาเลือกโฟลเดอร์"
 t MSG_107 "ไฟล์ทั้งหมด"
 t MSG_108 "Rufus log"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS ไม่สามารถบูตไดร์ฟที่ใช้ขนาดของคลัสเตอร์ 64 kilobytes ได้\n"
 	"โปรดเปลี่ยนขนาดของคลัสเตอร์ หรือเลือกใช้ FreeDOS."
@@ -16144,12 +16144,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Aygıt"
 t IDS_PARTITION_TYPE_TXT "Disk Bölüm Düzeni ve Hedef Sistem Türü"
-t IDS_FILESYSTEM_TXT "Dosya Sistemi"
-t IDS_CLUSTERSIZE_TXT "Ayırma Birimi Boyutu"
+t IDS_FILE_SYSTEM_TXT "Dosya Sistemi"
+t IDS_CLUSTER_SIZE_TXT "Ayırma Birimi Boyutu"
 t IDS_LABEL_TXT "Yeni Birim Etiketi"
 t IDS_FORMAT_OPTIONS_TXT "Biçimlendirme Seçenekleri"
-t IDC_BADBLOCKS "Hatalı Bloklar için Aygıtı Denetle"
-t IDC_QUICKFORMAT "Hızlı Biçimlendir"
+t IDC_BAD_BLOCKS "Hatalı Bloklar için Aygıtı Denetle"
+t IDC_QUICK_FORMAT "Hızlı Biçimlendir"
 t IDC_EXTENDED_LABEL "Genişletilmiş Etiket ve Simge Dosyaları Oluştur"
 t IDCANCEL "Kapat"
 t IDC_START "Başlat"
@@ -16366,7 +16366,7 @@ t MSG_106 "Lütfen Klasör Seçin"
 t MSG_107 "Tüm Dosyalar"
 t MSG_108 "Rufus günlüğü"
 t MSG_109 "0x%02X (Disk %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS, 64 kilobyte Ayırma Birimi Boyutu kullanan bir sürücüden başlatılamaz.\n"
 	"Lütfen farklı bir Ayırma Birimi Boyutu seçin yada FreeDOS kullanın."
@@ -16595,12 +16595,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Пристрій"
 t IDS_PARTITION_TYPE_TXT "Схема розділу та тип системного інтерфейсу"
-t IDS_FILESYSTEM_TXT "Файлова система"
-t IDS_CLUSTERSIZE_TXT "Розмір кластера"
+t IDS_FILE_SYSTEM_TXT "Файлова система"
+t IDS_CLUSTER_SIZE_TXT "Розмір кластера"
 t IDS_LABEL_TXT "Нова мітка тому"
 t IDS_FORMAT_OPTIONS_TXT "Параметри форматування"
-t IDC_BADBLOCKS "Перевірити на погані блоки"
-t IDC_QUICKFORMAT "Швидке форматування"
+t IDC_BAD_BLOCKS "Перевірити на погані блоки"
+t IDC_QUICK_FORMAT "Швидке форматування"
 t IDC_EXTENDED_LABEL "Створити розширену мітку та значок пристрою"
 t IDCANCEL "Закрити"
 t IDC_START "Почати"
@@ -17024,12 +17024,12 @@ b "en-US"
 g IDD_DIALOG
 t IDS_DEVICE_TXT "Thiết bị"
 t IDS_PARTITION_TYPE_TXT "Sắp xếp phân vùng và loại hệ thống"
-t IDS_FILESYSTEM_TXT "Hệ thống tập tin"
-t IDS_CLUSTERSIZE_TXT "Kích thước liên cung"
+t IDS_FILE_SYSTEM_TXT "Hệ thống tập tin"
+t IDS_CLUSTER_SIZE_TXT "Kích thước liên cung"
 t IDS_LABEL_TXT "Tên đĩa mới"
 t IDS_FORMAT_OPTIONS_TXT "Tùy chọn định dạng"
-t IDC_BADBLOCKS "Kiểm tra khối hỏng trong thiết bị"
-t IDC_QUICKFORMAT "Định dạng nhanh"
+t IDC_BAD_BLOCKS "Kiểm tra khối hỏng trong thiết bị"
+t IDC_QUICK_FORMAT "Định dạng nhanh"
 t IDC_EXTENDED_LABEL "Tạo tên mở rộng và tập tin biểu tượng"
 t IDCANCEL "Đóng"
 t IDC_START "Bắt đầu"
@@ -17244,7 +17244,7 @@ t MSG_106 "Vui lòng chọn thư mục"
 t MSG_107 "Tất cả tập tin"
 t MSG_108 "Nhật kýRufus"
 t MSG_109 "0x%02X (Đĩa %d)"
-# "Cluster size" below should be the same as the label for IDS_CLUSTERSIZE_TXT
+# "Cluster size" below should be the same as the label for IDS_CLUSTER_SIZE_TXT
 # "kilobytes" should be the same as in MSG_027
 t MSG_110 "MS-DOS không thể khởi động từ ổ đĩa dùng kích thước liên cung 64 kilobyte.\n"
 	"Vui lòng thay đổi kích thước liên cung hoặc dùng FreeDOS."
diff --git a/src/dev.c b/src/dev.c
index 07da6762..5c742bd1 100644
--- a/src/dev.c
+++ b/src/dev.c
@@ -845,7 +845,7 @@ BOOL GetDevices(DWORD devnum)
 		i = 0;
 	IGNORE_RETVAL(ComboBox_SetCurSel(hDeviceList, i));
 	SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE<<16) | IDC_DEVICE, 0);
-	SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE<<16) | IDC_FILESYSTEM,
+	SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE<<16) | IDC_FILE_SYSTEM,
 		ComboBox_GetCurSel(hFileSystem));
 	r = TRUE;
 
diff --git a/src/format.c b/src/format.c
index 7e67caa4..5fe0dadd 100644
--- a/src/format.c
+++ b/src/format.c
@@ -749,9 +749,9 @@ static BOOL FormatDrive(DWORD DriveIndex)
 	task_number = 0;
 	fs_index = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem));
 
-	uprintf("%s format was selected\n", IsChecked(IDC_QUICKFORMAT)?"Quick":"Slow");
+	uprintf("%s format was selected\n", IsChecked(IDC_QUICK_FORMAT)?"Quick":"Slow");
 	pfFormatEx(wVolumeName, SelectedDrive.MediaType, wFSType, wLabel,
-		IsChecked(IDC_QUICKFORMAT), ulClusterSize, FormatExCallback);
+		IsChecked(IDC_QUICK_FORMAT), ulClusterSize, FormatExCallback);
 
 	if ((fs == FS_NTFS) && (enable_ntfs_compression) && (pfEnableVolumeCompression != NULL)) {
 		wVolumeName[wcslen(wVolumeName)] = '\\';	// Add trailing backslash back again
@@ -1755,7 +1755,7 @@ DWORD WINAPI FormatThread(void* param)
 		}
 	}
 
-	if (IsChecked(IDC_BADBLOCKS)) {
+	if (IsChecked(IDC_BAD_BLOCKS)) {
 		do {
 			// create a log file for bad blocks report. Since %USERPROFILE% may
 			// have localized characters, we use the UTF-8 API.
diff --git a/src/localization_data.h b/src/localization_data.h
index 900ef313..27a5f21c 100644
--- a/src/localization_data.h
+++ b/src/localization_data.h
@@ -38,17 +38,17 @@ const loc_control_id control_id[] = {
 	LOC_CTRL(IDD_CHECKSUM),
 	LOC_CTRL(IDD_LIST),
 	LOC_CTRL(IDC_DEVICE),
-	LOC_CTRL(IDC_FILESYSTEM),
+	LOC_CTRL(IDC_FILE_SYSTEM),
 	LOC_CTRL(IDC_START),
 	LOC_CTRL(IDC_PARTITION_TYPE),
-	LOC_CTRL(IDC_CLUSTERSIZE),
+	LOC_CTRL(IDC_CLUSTER_SIZE),
 	LOC_CTRL(IDC_STATUS),
 	LOC_CTRL(IDC_LABEL),
-	LOC_CTRL(IDC_QUICKFORMAT),
-	LOC_CTRL(IDC_BADBLOCKS),
+	LOC_CTRL(IDC_QUICK_FORMAT),
+	LOC_CTRL(IDC_BAD_BLOCKS),
 	LOC_CTRL(IDC_PROGRESS),
-	LOC_CTRL(IDC_BOOT_TYPE),
-	LOC_CTRL(IDC_NBPASSES),
+	LOC_CTRL(IDC_BOOT_SELECTION),
+	LOC_CTRL(IDC_NB_PASSES),
 	LOC_CTRL(IDC_TEST),
 	LOC_CTRL(IDC_SELECT),
 	LOC_CTRL(IDC_EXTENDED_LABEL),
@@ -136,8 +136,8 @@ const loc_control_id control_id[] = {
 	LOC_CTRL(IDC_ADVANCED_FORMAT_OPTIONS),
 	LOC_CTRL(IDS_DEVICE_TXT),
 	LOC_CTRL(IDS_PARTITION_TYPE_TXT),
-	LOC_CTRL(IDS_FILESYSTEM_TXT),
-	LOC_CTRL(IDS_CLUSTERSIZE_TXT),
+	LOC_CTRL(IDS_FILE_SYSTEM_TXT),
+	LOC_CTRL(IDS_CLUSTER_SIZE_TXT),
 	LOC_CTRL(IDS_LABEL_TXT),
 	LOC_CTRL(IDS_CSM_HELP_TXT),
 	LOC_CTRL(IDS_UPDATE_SETTINGS_GRP),
@@ -149,7 +149,7 @@ const loc_control_id control_id[] = {
 	LOC_CTRL(IDS_CHECK_NOW_GRP),
 	LOC_CTRL(IDS_TARGET_SYSTEM_TXT),
 	LOC_CTRL(IDS_IMAGE_OPTION_TXT),
-	LOC_CTRL(IDS_BOOT_TYPE_TXT),
+	LOC_CTRL(IDS_BOOT_SELECTION_TXT),
 	LOC_CTRL(IDS_DRIVE_PROPERTIES_TXT),
 	LOC_CTRL(IDS_FORMAT_OPTIONS_TXT),
 	LOC_CTRL(IDS_STATUS_TXT),
diff --git a/src/resource.h b/src/resource.h
index 7268a5ec..3fd4d108 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -74,17 +74,17 @@
 #define IDR_TOGO_SAN_POLICY_XML         503
 #define IDR_TOGO_UNATTEND_XML           504
 #define IDC_DEVICE                      1001
-#define IDC_FILESYSTEM                  1002
+#define IDC_FILE_SYSTEM                 1002
 #define IDC_START                       1003
 #define IDC_PARTITION_TYPE              1004
-#define IDC_CLUSTERSIZE                 1005
+#define IDC_CLUSTER_SIZE                1005
 #define IDC_STATUS                      1006
 #define IDC_LABEL                       1007
-#define IDC_QUICKFORMAT                 1008
-#define IDC_BADBLOCKS                   1009
+#define IDC_QUICK_FORMAT                1008
+#define IDC_BAD_BLOCKS                  1009
 #define IDC_PROGRESS                    1010
-#define IDC_BOOT_TYPE                   1011
-#define IDC_NBPASSES                    1012
+#define IDC_BOOT_SELECTION              1011
+#define IDC_NB_PASSES                   1012
 #define IDC_TEST                        1013
 #define IDC_SELECT                      1014
 #define IDC_EXTENDED_LABEL              1015
@@ -172,8 +172,8 @@
 #define IDC_ADVANCED_FORMAT_OPTIONS     1113
 #define IDS_DEVICE_TXT                  2000
 #define IDS_PARTITION_TYPE_TXT          2001
-#define IDS_FILESYSTEM_TXT              2002
-#define IDS_CLUSTERSIZE_TXT             2003
+#define IDS_FILE_SYSTEM_TXT             2002
+#define IDS_CLUSTER_SIZE_TXT            2003
 #define IDS_LABEL_TXT                   2004
 #define IDS_CSM_HELP_TXT                2005
 #define IDS_UPDATE_SETTINGS_GRP         2006
@@ -185,7 +185,7 @@
 #define IDS_CHECK_NOW_GRP               2012
 #define IDS_TARGET_SYSTEM_TXT           2013
 #define IDS_IMAGE_OPTION_TXT            2014
-#define IDS_BOOT_TYPE_TXT               2015
+#define IDS_BOOT_SELECTION_TXT          2015
 #define IDS_DRIVE_PROPERTIES_TXT        2016
 #define IDS_FORMAT_OPTIONS_TXT          2017
 #define IDS_STATUS_TXT                  2018
diff --git a/src/rufus.c b/src/rufus.c
index 72a104a9..78db90bd 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -597,7 +597,7 @@ static void SetFSFromISO(void)
 			IGNORE_RETVAL(ComboBox_SetCurSel(hFileSystem, i));
 	}
 
-	SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE<<16) | IDC_FILESYSTEM,
+	SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE<<16) | IDC_FILE_SYSTEM,
 		ComboBox_GetCurSel(hFileSystem));
 }
 
@@ -684,9 +684,9 @@ static void EnableBootOptions(BOOL enable, BOOL remove_checkboxes)
 	EnableMBRBootOptions(actual_enable, remove_checkboxes);
 
 	EnableWindow(GetDlgItem(hMainDialog, IDC_LABEL), actual_enable);
-	EnableWindow(GetDlgItem(hMainDialog, IDC_QUICKFORMAT), actual_enable);
-	EnableWindow(GetDlgItem(hMainDialog, IDC_BADBLOCKS), actual_enable_bb);
-	EnableWindow(GetDlgItem(hMainDialog, IDC_NBPASSES), actual_enable_bb);
+	EnableWindow(GetDlgItem(hMainDialog, IDC_QUICK_FORMAT), actual_enable);
+	EnableWindow(GetDlgItem(hMainDialog, IDC_BAD_BLOCKS), actual_enable_bb);
+	EnableWindow(GetDlgItem(hMainDialog, IDC_NB_PASSES), actual_enable_bb);
 	EnableWindow(GetDlgItem(hMainDialog, IDC_EXTENDED_LABEL), actual_enable);
 }
 
@@ -830,7 +830,7 @@ static void InitProgress(BOOL bOnlyFormat)
 		nb_slots[OP_FORMAT] = -1;
 	} else {
 		nb_slots[OP_ANALYZE_MBR] = 1;
-		if (IsChecked(IDC_BADBLOCKS)) {
+		if (IsChecked(IDC_BAD_BLOCKS)) {
 			nb_slots[OP_BADBLOCKS] = -1;
 		}
 		if (bt != BT_NON_BOOTABLE) {
@@ -858,7 +858,7 @@ static void InitProgress(BOOL bOnlyFormat)
 			nb_slots[OP_FIX_MBR] = 1;
 			nb_slots[OP_CREATE_FS] =
 				nb_steps[ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem))];
-			if ( (!IsChecked(IDC_QUICKFORMAT))
+			if ( (!IsChecked(IDC_QUICK_FORMAT))
 			  || ((fs == FS_FAT32) && ((SelectedDrive.DiskSize >= LARGE_FAT32_SIZE) || (force_large_fat32))) ) {
 				nb_slots[OP_FORMAT] = -1;
 			}
@@ -1372,7 +1372,7 @@ DWORD WINAPI ISOScanThread(LPVOID param)
 			SetMBRProps();
 			SetProposedLabel(ComboBox_GetCurSel(hDeviceList));
 		} else {
-			SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE << 16) | IDC_FILESYSTEM,
+			SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE << 16) | IDC_FILE_SYSTEM,
 				ComboBox_GetCurSel(hFileSystem));
 		}
 		// Lose the focus on the select ISO (but place it on Close)
@@ -2013,7 +2013,7 @@ static void GetHalfDropwdownWidth(HWND hDlg)
 			msg_id++;
 		}
 		safe_sprintf(tmp, 64, "%d %s", i, lmprintf(msg_id));
-		hw = max(hw, GetTextSize(GetDlgItem(hDlg, IDC_CLUSTERSIZE), lmprintf(MSG_030, tmp)).cx);
+		hw = max(hw, GetTextSize(GetDlgItem(hDlg, IDC_CLUSTER_SIZE), lmprintf(MSG_030, tmp)).cx);
 	}
 	// We don't go over file systems, because none of them will be longer than "Super Floppy Disk"
 	// We do however go over the BIOS vs UEFI entries, as some of these are translated
@@ -2028,7 +2028,7 @@ static void GetHalfDropwdownWidth(HWND hDlg)
 	// Finally, we must ensure that we'll have enough space for the 2 checkbox controls
 	// that end up with a half dropdown
 	hw = max(hw, GetTextWidth(hDlg, IDC_RUFUS_MBR) - sw);
-	hw = max(hw, GetTextWidth(hDlg, IDC_BADBLOCKS) - sw);
+	hw = max(hw, GetTextWidth(hDlg, IDC_BAD_BLOCKS) - sw);
 
 	// Add the width of a blank dropdown
 	hw += ddw;
@@ -2057,7 +2057,7 @@ static void GetFullWidth(HWND hDlg)
 	int i;
 
 	// Compute the minimum size needed for the Boot Selection dropdown
-	GetWindowRect(GetDlgItem(hDlg, IDC_BOOT_TYPE), &rc);
+	GetWindowRect(GetDlgItem(hDlg, IDC_BOOT_SELECTION), &rc);
 	MapWindowPoints(NULL, hDlg, (POINT*)&rc, 2);
 
 	bsw = max(rc.right - rc.left, GetTextSize(hBootType, lmprintf(MSG_279)).cx + ddw);
@@ -2155,7 +2155,7 @@ static void PositionControls(HWND hDlg)
 	SetWindowPos(hProgress, NULL, rc.left, rc.top, rc.right - rc.left, dropdown_height, SWP_NOZORDER);
 
 	// Get the height of a typical row
-	hCtrl = GetDlgItem(hDlg, IDS_BOOT_TYPE_TXT);
+	hCtrl = GetDlgItem(hDlg, IDS_BOOT_SELECTION_TXT);
 	GetWindowRect(hCtrl, &rc);
 	MapWindowPoints(NULL, hDlg, (POINT*)&rc, 2);
 	row_height = rc.top;
@@ -2174,7 +2174,7 @@ static void PositionControls(HWND hDlg)
 	MapWindowPoints(NULL, hDlg, (POINT*)&rc, 2);
 	advanced_device_section_height = rc.bottom - advanced_device_section_height;
 
-	hCtrl = GetDlgItem(hDlg, IDC_QUICKFORMAT);
+	hCtrl = GetDlgItem(hDlg, IDC_QUICK_FORMAT);
 	GetWindowRect(hCtrl, &rc);
 	MapWindowPoints(NULL, hDlg, (POINT*)&rc, 2);
 	advanced_format_section_height = rc.top;
@@ -2265,7 +2265,7 @@ static void PositionControls(HWND hDlg)
 	}
 
 	// Resize the boot selection dropdown
-	hCtrl = GetDlgItem(hDlg, IDC_BOOT_TYPE);
+	hCtrl = GetDlgItem(hDlg, IDC_BOOT_SELECTION);
 	GetWindowRect(hCtrl, &rc);
 	MapWindowPoints(NULL, hDlg, (POINT*)&rc, 2);
 	SetWindowPos(hCtrl, HWND_TOP, rc.left, rc.top, bsw, rc.bottom - rc.top, 0);
@@ -2280,7 +2280,7 @@ static void PositionControls(HWND hDlg)
 	SetWindowPos(hCtrl, NULL, rc.left, sz.cy - 1,
 		rc.right - rc.left, dropdown_height + button_fudge, SWP_NOZORDER);
 
-	hCtrl = GetDlgItem(hDlg, IDC_BOOT_TYPE);
+	hCtrl = GetDlgItem(hDlg, IDC_BOOT_SELECTION);
 	GetWindowRect(hCtrl, &rcSelectedImage);
 	MapWindowPoints(NULL, hDlg, (POINT*)&rcSelectedImage, 2);
 	hCtrl = GetDlgItem(hDlg, IDC_HASH);
@@ -2325,13 +2325,13 @@ static void InitDialog(HWND hDlg)
 	hDeviceList = GetDlgItem(hDlg, IDC_DEVICE);
 	hPartitionScheme = GetDlgItem(hDlg, IDC_PARTITION_TYPE);
 	hTargetSystem = GetDlgItem(hDlg, IDC_TARGET_SYSTEM);
-	hFileSystem = GetDlgItem(hDlg, IDC_FILESYSTEM);
-	hClusterSize = GetDlgItem(hDlg, IDC_CLUSTERSIZE);
+	hFileSystem = GetDlgItem(hDlg, IDC_FILE_SYSTEM);
+	hClusterSize = GetDlgItem(hDlg, IDC_CLUSTER_SIZE);
 	hLabel = GetDlgItem(hDlg, IDC_LABEL);
 	hProgress = GetDlgItem(hDlg, IDC_PROGRESS);
-	hBootType = GetDlgItem(hDlg, IDC_BOOT_TYPE);
+	hBootType = GetDlgItem(hDlg, IDC_BOOT_SELECTION);
 	hSelectImage = GetDlgItem(hDlg, IDC_SELECT);
-	hNBPasses = GetDlgItem(hDlg, IDC_NBPASSES);
+	hNBPasses = GetDlgItem(hDlg, IDC_NB_PASSES);
 	hDiskID = GetDlgItem(hDlg, IDC_DISK_ID);
 	hStart = GetDlgItem(hDlg, IDC_START);
 
@@ -2436,7 +2436,7 @@ static void InitDialog(HWND hDlg)
 	StrArrayCreate(&BlockingProcess, 16);
 	StrArrayCreate(&ImageList, 16);
 	// Set various checkboxes
-	CheckDlgButton(hDlg, IDC_QUICKFORMAT, BST_CHECKED);
+	CheckDlgButton(hDlg, IDC_QUICK_FORMAT, BST_CHECKED);
 	CheckDlgButton(hDlg, IDC_EXTENDED_LABEL, BST_CHECKED);
 
 	CreateAdditionalControls(hDlg);
@@ -2454,8 +2454,8 @@ static void InitDialog(HWND hDlg)
 	CreateTooltip(hLabel, lmprintf(MSG_159), -1);
 	CreateTooltip(hAdvancedDeviceToolbar, lmprintf(MSG_160), -1);
 	CreateTooltip(hAdvancedFormatToolbar, lmprintf(MSG_160), -1);
-	CreateTooltip(GetDlgItem(hDlg, IDC_BADBLOCKS), lmprintf(MSG_161), -1);
-	CreateTooltip(GetDlgItem(hDlg, IDC_QUICKFORMAT), lmprintf(MSG_162), -1);
+	CreateTooltip(GetDlgItem(hDlg, IDC_BAD_BLOCKS), lmprintf(MSG_161), -1);
+	CreateTooltip(GetDlgItem(hDlg, IDC_QUICK_FORMAT), lmprintf(MSG_162), -1);
 	CreateTooltip(hBootType, lmprintf(MSG_164), -1);
 	CreateTooltip(hSelectImage, lmprintf(MSG_165), -1);
 	CreateTooltip(GetDlgItem(hDlg, IDC_EXTENDED_LABEL), lmprintf(MSG_166), 10000);
@@ -2860,7 +2860,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 			bt = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType));
 			EnableControls(TRUE);
 			SetFileSystemAndClusterSize(NULL);
-			SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE << 16) | IDC_FILESYSTEM,
+			SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE << 16) | IDC_FILE_SYSTEM,
 				ComboBox_GetCurSel(hFileSystem));
 			break;
 		case IDC_ADVANCED_FORMAT_OPTIONS:
@@ -2882,12 +2882,12 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 			nb_devices = ComboBox_GetCount(hDeviceList);
 			PrintStatusDebug(0, (nb_devices==1)?MSG_208:MSG_209, nb_devices);
 			PopulateProperties(ComboBox_GetCurSel(hDeviceList));
-			SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE<<16) | IDC_FILESYSTEM,
+			SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE<<16) | IDC_FILE_SYSTEM,
 				ComboBox_GetCurSel(hFileSystem));
 			nDeviceIndex = ComboBox_GetCurSel(hDeviceList);
 			DeviceNum = (nDeviceIndex == CB_ERR) ? 0 : (DWORD)ComboBox_GetItemData(hDeviceList, nDeviceIndex);
 			break;
-		case IDC_NBPASSES:
+		case IDC_NB_PASSES:
 			if (HIWORD(wParam) != CBN_SELCHANGE)
 				break;
 			SetPassesTooltip();
@@ -2907,22 +2907,22 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 			SetFileSystemAndClusterSize(NULL);
 			EnableMBRBootOptions(TRUE, FALSE);
 			break;
-		case IDC_FILESYSTEM:
+		case IDC_FILE_SYSTEM:
 			if (HIWORD(wParam) != CBN_SELCHANGE)
 				break;
 			fs = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem));
 			SetClusterSizes(fs);
 			// Disable/restore the quick format control depending on large FAT32 or ReFS
 			if ( ((fs == FS_FAT32) && ((SelectedDrive.DiskSize > LARGE_FAT32_SIZE) || (force_large_fat32))) || (fs == FS_REFS) ) {
-				if (IsWindowEnabled(GetDlgItem(hMainDialog, IDC_QUICKFORMAT))) {
-					uQFChecked = IsChecked(IDC_QUICKFORMAT);
-					CheckDlgButton(hMainDialog, IDC_QUICKFORMAT, BST_CHECKED);
-					EnableWindow(GetDlgItem(hMainDialog, IDC_QUICKFORMAT), FALSE);
+				if (IsWindowEnabled(GetDlgItem(hMainDialog, IDC_QUICK_FORMAT))) {
+					uQFChecked = IsChecked(IDC_QUICK_FORMAT);
+					CheckDlgButton(hMainDialog, IDC_QUICK_FORMAT, BST_CHECKED);
+					EnableWindow(GetDlgItem(hMainDialog, IDC_QUICK_FORMAT), FALSE);
 				}
 			} else {
-				if (!IsWindowEnabled(GetDlgItem(hMainDialog, IDC_QUICKFORMAT))) {
-					CheckDlgButton(hMainDialog, IDC_QUICKFORMAT, uQFChecked);
-					EnableWindow(GetDlgItem(hMainDialog, IDC_QUICKFORMAT), TRUE);
+				if (!IsWindowEnabled(GetDlgItem(hMainDialog, IDC_QUICK_FORMAT))) {
+					CheckDlgButton(hMainDialog, IDC_QUICK_FORMAT, uQFChecked);
+					EnableWindow(GetDlgItem(hMainDialog, IDC_QUICK_FORMAT), TRUE);
 				}
 			}
 			if (fs < 0) {
@@ -2939,7 +2939,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 			EnableMBRBootOptions(TRUE, FALSE);
 			SetMBRProps();
 			break;
-		case IDC_BOOT_TYPE:
+		case IDC_BOOT_SELECTION:
 			bt = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType));
 			if ((HIWORD(wParam) != CBN_SELCHANGE) || (bt == selection_default))
 				break;
diff --git a/src/rufus.rc b/src/rufus.rc
index 5314f614..ec6da35f 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -40,8 +40,8 @@ BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,8,22,216,8
     COMBOBOX        IDC_DEVICE,8,31,196,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_SAVE,210,31,14,10,BS_ICON
-    LTEXT           "Boot selection",IDS_BOOT_TYPE_TXT,8,44,216,8
-    COMBOBOX        IDC_BOOT_TYPE,8,53,148,10,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    LTEXT           "Boot selection",IDS_BOOT_SELECTION_TXT,8,44,216,8
+    COMBOBOX        IDC_BOOT_SELECTION,8,53,148,10,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
     PUSHBUTTON      "#",IDC_HASH,162,53,10,10,BS_ICON
     PUSHBUTTON      "SELECT",IDC_SELECT,180,53,45,10
     LTEXT           "Image option",IDS_IMAGE_OPTION_TXT,8,66,216,8
@@ -61,15 +61,15 @@ BEGIN
     LTEXT           "Format Options",IDS_FORMAT_OPTIONS_TXT,8,152,57,12,NOT WS_GROUP
     LTEXT           "Volume label",IDS_LABEL_TXT,8,166,216,8
     EDITTEXT        IDC_LABEL,8,175,216,12,ES_AUTOHSCROLL
-    LTEXT           "File system",IDS_FILESYSTEM_TXT,8,188,96,8
-    COMBOBOX        IDC_FILESYSTEM,8,197,96,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Cluster size",IDS_CLUSTERSIZE_TXT,128,188,96,8
-    COMBOBOX        IDC_CLUSTERSIZE,128,197,96,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "File system",IDS_FILE_SYSTEM_TXT,8,188,96,8
+    COMBOBOX        IDC_FILE_SYSTEM,8,197,96,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Cluster size",IDS_CLUSTER_SIZE_TXT,128,188,96,8
+    COMBOBOX        IDC_CLUSTER_SIZE,128,197,96,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Show advanced format options",IDC_ADVANCED_FORMAT_OPTIONS,
                     "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,8,210,216,10
-    CONTROL         "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,220,216,10
-    CONTROL         "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,230,112,10
-    COMBOBOX        IDC_NBPASSES,128,230,96,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Quick format",IDC_QUICK_FORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,220,216,10
+    CONTROL         "Check device for bad blocks",IDC_BAD_BLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,230,112,10
+    COMBOBOX        IDC_NB_PASSES,128,230,96,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Create extended label and icon files",IDC_EXTENDED_LABEL,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,240,216,10
     LTEXT           "Status",IDS_STATUS_TXT,8,252,23,9,NOT WS_GROUP
diff --git a/src/ui.h b/src/ui.h
index 1fd8d384..e1cfa090 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -36,14 +36,14 @@ static int image_option_move_ids[] = {
 	IDS_FORMAT_OPTIONS_TXT,
 	IDS_LABEL_TXT,
 	IDC_LABEL,
-	IDS_FILESYSTEM_TXT,
-	IDC_FILESYSTEM,
-	IDS_CLUSTERSIZE_TXT,
-	IDC_CLUSTERSIZE,
+	IDS_FILE_SYSTEM_TXT,
+	IDC_FILE_SYSTEM,
+	IDS_CLUSTER_SIZE_TXT,
+	IDC_CLUSTER_SIZE,
 	IDC_ADVANCED_FORMAT_TOOLBAR,
-	IDC_QUICKFORMAT,
-	IDC_BADBLOCKS,
-	IDC_NBPASSES,
+	IDC_QUICK_FORMAT,
+	IDC_BAD_BLOCKS,
+	IDC_NB_PASSES,
 	IDC_EXTENDED_LABEL,
 	IDS_STATUS_TXT,
 	IDC_PROGRESS,
@@ -69,14 +69,14 @@ static int advanced_device_move_ids[] = {
 	IDS_FORMAT_OPTIONS_TXT,
 	IDS_LABEL_TXT,
 	IDC_LABEL,
-	IDS_FILESYSTEM_TXT,
-	IDC_FILESYSTEM,
-	IDS_CLUSTERSIZE_TXT,
-	IDC_CLUSTERSIZE,
+	IDS_FILE_SYSTEM_TXT,
+	IDC_FILE_SYSTEM,
+	IDS_CLUSTER_SIZE_TXT,
+	IDC_CLUSTER_SIZE,
 	IDC_ADVANCED_FORMAT_TOOLBAR,
-	IDC_QUICKFORMAT,
-	IDC_BADBLOCKS,
-	IDC_NBPASSES,
+	IDC_QUICK_FORMAT,
+	IDC_BAD_BLOCKS,
+	IDC_NB_PASSES,
 	IDC_EXTENDED_LABEL,
 	IDS_STATUS_TXT,
 	IDC_PROGRESS,
@@ -112,21 +112,21 @@ static int advanced_format_move_ids[] = {
 };
 
 static int advanced_format_toggle_ids[] = {
-	IDC_QUICKFORMAT,
-	IDC_BADBLOCKS,
-	IDC_NBPASSES,
+	IDC_QUICK_FORMAT,
+	IDC_BAD_BLOCKS,
+	IDC_NB_PASSES,
 	IDC_EXTENDED_LABEL,
 };
 
 static int dd_image_toggle_ids[] = {
-	IDC_QUICKFORMAT,
+	IDC_QUICK_FORMAT,
 	IDC_PARTITION_TYPE,
 	IDC_TARGET_SYSTEM,
 	IDC_IMAGE_OPTION,
-	IDC_FILESYSTEM,
-	IDC_CLUSTERSIZE,
+	IDC_FILE_SYSTEM,
+	IDC_CLUSTER_SIZE,
 	IDC_LABEL,
-	IDC_QUICKFORMAT,
+	IDC_QUICK_FORMAT,
 	IDC_EXTENDED_LABEL,
 };
 
@@ -138,7 +138,7 @@ static int main_button_ids[] = {
 
 static int full_width_controls[] = {
 	IDS_DEVICE_TXT,
-	IDS_BOOT_TYPE_TXT,
+	IDS_BOOT_SELECTION_TXT,
 	IDS_IMAGE_OPTION_TXT,
 	IDC_IMAGE_OPTION,
 	IDS_LABEL_TXT,
@@ -147,7 +147,7 @@ static int full_width_controls[] = {
 	IDC_LIST_USB_HDD,
 	IDC_OLD_BIOS_FIXES,
 	IDC_ADVANCED_FORMAT_OPTIONS,
-	IDC_QUICKFORMAT,
+	IDC_QUICK_FORMAT,
 	IDC_EXTENDED_LABEL,
 	IDC_PROGRESS,
 };
@@ -155,20 +155,20 @@ static int full_width_controls[] = {
 static int full_width_checkboxes[] = {
 	IDC_LIST_USB_HDD,
 	IDC_OLD_BIOS_FIXES,
-	IDC_QUICKFORMAT,
+	IDC_QUICK_FORMAT,
 	IDC_EXTENDED_LABEL,
 };
 
 static int half_width_ids[] = {
-	IDC_BADBLOCKS,
+	IDC_BAD_BLOCKS,
 	IDC_RUFUS_MBR,
 	IDS_PARTITION_TYPE_TXT,
 	IDC_PARTITION_TYPE,
-	IDC_FILESYSTEM,
+	IDC_FILE_SYSTEM,
 	IDS_TARGET_SYSTEM_TXT,
 	IDC_TARGET_SYSTEM,
 	IDC_DISK_ID,
-	IDS_CLUSTERSIZE_TXT,
-	IDC_CLUSTERSIZE,
-	IDC_NBPASSES,
+	IDS_CLUSTER_SIZE_TXT,
+	IDC_CLUSTER_SIZE,
+	IDC_NB_PASSES,
 };