diff --git a/image/finish-boot.cmd b/image/finish-boot.cmd
index 5e213d9..d5bfcfb 100644
--- a/image/finish-boot.cmd
+++ b/image/finish-boot.cmd
@@ -2,7 +2,7 @@
 set SOURCES=%SystemDrive%\TEMP\W10\sources
 set BOOT=%SystemDrive%\TEMP\BOOT
 set SCRIPT_SETTINGS=..\scripts\settings.cmd
-set COMPANY_SETTINGS=..\company\settings.cmd
+set CUSTOM_SETTINGS=..\customsettings.cmd
 set LANG=en-US
 set localadmin=localadmin
 set localadmin_name=Local Administrator
@@ -21,12 +21,12 @@ if NOT EXIST %SCRIPT_SETTINGS% (
 )
 echo.
 
-echo searching for COMPANY settings ...
-if NOT EXIST %COMPANY_SETTINGS% (
-  echo INFO: config file %COMPANY_SETTINGS% NOT FOUND
+echo searching for CUSTOM settings ...
+if NOT EXIST %CUSTOM_SETTINGS% (
+  echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND
 ) else (
-  echo OK. Loading COMPANY settings ...
-  call %COMPANY_SETTINGS%
+  echo OK. Loading CUSTOM settings ...
+  call %CUSTOM_SETTINGS%
 )
 echo.
 
@@ -60,9 +60,9 @@ rem prepare BIOS version ...
 ..\tools\searchreplace %BOOT%\autounattend.xml ___MYLANG___ "%LANG%"
 echo.
 
-if EXIST ..\company\snapshot64.exe (
+if EXIST ..\software\snapshot64-licensed.exe (
   echo copying LICENSED snapshot64.exe to boot image ...
-  copy /Y ..\company\snapshot64.exe %BOOT% 
+  copy /Y ..\software\snapshot64-licensed.exe %BOOT%\snapshot64.exe
 ) else (
   echo copying STANDARD snapshot64.exe to boot image ...
   copy /Y ..\software\snapshot64.exe %BOOT%
diff --git a/software/other.csv b/software/other.csv
index f45f3c4..0ff5e46 100644
--- a/software/other.csv
+++ b/software/other.csv
@@ -8,3 +8,5 @@ dummy vce_exam_simulator_setup.exe
 dummy iview-plugins.zip
 dummy chrome-setup.msi
 dummy VMRC-setup.exe
+dummy snapshot64.exe
+