diff --git a/tools/windows_packaging/win32-env.sh b/tools/windows_packaging/win32-env.sh
index 208cb1c891..8dae0e1b47 100755
--- a/tools/windows_packaging/win32-env.sh
+++ b/tools/windows_packaging/win32-env.sh
@@ -38,9 +38,9 @@ then
 	# Figure out the Build Type
 	if grep -q "DEBUG = True" $BUILD_CACHE_FILE; then
 		DEBUG=1
-		PACKAGE_DIR="$HOME/$APPNAME-${release_version}-win32-dbg"
+		PACKAGE_DIR="$HOME/$APPNAME-${release_version}-dbg"
 	else
-		PACKAGE_DIR="$HOME/$APPNAME-${release_version}-win32"
+		PACKAGE_DIR="$HOME/$APPNAME-${release_version}"
 	fi
 
 	if grep -q "BUILD_TESTS = True" $BUILD_CACHE_FILE; then
diff --git a/wscript b/wscript
index 5ff8b97660..230e0cc3a8 100755
--- a/wscript
+++ b/wscript
@@ -48,7 +48,7 @@ V = MAJOR + '.' + MINOR + '.' + MICRO
 # because if it is, it breaks waf somehow.
 #
 VERSION = V.encode ('ascii', 'ignore')
-APPNAME = 'Tracks Live'
+APPNAME = 'TracksLive'
 PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore')
 
 # Mandatory variables