diff --git a/build.gradle b/build.gradle
index 7cc1dff9..cca1397a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,8 +46,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    version = "0.2.20.212415"
-    ext.appVersionCode = 212415001
+    version = "0.2.21.212417"
+    ext.appVersionCode = 212417001
     ext.isReleaseVersion = false
 }
 
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 21e13688..66697287 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -94,8 +94,8 @@
         <!-- Internal Settings -->
 
         <provider
-            android:name="org.microg.gms.settings.SettingsProvider"
-            android:authorities="org.microg.gms.settings"
+            android:name="org.microg.mgms.settings.SettingsProvider"
+            android:authorities="org.microg.mgms.settings"
             android:exported="false" />
 
         <!-- Services Framework -->
@@ -105,7 +105,7 @@
             android:authorities="com.mgoogle.android.gsf.gservices"
             android:exported="true" />
         <provider
-            android:name="org.microg.gms.settings.GoogleSettingsProvider"
+            android:name="org.microg.mgms.settings.GoogleSettingsProvider"
             android:authorities="com.mgoogle.settings"
             android:exported="true" />
         <provider
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
index 90cf24f8..08618fd1 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
@@ -24,7 +24,7 @@ import android.os.Build;
 import android.util.Log;
 
 import org.microg.gms.common.PackageUtils;
-import org.microg.gms.settings.SettingsContract;
+import org.microg.mgms.settings.SettingsContract;
 
 import java.io.IOException;
 
diff --git a/play-services-core/src/main/java/org/microg/gms/settings/GoogleSettingsProvider.java b/play-services-core/src/main/java/org/microg/mgms/settings/GoogleSettingsProvider.java
similarity index 97%
rename from play-services-core/src/main/java/org/microg/gms/settings/GoogleSettingsProvider.java
rename to play-services-core/src/main/java/org/microg/mgms/settings/GoogleSettingsProvider.java
index da3e5094..3ab7f51c 100644
--- a/play-services-core/src/main/java/org/microg/gms/settings/GoogleSettingsProvider.java
+++ b/play-services-core/src/main/java/org/microg/mgms/settings/GoogleSettingsProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.settings;
+package org.microg.mgms.settings;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/auth/AuthPrefs.kt b/play-services-core/src/main/kotlin/org/microg/gms/auth/AuthPrefs.kt
index f5797f56..6daaed57 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/auth/AuthPrefs.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/auth/AuthPrefs.kt
@@ -1,8 +1,8 @@
 package org.microg.gms.auth
 
 import android.content.Context
-import org.microg.gms.settings.SettingsContract
-import org.microg.gms.settings.SettingsContract.Auth
+import org.microg.mgms.settings.SettingsContract
+import org.microg.mgms.settings.SettingsContract.Auth
 
 object AuthPrefs {
 
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/checkin/CheckinPrefs.kt b/play-services-core/src/main/kotlin/org/microg/gms/checkin/CheckinPrefs.kt
index bd122c35..56237653 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/checkin/CheckinPrefs.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/checkin/CheckinPrefs.kt
@@ -5,8 +5,8 @@
 package org.microg.gms.checkin
 
 import android.content.Context
-import org.microg.gms.settings.SettingsContract
-import org.microg.gms.settings.SettingsContract.CheckIn
+import org.microg.mgms.settings.SettingsContract
+import org.microg.mgms.settings.SettingsContract.CheckIn
 
 object CheckinPrefs {
 
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/checkin/LastCheckinInfo.kt b/play-services-core/src/main/kotlin/org/microg/gms/checkin/LastCheckinInfo.kt
index ccdb31af..a7482c46 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/checkin/LastCheckinInfo.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/checkin/LastCheckinInfo.kt
@@ -16,8 +16,8 @@
 package org.microg.gms.checkin
 
 import android.content.Context
-import org.microg.gms.settings.SettingsContract
-import org.microg.gms.settings.SettingsContract.CheckIn
+import org.microg.mgms.settings.SettingsContract
+import org.microg.mgms.settings.SettingsContract.CheckIn
 
 data class LastCheckinInfo(
     val lastCheckin: Long,
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/checkin/ServiceInfo.kt b/play-services-core/src/main/kotlin/org/microg/gms/checkin/ServiceInfo.kt
index e61eb4d1..c94ed6ed 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/checkin/ServiceInfo.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/checkin/ServiceInfo.kt
@@ -9,9 +9,9 @@ import android.content.Context
 import android.content.Intent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.microg.gms.settings.SettingsContract.CheckIn
-import org.microg.gms.settings.SettingsContract.getSettings
-import org.microg.gms.settings.SettingsContract.setSettings
+import org.microg.mgms.settings.SettingsContract.CheckIn
+import org.microg.mgms.settings.SettingsContract.getSettings
+import org.microg.mgms.settings.SettingsContract.setSettings
 import java.io.Serializable
 
 data class ServiceInfo(val configuration: ServiceConfiguration, val lastCheckin: Long, val androidId: Long) : Serializable
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/gcm/GcmPrefs.kt b/play-services-core/src/main/kotlin/org/microg/gms/gcm/GcmPrefs.kt
index 22e9c3dd..a0b07402 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/gcm/GcmPrefs.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/gcm/GcmPrefs.kt
@@ -5,9 +5,9 @@ import android.content.Intent
 import android.net.*
 import android.util.Log
 import org.microg.gms.gcm.TriggerReceiver.FORCE_TRY_RECONNECT
-import org.microg.gms.settings.SettingsContract
-import org.microg.gms.settings.SettingsContract.Gcm
-import org.microg.gms.settings.SettingsContract.setSettings
+import org.microg.mgms.settings.SettingsContract
+import org.microg.mgms.settings.SettingsContract.Gcm
+import org.microg.mgms.settings.SettingsContract.setSettings
 
 @Suppress("Warnings")
 data class GcmPrefs(
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt b/play-services-core/src/main/kotlin/org/microg/mgms/settings/SettingsContract.kt
similarity index 97%
rename from play-services-core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt
rename to play-services-core/src/main/kotlin/org/microg/mgms/settings/SettingsContract.kt
index 4a25b985..b736f569 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt
+++ b/play-services-core/src/main/kotlin/org/microg/mgms/settings/SettingsContract.kt
@@ -1,4 +1,4 @@
-package org.microg.gms.settings
+package org.microg.mgms.settings
 
 import android.content.ContentValues
 import android.content.Context
@@ -7,7 +7,7 @@ import android.net.Uri
 import android.os.Binder
 
 object SettingsContract {
-    const val AUTHORITY = "org.microg.gms.settings"
+    const val AUTHORITY = "org.microg.mgms.settings"
     val AUTHORITY_URI: Uri = Uri.parse("content://$AUTHORITY")
 
     object CheckIn {
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt b/play-services-core/src/main/kotlin/org/microg/mgms/settings/SettingsProvider.kt
similarity index 97%
rename from play-services-core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt
rename to play-services-core/src/main/kotlin/org/microg/mgms/settings/SettingsProvider.kt
index 42c5bf45..caf5ada6 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt
+++ b/play-services-core/src/main/kotlin/org/microg/mgms/settings/SettingsProvider.kt
@@ -1,4 +1,4 @@
-package org.microg.gms.settings
+package org.microg.mgms.settings
 
 import android.content.ContentProvider
 import android.content.ContentValues
@@ -11,10 +11,10 @@ import android.net.Uri
 import android.util.Log
 import androidx.preference.PreferenceManager
 import org.microg.gms.common.PackageUtils.warnIfNotMainProcess
-import org.microg.gms.settings.SettingsContract.AUTHORITY
-import org.microg.gms.settings.SettingsContract.Auth
-import org.microg.gms.settings.SettingsContract.CheckIn
-import org.microg.gms.settings.SettingsContract.Gcm
+import org.microg.mgms.settings.SettingsContract.AUTHORITY
+import org.microg.mgms.settings.SettingsContract.Auth
+import org.microg.mgms.settings.SettingsContract.CheckIn
+import org.microg.mgms.settings.SettingsContract.Gcm
 import java.io.File
 
 /**