diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 502184c..d3ac0ee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -161,13 +161,13 @@
 
         <!-- Used to filter contacts list by account -->
         <activity
-            android:name="com.android.contacts.list.AccountFilterActivity"
+            android:name="com.android.contacts.common.list.AccountFilterActivity"
             android:label="@string/activity_title_contacts_filter"
             android:theme="@style/ContactListFilterTheme"/>
 
         <!-- Used to select display and sync groups -->
         <activity
-            android:name="com.android.contacts.list.CustomContactListFilterActivity"
+            android:name="com.android.contacts.common.list.CustomContactListFilterActivity"
             android:label="@string/custom_list_filter"
             android:theme="@style/ContactListFilterTheme"/>
 
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index cb3e3b9..339895b 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -61,9 +61,9 @@
 import com.android.contacts.common.list.ContactListFilterController;
 import com.android.contacts.common.list.ContactListFilterController.ContactListFilterListener;
 import com.android.contacts.common.list.ContactListItemView;
+import com.android.contacts.common.util.AccountFilterUtil;
 import com.android.contacts.list.OnPhoneNumberPickerActionListener;
 import com.android.contacts.list.PhoneNumberPickerFragment;
-import com.android.contacts.util.AccountFilterUtil;
 import com.android.dialer.calllog.CallLogFragment;
 import com.android.dialer.dialpad.DialpadFragment;
 import com.android.dialer.interactions.PhoneNumberInteraction;
diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 06be73d..a5377d4 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -55,8 +55,8 @@
 import com.android.contacts.common.list.ContactTileView;
 import com.android.contacts.common.list.PhoneNumberListAdapter;
 import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.common.util.AccountFilterUtil;
 import com.android.contacts.interactions.ImportExportDialogFragment;
-import com.android.contacts.util.AccountFilterUtil;
 import com.android.dialer.R;
 
 /**