diff --git a/src/main/kotlin/com/beust/kobalt/Variant.kt b/src/main/kotlin/com/beust/kobalt/Variant.kt
index 9adf5776..6e4688ea 100644
--- a/src/main/kotlin/com/beust/kobalt/Variant.kt
+++ b/src/main/kotlin/com/beust/kobalt/Variant.kt
@@ -68,7 +68,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
         return result
     }
 
-    val shortArchiveName = productFlavor.name + "-" + buildType.name
+    val shortArchiveName = if (isDefault) "" else "-" + productFlavor.name + "-" + buildType.name
 
     var generatedSourceDirectory: File? = null
 
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt
index 849a2da6..a03e162e 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt
@@ -104,10 +104,10 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, v
     private fun adb(project: Project) = "${androidHome(project)}/platform-tools/adb"
 
     private fun temporaryApk(project: Project, flavor: String)
-            = KFiles.joinFileAndMakeDir(AndroidFiles.intermediates(project), "res", "resources-$flavor.ap_")
+            = KFiles.joinFileAndMakeDir(AndroidFiles.intermediates(project), "res", "resources$flavor.ap_")
 
     private fun apk(project: Project, flavor: String)
-            = KFiles.joinFileAndMakeDir(project.buildDirectory, "outputs", "apk", "app-$flavor.apk")
+            = KFiles.joinFileAndMakeDir(project.buildDirectory, "outputs", "apk", "${project.name}$flavor.apk")
 
     @Task(name = "generateR", description = "Generate the R.java file",
             runBefore = arrayOf("compile"), runAfter = arrayOf("clean"))