diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9a279c11e8fac..6ee43c07a6c86 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -162,6 +162,16 @@ android {
         }
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
+    flavorDimensions "version"
+
+    productFlavors {
+        experimental {
+            dimension "version"
+            applicationIdSuffix ".experimental"
+        }
+    }
+
     signingConfigs {
         if (keystoreProperties.getProperty('storeFile') != null) {
             if (file(keystoreProperties.getProperty('storeFile')).exists()) {
@@ -221,7 +231,7 @@ android {
             variant.outputs.each { output ->
                 def outputFile = output.outputFile
                 if (outputFile != null && outputFile.name.endsWith(".aar")) {
-                    def fileName = "com.cleverraven.cataclysmdda.aar";
+                    def fileName = "$applicationId.aar";
                     output.outputFile = new File(outputFile.parent, fileName);
                 }
             }
diff --git a/android/gradle.properties b/android/gradle.properties
index ddd139c1216c7..237d31ed23283 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -41,5 +41,5 @@ deps=./deps.zip
 override_version=
 
 # This property controls path where overriden version number header should be generated
-# You can override this from the command line by passing "-pversion_header_path=#"
+# You can override this from the command line by passing "-Pversion_header_path=#"
 version_header_path=app/jni/src/version.h