diff --git a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt
index f63e06a..6dd98d1 100644
--- a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt
+++ b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt
@@ -79,7 +79,7 @@ internal object MainCommand : Runnable {
             Adb(outputFile, patcher.data.packageMetadata.packageName, deploy!!, install)
         }
 
-        val patchedFile = if (install) File(cacheDirectory).resolve("raw.apk") else outputFile
+        val patchedFile = if (install) File(cacheDirectory).resolve("${outputFile.nameWithoutExtension}_raw.apk") else outputFile
 
         Patcher.start(patcher, patchedFile)
 
diff --git a/src/main/kotlin/app/revanced/cli/signing/Signing.kt b/src/main/kotlin/app/revanced/cli/signing/Signing.kt
index f6c9e24..102ca89 100644
--- a/src/main/kotlin/app/revanced/cli/signing/Signing.kt
+++ b/src/main/kotlin/app/revanced/cli/signing/Signing.kt
@@ -8,8 +8,8 @@ import java.io.File
 object Signing {
     fun start(inputFile: File, outputFile: File, cn: String, password: String) {
         val cacheDirectory = File(cacheDirectory)
-        val alignedOutput = cacheDirectory.resolve("aligned.apk")
-        val signedOutput = cacheDirectory.resolve("signed.apk")
+        val alignedOutput = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_aligned.apk")
+        val signedOutput = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_signed.apk")
 
         // align the inputFile and write to alignedOutput
         ZipAligner.align(inputFile, alignedOutput)