diff --git a/build/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
index 1998584b40f1..1b6549a61c57 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
@@ -124,7 +124,7 @@ class LinuxDistributionBuilder {
   private void buildTarGz(String jreDirectoryPath) {
     def tarRoot = customizer.rootDirectoryName(buildContext.buildNumber)
     def suffix = jreDirectoryPath != null ? "" : "-no-jdk"
-    def tarPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(applicationInfo, buildContext.buildNumber)}${suffix}.tar"
+    def tarPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}${suffix}.tar"
     def extraBins = customizer.extraExecutables
     def paths = [buildContext.paths.distAll, unixDistPath]
     if (jreDirectoryPath != null) {
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
index 9189ff5eb055..172479fa1e6f 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
@@ -208,7 +208,7 @@ class MacDistributionBuilder {
       def extraBins = customizer.extraExecutables
       def allPaths = [buildContext.paths.distAll, macDistPath]
       def zipRoot = customizer.rootDirectoryName(buildContext.applicationInfo, buildContext.buildNumber)
-      def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(applicationInfo, buildContext.buildNumber)}.mac.zip"
+      def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}.mac.zip"
       buildContext.ant.zip(zipfile: targetPath) {
         allPaths.each {
           zipfileset(dir: it, prefix: zipRoot) {
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
index 73d5d1c76fb9..ed7e508e4239 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
@@ -65,7 +65,7 @@ class MacDmgBuilder {
 
   private void doSignAndBuildDmg(String macZipPath, String jreArchivePath) {
     def suffix = jreArchivePath != null ? "" : "-no-jdk"
-    String targetFileName = buildContext.productProperties.baseArtifactName(applicationInfo, buildContext.buildNumber) + suffix
+    String targetFileName = buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber) + suffix
     def sitFilePath = "$artifactsPath/${targetFileName}.sit"
     ant.copy(file: macZipPath, tofile: sitFilePath)
     ftpAction("mkdir") {}
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy
index 9a489d4a87d4..bf23841eab53 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy
@@ -44,7 +44,7 @@ class WinExeInstallerBuilder {
     }
 
     String communityHome = buildContext.paths.communityHome
-    String outFileName = buildContext.productProperties.baseArtifactName(applicationInfo, buildContext.buildNumber)
+    String outFileName = buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)
     buildContext.messages.progress("Building Windows installer $outFileName")
 
     def box = "$buildContext.paths.temp/winInstaller"
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
index c9f89e115ace..6d0484b21956 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
@@ -197,7 +197,7 @@ IDS_VM_OPTIONS=$vmOptions
 
   private void buildWinZip(String jreDirectoryPath, String zipNameSuffix) {
     buildContext.messages.block("Build Windows ${zipNameSuffix}.zip distribution") {
-      def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(applicationInfo, buildContext.buildNumber)}${zipNameSuffix}.zip"
+      def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}${zipNameSuffix}.zip"
       def zipPrefix = customizer.rootDirectoryName(buildContext.buildNumber)
       def dirs = [buildContext.paths.distAll, winDistPath]
       if (jreDirectoryPath != null) {