diff --git a/ACardEmulator/app/build.gradle b/ACardEmulator/app/build.gradle
index fb5e1404..58c33ca4 100644
--- a/ACardEmulator/app/build.gradle
+++ b/ACardEmulator/app/build.gradle
@@ -9,6 +9,7 @@ android {
         targetSdkVersion 30
         versionCode 8
         versionName "3.5"
+        archivesBaseName = "ACardEmulator-$versionName"
     }
     buildTypes {
         release {
@@ -48,27 +49,6 @@ android {
     }
 }
 
-android.applicationVariants.all { variant ->
-    def appName
-    //Check if an applicationName property is supplied; if not use the name of the parent project.
-    if (project.hasProperty("applicationName")) {
-        appName = applicationName
-    } else {
-        appName = parent.name
-    }
-
-    variant.outputs.each { output ->
-        def newApkName
-        //If there's no ZipAlign task it means that our artifact will be unaligned and we need to mark it as such.
-        if (output.zipAlign) {
-            newApkName = "${appName}-${output.baseName}-${variant.versionName}.apk"
-        } else {
-            newApkName = "${appName}-${output.baseName}-${variant.versionName}-unaligned.apk"
-        }
-        output.outputFileName = new File(newApkName)
-    }
-}
-
 repositories {
     mavenCentral()
 }