diff --git a/build.gradle b/build.gradle
index 8be67ce..a5dde87 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1804,7 +1804,7 @@
 
 task buildPreNJdwpTestsDex(type: Exec, dependsOn: "buildPreNJdwpTestsJar") {
     def inFile = buildPreNJdwpTestsJar.archivePath
-    def outFile = new File(buildPreNJdwpTestsJar.destinationDir, buildPreNJdwpTestsJar.baseName + '-dex.jar')
+    def outFile = new File(buildPreNJdwpTestsJar.destinationDir, 'jdwp-tests-preN-dex.jar')
     inputs.files files(inFile)
     outputs.file outFile
     if (OperatingSystem.current().isWindows()) {
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 5cd5ea4..dbeab96 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "3.1.57";
+  public static final String LABEL = "3.1.58";
 
   private Version() {
   }