diff --git a/pom.xml b/pom.xml
index bb251ffc94f6cff83fbeaf9d2fec840b73cd836e..d4c4a80867a768e355a376fc5e116c9e7e3bbeb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,15 +164,15 @@
 									dest="${dist}/mac/temp/unimelb-mf-clients-${project.version}" />
 								<dirset
 									dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}"
-									id="jreDirId">
+									id="macJreDirId">
 									<include name="jre*" />
 								</dirset>
-								<property name="jreDir" refid="jreDirId" />
-								<property name="javaHome"
-									value="${jreDir}/Contents/Home" />
+								<property name="macJreDir" refid="macJreDirId" />
+								<property name="macJavaHome"
+									value="${macJreDir}/Contents/Home" />
 								<replace
 									dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"
-									token="@JAVA_HOME@" value="${javaHome}" />
+									token="@JAVA_HOME@" value="${macJavaHome}" />
 								<replace
 									dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"
 									token="#export JAVA_HOME=" value="export JAVA_HOME=" />
@@ -225,14 +225,14 @@
 									dest="${dist}/windows/temp/unimelb-mf-clients-${project.version}" />
 								<dirset
 									dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}"
-									id="jreDirId">
+									id="winJreDirId">
 									<include name="jre*" />
 								</dirset>
-								<property name="jreDir" refid="jreDirId" />
-								<property name="javaHome" value="${jreDir}" />
+								<property name="winJreDir" refid="winJreDirId" />
+								<property name="winJavaHome" value="${winJreDir}" />
 								<replace
 									dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"
-									token="@JAVA_HOME@" value="${javaHome}" />
+									token="@JAVA_HOME@" value="${winJavaHome}" />
 								<replace
 									dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"
 									token="@REM set JAVA_HOME=" value="set JAVA_HOME=" />
diff --git a/src/main/scripts/windows/mexplorer.cmd b/src/main/scripts/windows/mexplorer.cmd
index 7cd5bca06d63a279581ade921103a24fd55297fa..d47d16ed3b16ec664d40039550f0f04e2d6b248f 100644
--- a/src/main/scripts/windows/mexplorer.cmd
+++ b/src/main/scripts/windows/mexplorer.cmd
@@ -9,4 +9,4 @@ popd
 
 set JAR=%ROOT%\lib\mexplorer.jar
 
-java -Xmx1024m -jar %JAR% %*
+java -Xmx1024m -jar "%JAR%" %*
diff --git a/src/main/scripts/windows/scp-get.cmd b/src/main/scripts/windows/scp-get.cmd
index f7ea2284ec70226524951dc9f86e7856b83c5b2a..3a089cf140973840d6e4f19af148f9c44e468c3f 100644
--- a/src/main/scripts/windows/scp-get.cmd
+++ b/src/main/scripts/windows/scp-get.cmd
@@ -9,6 +9,6 @@ popd
 
 set JAR=%ROOT%\lib\unimelb-mf-clients.jar
 
-java -Xmx200m -cp %JAR% unimelb.mf.client.ssh.cli.SCPGetCLI %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.ssh.cli.SCPGetCLI %*
 
 
diff --git a/src/main/scripts/windows/scp-put.cmd b/src/main/scripts/windows/scp-put.cmd
index 123edff4ec33bc70ad055c4fd26f46152cfbcc64..1e32ea6bab80b7f0cf1639b1f064858357a4be35 100644
--- a/src/main/scripts/windows/scp-put.cmd
+++ b/src/main/scripts/windows/scp-put.cmd
@@ -9,4 +9,4 @@ popd
 
 set JAR=%ROOT%\lib\unimelb-mf-clients.jar
 
-java -Xmx200m -cp %JAR% unimelb.mf.client.ssh.cli.SCPPutCLI %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.ssh.cli.SCPPutCLI %*
diff --git a/src/main/scripts/windows/sftp-get.cmd b/src/main/scripts/windows/sftp-get.cmd
index fd9b3aa26a215065ccb453894b2f79545185cef3..bd4c06f79332c9eb969a78439eb40e91cc4dadf2 100644
--- a/src/main/scripts/windows/sftp-get.cmd
+++ b/src/main/scripts/windows/sftp-get.cmd
@@ -9,4 +9,4 @@ popd
 
 set JAR=%ROOT%\lib\unimelb-mf-clients.jar
 
-java -Xmx200m -cp %JAR% unimelb.mf.client.ssh.cli.SFTPGetCLI %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.ssh.cli.SFTPGetCLI %*
diff --git a/src/main/scripts/windows/sftp-put.cmd b/src/main/scripts/windows/sftp-put.cmd
index 614aabe0ef3573df561a9a7599dc4cd0f4f762b0..78b2bf1b1050f1a3285053a856993a2ecbed0e56 100644
--- a/src/main/scripts/windows/sftp-put.cmd
+++ b/src/main/scripts/windows/sftp-put.cmd
@@ -9,4 +9,4 @@ popd
 
 set JAR=%ROOT%\lib\unimelb-mf-clients.jar
 
-java -Xmx200m -cp  %JAR% unimelb.mf.client.ssh.cli.SFTPPutCLI %*
+java -Xmx200m -cp  "%JAR%" unimelb.mf.client.ssh.cli.SFTPPutCLI %*
diff --git a/src/main/scripts/windows/unimelb-mf-archive.cmd b/src/main/scripts/windows/unimelb-mf-archive.cmd
index e898767abc2af0b0a5012515b9fb25cad012d53e..b724ccd3162e5f35f4b245e5aa2ba8861d502042 100644
--- a/src/main/scripts/windows/unimelb-mf-archive.cmd
+++ b/src/main/scripts/windows/unimelb-mf-archive.cmd
@@ -9,4 +9,4 @@ popd
 
 set JAR=%ROOT%\lib\unimelb-mf-clients.jar
 
-java -Xmx200m -cp %JAR% unimelb.mf.client.archive.cli.MFArchiveCLI %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.archive.cli.MFArchiveCLI %*
diff --git a/src/main/scripts/windows/unimelb-mf-check.cmd b/src/main/scripts/windows/unimelb-mf-check.cmd
index 7956a1d6134cd75cc7ec89659c23ab5bb5c2b062..88264330039d2461c04efbe99149c6181c4eda02 100644
--- a/src/main/scripts/windows/unimelb-mf-check.cmd
+++ b/src/main/scripts/windows/unimelb-mf-check.cmd
@@ -9,4 +9,4 @@ popd
 
 set JAR=%ROOT%\lib\unimelb-mf-clients.jar
 
-java -Xmx200m -cp %JAR% unimelb.mf.client.sync.cli.MFCheck %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.sync.cli.MFCheck %*
diff --git a/src/main/scripts/windows/unimelb-mf-download.cmd b/src/main/scripts/windows/unimelb-mf-download.cmd
index bce97c26f12b50a4cf03f15f4c9f67d0fef3fa23..7b44c5b2840078bd3b7baa82a4a042281c31f658 100644
--- a/src/main/scripts/windows/unimelb-mf-download.cmd
+++ b/src/main/scripts/windows/unimelb-mf-download.cmd
@@ -8,4 +8,4 @@ popd
 @REM set PATH=%JAVA_HOME%\bin;%PATH%
 
 set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.sync.cli.MFDownload %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.sync.cli.MFDownload %*
diff --git a/src/main/scripts/windows/unimelb-mf-perf.cmd b/src/main/scripts/windows/unimelb-mf-perf.cmd
index db817c8cfd4b22323174eeeaeb1182d70f323e3f..4ee81fde2323c2a1654cdbac01036ffa32185a29 100644
--- a/src/main/scripts/windows/unimelb-mf-perf.cmd
+++ b/src/main/scripts/windows/unimelb-mf-perf.cmd
@@ -8,4 +8,4 @@ popd
 @REM set PATH=%JAVA_HOME%\bin;%PATH%
 
 set JAR=%ROOT%\lib\unimelb-mf-clients.jar
-java -Xmx200m -cp %JAR% unimelb.mf.client.perf.cli.MFPerfCLI %*
\ No newline at end of file
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.perf.cli.MFPerfCLI %*
\ No newline at end of file
diff --git a/src/main/scripts/windows/unimelb-mf-sync.cmd b/src/main/scripts/windows/unimelb-mf-sync.cmd
index fee85fc389fce8c3a0900b75112f9dfc87c7955d..f565305e86fdcf615418cbcce8cae3571236850d 100644
--- a/src/main/scripts/windows/unimelb-mf-sync.cmd
+++ b/src/main/scripts/windows/unimelb-mf-sync.cmd
@@ -9,4 +9,4 @@ popd
 
 set JAR=%ROOT%\lib\unimelb-mf-clients.jar
 
-java -Xmx200m -cp %JAR% unimelb.mf.client.sync.cli.MFSync %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.sync.cli.MFSync %*
diff --git a/src/main/scripts/windows/unimelb-mf-upload.cmd b/src/main/scripts/windows/unimelb-mf-upload.cmd
index 6271708149d63c8505fc516bb5843d2098c90393..8412c85efcca44fea2cecd67a463e3aaf6bf2c4c 100644
--- a/src/main/scripts/windows/unimelb-mf-upload.cmd
+++ b/src/main/scripts/windows/unimelb-mf-upload.cmd
@@ -9,4 +9,4 @@ popd
 
 set JAR=%ROOT%\lib\unimelb-mf-clients.jar
 
-java -Xmx200m -cp %JAR% unimelb.mf.client.sync.cli.MFUpload %*
+java -Xmx200m -cp "%JAR%" unimelb.mf.client.sync.cli.MFUpload %*