diff --git a/android/build.gradle b/android/build.gradle
index 58840a8c18c0d8b9dd1c2594fa405eb3c3f2d9cb..3ace2e011e69128dda6e973572ceb8d8933fc8a0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -76,7 +76,7 @@ android {
         if (!variant.buildType.name.equals("devel")) {
             variant.outputs.each { output ->
                 def file = output.outputFile
-                output.outputFile = new File(file.parent, file.name.replace(".apk", "-" + tablexiaVersionName + ".apk").replace("android", appName))
+                output.outputFile = new File(file.parent, file.name.replace(".apk", "-" + tablexiaVersionName + ".apk").replace("android", tablexiaAppName))
             }
         }
     }
diff --git a/build.gradle b/build.gradle
index d1faa25b5e3bfcc257c4c0d20b9522bfce6b9742..e7ed8bb50e3fcef2a735687bca0345f07c313b15 100644
--- a/build.gradle
+++ b/build.gradle
@@ -286,8 +286,10 @@ def getVersionNameFromGit() {
         }
         String numberOfCommits = stdout.toString().trim()
 
-        // add branch name and number of commits
-        result = "${result}-${numberOfCommits}"
+        if (!"0".equals(numberOfCommits)) {
+            // add branch name and number of commits
+            result = "${result}-${numberOfCommits}"
+        }
     }
     return result
 }