diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
index a65fdad0ecff..60c566893e08 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
@@ -73,7 +73,7 @@ class BundledJreManager {
     }
 
     buildContext.messages.block("Extract $archive.absolutePath JRE") {
-      String destination = "$targetDir/jbr"
+      String destination = "$targetDir/jre64"
       def destinationDir = new File(destination)
       if (destinationDir.exists()) destinationDir.deleteDir()
       untar(archive, destination, isSecondBundledJreModular())
@@ -130,7 +130,7 @@ class BundledJreManager {
       return null
     }
     buildContext.messages.block("Extract $archive.name JRE") {
-      String destination = "$targetDir/jbr"
+      String destination = "$targetDir/jre64"
       if (osName == "windows" && arch == JvmArchitecture.x32) {
         destination = "$targetDir/jre32"
       }
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
index e627cf43aff5..236e8e6f8ea2 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
@@ -142,8 +142,8 @@ class LinuxDistributionBuilder extends OsSpecificDistributionBuilder {
     String javaExecutablePath = null
     if (jreDirectoryPath != null) {
       paths += jreDirectoryPath
-      extraBins += "jbr/bin/*"
-      javaExecutablePath = "jbr/bin/java"
+      extraBins += "jre64/bin/*"
+      javaExecutablePath = "jre64/bin/java"
     }
     def productJsonDir = new File(buildContext.paths.temp, "linux.dist.product-info.json$suffix").absolutePath
     generateProductJson(productJsonDir, javaExecutablePath)
@@ -247,11 +247,11 @@ class LinuxDistributionBuilder extends OsSpecificDistributionBuilder {
           customizer.extraExecutables.each { include(name: it) }
         }
         fileset(dir: jreDirectoryPath) {
-          include(name: "jbr/bin/*")
+          include(name: "jre64/bin/*")
         }
       }
 
-      generateProductJson(unixSnapDistPath, "jbr/bin/java")
+      generateProductJson(unixSnapDistPath, "jre64/bin/java")
       new ProductInfoValidator(buildContext).validateInDirectory(unixSnapDistPath, "", [unixSnapDistPath, jreDirectoryPath], [])
 
       buildContext.ant.mkdir(dir: "${snapDir}/result")
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
index 2d09013b35c8..9bca3f91e965 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
@@ -282,7 +282,7 @@ IDS_VM_OPTIONS=$vmOptions
   private void generateProductJson(String targetDir, boolean isJreIncluded) {
     def launcherPath = "bin/${buildContext.productProperties.baseFileName}64.exe"
     def vmOptionsPath = "bin/${buildContext.productProperties.baseFileName}64.exe.vmoptions"
-    def javaExecutablePath = isJreIncluded ? "jbr/bin/java.exe" : null
+    def javaExecutablePath = isJreIncluded ? "jre64/bin/java.exe" : null
     new ProductInfoGenerator(buildContext)
       .generateProductJson(targetDir, "bin", null, launcherPath, javaExecutablePath, vmOptionsPath, OsFamily.WINDOWS)
   }