diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d4ff986b..0a7d380a8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -339,7 +339,7 @@
         <!--EXCHANGE-REMOVE-SECTION-START-->
         <!-- In this release, GAL information is used locally only, so we used the same
              strict permissions. -->
-        <!-- NOTE: ExchangeGalProvider will replace ExchangeProvider after integration with
+        <!-- NOTE: ExchangeDirectoryProvider will replace ExchangeProvider after integration with
              the new GAL/contacts implementation -->
         <provider
             android:name="com.android.exchange.provider.ExchangeProvider"
@@ -348,8 +348,8 @@
             android:permission="com.android.email.permission.ACCESS_PROVIDER"
             />
         <provider
-            android:name="com.android.exchange.provider.ExchangeGalProvider"
-            android:authorities="com.android.exchange.gal.provider"
+            android:name="com.android.exchange.provider.ExchangeDirectoryProvider"
+            android:authorities="com.android.exchange.directory.provider"
             android:readPermission="android.permission.READ_CONTACTS"
             android:multiprocess="false"
             />
diff --git a/src/com/android/exchange/provider/ExchangeDirectoryProvider.java b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
index fde34df75..5d6121f53 100644
--- a/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
+++ b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
@@ -37,7 +37,7 @@ import android.provider.ContactsContract.RawContacts;
  * used solely to provide GAL (Global Address Lookup) service to email address adapters
  */
 public class ExchangeDirectoryProvider extends ContentProvider {
-    public static final String EXCHANGE_GAL_AUTHORITY = "com.android.exchange.gal.provider";
+    public static final String EXCHANGE_GAL_AUTHORITY = "com.android.exchange.directory.provider";
 
     private static final int GAL_BASE = 0;
     private static final int GAL_FILTER = GAL_BASE;