diff --git a/build/package/msi/wix.json b/build/package/msi/wix.json
index 635b3fc..c5d203e 100644
--- a/build/package/msi/wix.json
+++ b/build/package/msi/wix.json
@@ -4,7 +4,7 @@
   "license": "tmp\\LICENSE.rtf",
   "info": {
     "comments": "",
-    "contact": "Aleksei Badiaev <aleksei.badiaev@mousesoft.ru>",
+    "contact": "Aleksei Badiaev (aleksei.badiaev@mousesoft.ru)",
     "help-link": "http://mousesoft.ru/help",
     "support-telephone": "555-123456789",
     "support-link": "http://mousesoft.ru/support",
diff --git a/makefile b/makefile
index 88c897e..0f096b8 100644
--- a/makefile
+++ b/makefile
@@ -25,7 +25,7 @@ ECHO_CMD		:= echo
 
 ifeq ($(OS),Windows_NT)
 DIST_SUFFIX		:= windows-$(DIST_KIND)
-MSI_FILE		:= $(PROJECT_NAME)_$(VERSION)_$(DIST_KIND).msi
+MSI_FILE		:= $(PROJECT_ID)_$(VERSION)_$(DIST_KIND).msi
 DIST_EXT		:= .zip
 DIST_OPTS		:= -a -cf
 ECHO_CMD		:= echo -e
@@ -38,7 +38,7 @@ DIST_EXT		:= .tar.gz
 DIST_OPTS		:= -czf
 endif
 
-PKG_NAME		:= $(PROJECT_NAME)_$(VERSION)_$(DIST_SUFFIX)
+PKG_NAME		:= $(PROJECT_ID)_$(VERSION)_$(DIST_SUFFIX)
 DIST_FILE		:= $(PKG_NAME)$(DIST_EXT)
 
 GREEN  := $(shell tput -Txterm setaf 2)