diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index bf5fa49..5cf8bd5 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -18,7 +18,7 @@
 
 import com.android.contacts.TextHighlightingAnimation.TextWithHighlighting;
 import com.android.contacts.list.ContactItemListAdapter;
-import com.android.contacts.list.config.ContactListConfiguration;
+import com.android.contacts.list.ContactsIntentResolver;
 import com.android.contacts.model.ContactsSource;
 import com.android.contacts.model.Sources;
 import com.android.contacts.ui.ContactsPreferences;
@@ -502,10 +502,10 @@
         }
     };
 
-    private ContactListConfiguration mConfig;
+    private ContactsIntentResolver mConfig;
 
     public ContactsListActivity() {
-        mConfig = new ContactListConfiguration(this);
+        mConfig = new ContactsIntentResolver(this);
     }
 
     /**
diff --git a/src/com/android/contacts/list/config/ContactListConfiguration.java b/src/com/android/contacts/list/ContactsIntentResolver.java
similarity index 98%
rename from src/com/android/contacts/list/config/ContactListConfiguration.java
rename to src/com/android/contacts/list/ContactsIntentResolver.java
index ab4731b..d7469b4 100644
--- a/src/com/android/contacts/list/config/ContactListConfiguration.java
+++ b/src/com/android/contacts/list/ContactsIntentResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.list.config;
+package com.android.contacts.list;
 
 import com.android.contacts.ContactsSearchManager;
 import com.android.contacts.JoinContactActivity;
@@ -48,7 +48,7 @@
  * deals with intents, saved instance configuration etc.
  */
 @SuppressWarnings("deprecation")
-public class ContactListConfiguration {
+public class ContactsIntentResolver {
 
     private static final String TAG = "ContactsListActivity";
 
@@ -199,7 +199,7 @@
     private static final int QUERY_MODE_MAILTO = 1;
     private static final int QUERY_MODE_TEL = 2;
 
-    public ContactListConfiguration(Activity context) {
+    public ContactsIntentResolver(Activity context) {
         this.mContext = context;
     }
 
@@ -470,4 +470,6 @@
         }
         return null;
     }
+
+
 }