diff --git a/electron-builder.json b/electron-builder.json
index f5075ccf..1b7fecd8 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -88,6 +88,6 @@
     ]
   },
   "nsis": {
-    "artifactName": "mattermost-setup-${version}.${ext}"
+    "artifactName": "${name}-setup-${version}-win.${ext}"
   }
 }
diff --git a/package.json b/package.json
index af7798ab..028d0580 100644
--- a/package.json
+++ b/package.json
@@ -28,9 +28,9 @@
     "test": "npm-run-all test:* lint:*",
     "test:app": "cross-env NODE_ENV=production npm run build && mocha -r babel-register --reporter mocha-circleci-reporter --recursive test/specs",
     "package:all": "cross-env NODE_ENV=production npm-run-all check-build-config package:windows package:mac package:linux",
-    "package:windows": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --win --x64 --ia32 --config.extraMetadata.name=mattermost --publish=never && npm run manipulate-windows-zip",
+    "package:windows": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --win --x64 --ia32 --publish=never && npm run manipulate-windows-zip",
     "package:mac": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --mac --publish=never",
-    "package:linux": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --linux --x64 --ia32 --config.extraMetadata.name=mattermost-desktop --publish=never",
+    "package:linux": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --linux --x64 --ia32 --publish=never",
     "manipulate-windows-zip": "node scripts/manipulate_windows_zip.js",
     "lint:js": "eslint --ignore-path .gitignore --ignore-pattern node_modules --ext .js --ext .jsx .",
     "fix:js": "eslint --ignore-path .gitignore --ignore-pattern node_modules --quiet --ext .js --ext .jsx . --fix",
diff --git a/scripts/cp_artifacts.sh b/scripts/cp_artifacts.sh
index 6d250def..e748a294 100644
--- a/scripts/cp_artifacts.sh
+++ b/scripts/cp_artifacts.sh
@@ -5,9 +5,9 @@ VERSION=`cat package.json | jq -r '.version'`
 SRC=$1
 DEST=$2
 
-cp "${SRC}/mattermost-${VERSION}-win-ia32.zip" "${DEST}/mattermost-desktop-${VERSION}-win-ia32.zip"
-cp "${SRC}/mattermost-${VERSION}-win-x64.zip" "${DEST}/mattermost-desktop-${VERSION}-win-x64.zip"
-cp "${SRC}/mattermost-${VERSION}-win.exe" "${DEST}/mattermost-desktop-${VERSION}-win.exe"
+cp "${SRC}/mattermost-desktop-${VERSION}-win-ia32.zip" "${DEST}/"
+cp "${SRC}/mattermost-desktop-${VERSION}-win-x64.zip" "${DEST}/"
+cp "${SRC}/mattermost-desktop-setup-${VERSION}-win.exe" "${DEST}/"
 cp "${SRC}"/mattermost-desktop-*.zip "${DEST}/"
 cp "${SRC}"/*.tar.gz "${DEST}/"
 cp "${SRC}"/*.deb "${DEST}/"