diff --git a/play-services-api/src/main/aidl/com/google/android/gms/phenotype/Configurations.aidl b/play-services-api/src/main/aidl/com/google/android/gms/phenotype/Configurations.aidl
deleted file mode 100644
index 33ccf3d7..00000000
--- a/play-services-api/src/main/aidl/com/google/android/gms/phenotype/Configurations.aidl
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.google.android.gms.phenotype;
-
-parcelable Configurations;
diff --git a/play-services-api/src/main/aidl/com/mgoogle/android/gms/phenotype/Configurations.aidl b/play-services-api/src/main/aidl/com/mgoogle/android/gms/phenotype/Configurations.aidl
new file mode 100644
index 00000000..b6487fc3
--- /dev/null
+++ b/play-services-api/src/main/aidl/com/mgoogle/android/gms/phenotype/Configurations.aidl
@@ -0,0 +1,3 @@
+package com.mgoogle.android.gms.phenotype;
+
+parcelable Configurations;
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/phenotype/internal/IPhenotypeCallbacks.aidl b/play-services-api/src/main/aidl/com/mgoogle/android/gms/phenotype/internal/IPhenotypeCallbacks.aidl
similarity index 65%
rename from play-services-api/src/main/aidl/com/google/android/gms/phenotype/internal/IPhenotypeCallbacks.aidl
rename to play-services-api/src/main/aidl/com/mgoogle/android/gms/phenotype/internal/IPhenotypeCallbacks.aidl
index 77cfb6d5..b238cb01 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/phenotype/internal/IPhenotypeCallbacks.aidl
+++ b/play-services-api/src/main/aidl/com/mgoogle/android/gms/phenotype/internal/IPhenotypeCallbacks.aidl
@@ -1,7 +1,7 @@
-package com.google.android.gms.phenotype.internal;
+package com.mgoogle.android.gms.phenotype.internal;
 
 import com.google.android.gms.common.api.Status;
-import com.google.android.gms.phenotype.Configurations;
+import com.mgoogle.android.gms.phenotype.Configurations;
 
 interface IPhenotypeCallbacks {
     void onRegister(in Status status) = 0;
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/phenotype/internal/IPhenotypeService.aidl b/play-services-api/src/main/aidl/com/mgoogle/android/gms/phenotype/internal/IPhenotypeService.aidl
similarity index 66%
rename from play-services-api/src/main/aidl/com/google/android/gms/phenotype/internal/IPhenotypeService.aidl
rename to play-services-api/src/main/aidl/com/mgoogle/android/gms/phenotype/internal/IPhenotypeService.aidl
index 724969f9..e4099a1b 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/phenotype/internal/IPhenotypeService.aidl
+++ b/play-services-api/src/main/aidl/com/mgoogle/android/gms/phenotype/internal/IPhenotypeService.aidl
@@ -1,6 +1,6 @@
-package com.google.android.gms.phenotype.internal;
+package com.mgoogle.android.gms.phenotype.internal;
 
-import com.google.android.gms.phenotype.internal.IPhenotypeCallbacks;
+import com.mgoogle.android.gms.phenotype.internal.IPhenotypeCallbacks;
 
 interface IPhenotypeService {
     void register(IPhenotypeCallbacks callbacks, String p1, int p2, in String[] p3, in byte[] p4) = 0;
diff --git a/play-services-api/src/main/java/com/google/android/gms/phenotype/Configuration.java b/play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/Configuration.java
similarity index 90%
rename from play-services-api/src/main/java/com/google/android/gms/phenotype/Configuration.java
rename to play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/Configuration.java
index 20bb9d4c..b51ab177 100644
--- a/play-services-api/src/main/java/com/google/android/gms/phenotype/Configuration.java
+++ b/play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/Configuration.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.google.android.gms.phenotype;
+package com.mgoogle.android.gms.phenotype;
 
 import org.microg.safeparcel.AutoSafeParcelable;
 
diff --git a/play-services-api/src/main/java/com/google/android/gms/phenotype/Configurations.java b/play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/Configurations.java
similarity index 92%
rename from play-services-api/src/main/java/com/google/android/gms/phenotype/Configurations.java
rename to play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/Configurations.java
index 910b7008..8b032262 100644
--- a/play-services-api/src/main/java/com/google/android/gms/phenotype/Configurations.java
+++ b/play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/Configurations.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.google.android.gms.phenotype;
+package com.mgoogle.android.gms.phenotype;
 
 import org.microg.safeparcel.AutoSafeParcelable;
 
diff --git a/play-services-api/src/main/java/com/google/android/gms/phenotype/Flag.java b/play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/Flag.java
similarity index 86%
rename from play-services-api/src/main/java/com/google/android/gms/phenotype/Flag.java
rename to play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/Flag.java
index 0c1fdc8a..aa6bba20 100644
--- a/play-services-api/src/main/java/com/google/android/gms/phenotype/Flag.java
+++ b/play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/Flag.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.google.android.gms.phenotype;
+package com.mgoogle.android.gms.phenotype;
 
 import org.microg.safeparcel.AutoSafeParcelable;
 
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/phenotype/PhenotypeService.kt b/play-services-core/src/main/kotlin/org/microg/gms/phenotype/PhenotypeService.kt
index 045d8640..354c6833 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/phenotype/PhenotypeService.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/phenotype/PhenotypeService.kt
@@ -10,9 +10,9 @@ import android.util.Log
 import com.google.android.gms.common.api.Status
 import com.google.android.gms.common.internal.GetServiceRequest
 import com.google.android.gms.common.internal.IGmsCallbacks
-import com.google.android.gms.phenotype.Configurations
-import com.google.android.gms.phenotype.internal.IPhenotypeCallbacks
-import com.google.android.gms.phenotype.internal.IPhenotypeService
+import com.mgoogle.android.gms.phenotype.Configurations
+import com.mgoogle.android.gms.phenotype.internal.IPhenotypeCallbacks
+import com.mgoogle.android.gms.phenotype.internal.IPhenotypeService
 import org.microg.gms.BaseService
 import org.microg.gms.common.GmsService