diff --git a/Installer/clang-format-style-file b/Installer/clang_format_style_file
similarity index 100%
rename from Installer/clang-format-style-file
rename to Installer/clang_format_style_file
diff --git a/Installer/geth-windows-builder-gpg-key.asc b/Installer/geth_windows_builder_gpg_key.asc
similarity index 100%
rename from Installer/geth-windows-builder-gpg-key.asc
rename to Installer/geth_windows_builder_gpg_key.asc
diff --git a/Tools/download_windows_symbols_pdb.bat b/Tools/download_windows_symbols_pdb.bat
new file mode 100644
index 0000000..ad498f4
--- /dev/null
+++ b/Tools/download_windows_symbols_pdb.bat
@@ -0,0 +1,13 @@
+@echo off
+set dest_dir="%~dp0Windows_Symbols_PDBs"
+set symchk="C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symchk.exe"
+
+if not exist %symchk% (
+    echo Symchk binary not found but is required to run script [path=%symchk%]
+    exit /b 1
+)
+
+if not exist %dest_dir% mkdir %dest_dir%
+echo Downloading to %dest_dir% with %symchk%
+%symchk% /r C:\Windows /s srv*%dest_dir%*https://msdl.microsoft.com/download/symbols
+goto :eof
diff --git a/win32_install.bat b/win32_install.bat
index 22ab036..d5293ce 100644
--- a/win32_install.bat
+++ b/win32_install.bat
@@ -461,7 +461,7 @@ REM uncap: Bind capslock to escape via run-time program
 call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_ctags.exe" "!bin_dir!\ctags.exe" || exit /B
 call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_scanmapset.exe" "!bin_dir!\scanmapset.exe" || exit /B
 call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_uncap.exe" "!bin_dir!\uncap.exe" || exit /B
-call :CopyAndAlwaysOverwriteFile "!install_dir!\clang-format-style-file" "!home_dir!\_clang-format" || exit /B
+call :CopyAndAlwaysOverwriteFile "!install_dir!\clang_format_style_file" "!home_dir!\_clang-format" || exit /B
 
 REM ------------------------------------------------------------------------
 REM MobaXTerm
@@ -561,7 +561,7 @@ if !install_geth! == 1 (
     set geth_dir=!tools_dir!\geth-windows-amd64-!geth_version!
     set geth_exe=!geth_dir!\geth.exe
 
-    set geth_gpg_key=!downloads_dir!\..\geth-windows-builder-gpg-key.asc
+    set geth_gpg_key=!downloads_dir!\..\geth_windows_builder_gpg_key.asc
     set geth_gpg_sig=!geth_zip!.asc
 
     if not exist "!geth_exe!" (