diff --git a/build/conf/mac/Contents/Info.plist b/build/conf/mac/Contents/Info.plist
index 9fcd21c14315..8daa490e8ecc 100644
--- a/build/conf/mac/Contents/Info.plist
+++ b/build/conf/mac/Contents/Info.plist
@@ -31,11 +31,11 @@
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>
-    <string>@@bundle_name@@ @@product_version@@</string>
+    <string>@@bundle_name@@@@product_state@@</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleIdentifier</key>
-    <string>@@bundle_identifier@@</string>
+    <string>@@bundle_identifier@@@@product_state@@</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleGetInfoString</key>
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index f93dd53fa8a2..7421c91f9cc5 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -367,8 +367,7 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args ->
 
   String minor = p("component.version.minor")
   String version = isEap() && !minor.contains("RC") && !minor.contains("Beta") ? "EAP $args.buildNumber" : "${p("component.version.major")}.${minor}"
-  String productVersion = "${p("component.version.major")}.${minor}"
-  if (isEap() && !minor.contains("RC") && !minor.contains("Beta")) productVersion += " EAP"
+  String EAP = isEap() && !minor.contains("RC") && !minor.contains("Beta") ? "-EAP" : ""
 
   Map properties = readIdeaProperties(args)
 
@@ -429,7 +428,7 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args ->
     replacefilter(token: "@@executable@@", value: executable)
     replacefilter(token: "@@icns@@", value: icns)
     replacefilter(token: "@@bundle_name@@", value: fullName)
-    replacefilter(token: "@@product_version@@", value: productVersion)
+    replacefilter(token: "@@product_state@@", value: EAP)
     replacefilter(token: "@@bundle_identifier@@", value: args.bundleIdentifier)
     replacefilter(token: "@@year@@", value: "$todayYear")
     replacefilter(token: "@@version@@", value: version)