diff --git a/email2/AndroidManifest.xml b/email2/AndroidManifest.xml
index 27f8bb620..51fd8438d 100644
--- a/email2/AndroidManifest.xml
+++ b/email2/AndroidManifest.xml
@@ -254,7 +254,7 @@
           called SuggestionsProvider. It declares an authority which looks up package name
           at runtime with getContext().getPackageName() and adds ".SuggestionsProvider" to it. -->
         <provider android:name="com.android.mail.providers.SuggestionsProvider"
-            android:authorities="com.android.email.SuggestionsProvider" />
+            android:authorities="com.google.android.email.SuggestionsProvider" />
 
         <receiver android:name="com.android.mail.providers.protos.boot.AccountReceiver">
           <intent-filter>
diff --git a/email2/res/xml/searchable.xml b/email2/res/xml/searchable.xml
index 3fe25a854..f1b98dd25 100644
--- a/email2/res/xml/searchable.xml
+++ b/email2/res/xml/searchable.xml
@@ -19,7 +19,7 @@
     android:label="@string/search_title"
     android:hint="@string/search_hint"
     android:icon="@drawable/ic_menu_search_holo_light"
-    android:searchSuggestAuthority="com.android.email.SuggestionsProvider"
+    android:searchSuggestAuthority="com.google.android.email.SuggestionsProvider"
     android:searchSuggestSelection="query LIKE ?"
     android:searchSuggestIntentAction="android.intent.action.SEARCH"
     android:imeOptions="actionSearch" />