diff --git a/build_installer_windows.bat b/build_installer.bat
similarity index 89%
rename from build_installer_windows.bat
rename to build_installer.bat
index 8bac74c9..ac292c21 100644
--- a/build_installer_windows.bat
+++ b/build_installer.bat
@@ -21,7 +21,7 @@ goto done
 echo To build a 64-bit Windows installer:
 echo  - set Q_BUILD_TYPE=Release in winbuild_env.bat
 echo  - also set other environmental overrides necessary for your build environment
-echo  - run clean_build_windows.bat to build Barrier and verify that it succeeds
+echo  - run clean_build.bat to build Barrier and verify that it succeeds
 echo  - re-run this script to create the installation package
 goto done
 
diff --git a/clean_build_windows.bat b/clean_build.bat
similarity index 93%
rename from clean_build_windows.bat
rename to clean_build.bat
index fd54d248..e48168de 100644
--- a/clean_build_windows.bat
+++ b/clean_build.bat
@@ -1,6 +1,6 @@
 @echo off
 
-REM defaults - override them by creating a winbuild_env file
+REM defaults - override them by creating a winbuild_env.bat file
 set B_BUILD_TYPE=Debug
 set B_QT_ROOT=C:\Qt\5.6.3\msvc2015_64
 set B_BONJOUR=C:\Program Files\Bonjour SDK
@@ -49,10 +49,10 @@ goto done
 echo Build failed
 
 :done
+cd /d %savedir%
+
 set BONJOUR_SDK_HOME=
 set B_BUILD_TYPE=
 set B_QT_ROOT=
 set B_BONJOUR=
-
-cd /d %savedir%
 set savedir=
diff --git a/clean_build b/clean_build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from clean_build
rename to clean_build.sh