diff --git a/app/build.gradle b/app/build.gradle
index 33880e0c5..538cd9925 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,9 +18,9 @@ android {
     }
 
     productFlavors {
-        free {
+        fdroid {
         }
-        proprietary {
+        safetynet {
             versionName "1.4.7-s"
         }
     }
@@ -42,5 +42,5 @@ dependencies {
     compile 'com.github.chrisbanes:PhotoView:2.0.0'
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'org.jsoup:jsoup:1.10.3'
-    proprietaryCompile 'com.google.android.gms:play-services-safetynet:11.0.4'
+    safetynetCompile 'com.google.android.gms:play-services-safetynet:11.0.4'
 }
diff --git a/app/src/free/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java
similarity index 100%
rename from app/src/free/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java
rename to app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java
diff --git a/app/src/free/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
similarity index 100%
rename from app/src/free/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
rename to app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
diff --git a/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java b/app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java
similarity index 100%
rename from app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java
rename to app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/LoginActivity.java
diff --git a/app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
similarity index 100%
rename from app/src/proprietary/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
rename to app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java