diff --git a/build.gradle b/build.gradle
index 0b85dd3fb..76f507026 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,7 +80,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 25
         versionCode 327
         versionName "2.5.1"
         archivesBaseName += "-$versionName"
@@ -123,19 +123,15 @@ android {
 
         playstore {
             dimension "distribution"
-            versionNameSuffix "+p"
         }
         free {
             dimension "distribution"
-            versionNameSuffix "+f"
         }
         system {
             dimension "emoji"
-            versionNameSuffix "s"
         }
         compat {
             dimension "emoji"
-            versionNameSuffix "c"
         }
     }
 
@@ -185,13 +181,11 @@ android {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            versionNameSuffix "r"
         }
         debug {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            versionNameSuffix "d"
         }
     }
 
@@ -214,6 +208,7 @@ android {
 
     lintOptions {
         disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
+        abortOnError false
     }
 
     subprojects {
diff --git a/proguard-rules.pro b/proguard-rules.pro
index 3c3593577..dd566d10c 100644
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -1,6 +1,6 @@
 -dontobfuscate
 
--keep class eu.siacs.conversations.**
+-keep class eu.sum7.conversations.**
 
 -keep class org.whispersystems.**