diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6544e07..a0a2ab7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -163,8 +163,8 @@
             </intent-filter>
         </activity-alias>
 
-        <!-- The actual list of contacts, usually embedded in ContactsActivity -->
-        <activity android:name="ContactsListActivity"
+        <!-- The actual list of contacts -->
+        <activity android:name=".activities.ContactListActivity"
             android:label="@string/contactsList"
             android:clearTaskOnLaunch="true"
         >
@@ -241,6 +241,11 @@
             </intent-filter>
         </activity>
 
+        <!-- Backwards compatibility: somebody may have hard coded this activity name -->
+        <activity-alias android:name="ContactsListActivity"
+            android:targetActivity=".activities.ContactListActivity"
+        />
+
         <!-- An activity for joining contacts -->
         <activity android:name="JoinContactActivity"
             android:theme="@style/TallTitleBarTheme"
diff --git a/src/com/android/contacts/ContactsSearchActivity.java b/src/com/android/contacts/ContactsSearchActivity.java
index 3f1e62c..7d84640 100644
--- a/src/com/android/contacts/ContactsSearchActivity.java
+++ b/src/com/android/contacts/ContactsSearchActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.contacts;
 
-public class ContactsSearchActivity extends ContactsListActivity {
+import com.android.contacts.activities.ContactListActivity;
+
+public class ContactsSearchActivity extends ContactListActivity {
 
 }
\ No newline at end of file
diff --git a/src/com/android/contacts/DialtactsActivity.java b/src/com/android/contacts/DialtactsActivity.java
index 882a4fb..1771405 100644
--- a/src/com/android/contacts/DialtactsActivity.java
+++ b/src/com/android/contacts/DialtactsActivity.java
@@ -17,6 +17,7 @@
 package com.android.contacts;
 
 import com.android.contacts.activities.ContactsFrontDoor;
+import com.android.contacts.activities.ContactListActivity;
 import com.android.internal.telephony.ITelephony;
 
 import android.app.Activity;
@@ -157,7 +158,7 @@
 
     private void setupContactsTab() {
         Intent intent = new Intent(UI.LIST_DEFAULT);
-        intent.setClass(this, ContactsListActivity.class);
+        intent.setClass(this, ContactListActivity.class);
 
         mTabHost.addTab(mTabHost.newTabSpec("contacts")
                 .setIndicator(getText(R.string.contactsIconLabel),
@@ -167,7 +168,7 @@
 
     private void setupFavoritesTab() {
         Intent intent = new Intent(UI.LIST_STREQUENT_ACTION);
-        intent.setClass(this, ContactsListActivity.class);
+        intent.setClass(this, ContactListActivity.class);
 
         mTabHost.addTab(mTabHost.newTabSpec("favorites")
                 .setIndicator(getString(R.string.contactsFavoritesLabel),
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/activities/ContactListActivity.java
similarity index 98%
rename from src/com/android/contacts/ContactsListActivity.java
rename to src/com/android/contacts/activities/ContactListActivity.java
index 73a9a1a..e6a220a 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/activities/ContactListActivity.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.contacts;
+package com.android.contacts.activities;
 
+import com.android.contacts.R;
 import com.android.contacts.interactions.ContactDeletionInteraction;
 import com.android.contacts.interactions.ImportExportInteraction;
 import com.android.contacts.interactions.PhoneNumberInteraction;
@@ -56,7 +57,7 @@
 /**
  * Displays a list of contacts. Usually is embedded into the ContactsActivity.
  */
-public class ContactsListActivity extends Activity implements View.OnCreateContextMenuListener {
+public class ContactListActivity extends Activity implements View.OnCreateContextMenuListener {
 
     private static final String TAG = "ContactsListActivity";
 
@@ -82,7 +83,7 @@
 
 
 
-    public ContactsListActivity() {
+    public ContactListActivity() {
         mIntentResolver = new ContactsIntentResolver(this);
     }
 
diff --git a/src/com/android/contacts/ui/ShowOrCreateActivity.java b/src/com/android/contacts/ui/ShowOrCreateActivity.java
index e0781d2..ee40d76 100755
--- a/src/com/android/contacts/ui/ShowOrCreateActivity.java
+++ b/src/com/android/contacts/ui/ShowOrCreateActivity.java
@@ -17,8 +17,8 @@
 package com.android.contacts.ui;
 
 import com.android.contacts.ContactsSearchManager;
-import com.android.contacts.ContactsListActivity;
 import com.android.contacts.R;
+import com.android.contacts.activities.ContactListActivity;
 import com.android.contacts.util.Constants;
 import com.android.contacts.util.NotifyingAsyncQueryHandler;
 
@@ -176,7 +176,7 @@
         } else if (count > 1) {
             // If more than one, show pick list
             Intent listIntent = new Intent(Intent.ACTION_SEARCH);
-            listIntent.setComponent(new ComponentName(this, ContactsListActivity.class));
+            listIntent.setComponent(new ComponentName(this, ContactListActivity.class));
             listIntent.putExtras(mCreateExtras);
             startActivity(listIntent);
             finish();
diff --git a/src/com/android/contacts/vcard/ExportProcessor.java b/src/com/android/contacts/vcard/ExportProcessor.java
index fd3498a..d81b68c 100644
--- a/src/com/android/contacts/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -28,8 +28,8 @@
 import android.util.Log;
 import android.widget.RemoteViews;
 
-import com.android.contacts.ContactsListActivity;
 import com.android.contacts.R;
+import com.android.contacts.activities.ContactListActivity;
 import com.android.vcard.VCardComposer;
 import com.android.vcard.VCardConfig;
 
@@ -239,7 +239,7 @@
         notification.contentView = remoteViews;
         notification.contentIntent =
                 PendingIntent.getActivity(mService, 0,
-                        new Intent(mService, ContactsListActivity.class), 0);
+                        new Intent(mService, ContactListActivity.class), 0);
         mNotificationManager.notify(VCardService.EXPORT_NOTIFICATION_ID, notification);
     }
 
@@ -248,7 +248,7 @@
         notification.icon = android.R.drawable.stat_sys_upload_done;
         notification.flags |= Notification.FLAG_AUTO_CANCEL;
         notification.setLatestEventInfo(mService, title, message, null);
-        final Intent intent = new Intent(mService, ContactsListActivity.class);
+        final Intent intent = new Intent(mService, ContactListActivity.class);
         notification.contentIntent =
                 PendingIntent.getActivity(mService, 0, intent, 0);
         mNotificationManager.notify(VCardService.EXPORT_NOTIFICATION_ID, notification);
diff --git a/src/com/android/contacts/vcard/ImportProgressNotifier.java b/src/com/android/contacts/vcard/ImportProgressNotifier.java
index afd6c3a..b7fac49 100644
--- a/src/com/android/contacts/vcard/ImportProgressNotifier.java
+++ b/src/com/android/contacts/vcard/ImportProgressNotifier.java
@@ -21,8 +21,8 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.android.contacts.ContactsListActivity;
 import com.android.contacts.R;
+import com.android.contacts.activities.ContactListActivity;
 import com.android.vcard.VCardEntry;
 import com.android.vcard.VCardEntryHandler;
 
@@ -102,7 +102,7 @@
 
         final PendingIntent pendingIntent =
             PendingIntent.getActivity(context, 0,
-                    new Intent(context, ContactsListActivity.class),
+                    new Intent(context, ContactListActivity.class),
                     PendingIntent.FLAG_UPDATE_CURRENT);
 
         // notification.contentIntent = pendingIntent;
diff --git a/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java b/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
index f5bb548..0666879 100644
--- a/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
+++ b/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
@@ -28,17 +28,16 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.ContactsContract;
 import android.provider.Contacts.ContactMethods;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Phones;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Intents;
-import android.provider.ContactsContract.RawContacts;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Intents;
 import android.provider.ContactsContract.Intents.Insert;
 import android.provider.ContactsContract.Intents.UI;
+import android.provider.ContactsContract.RawContacts;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
@@ -54,11 +53,11 @@
     private static final String ANDROID_CONTACTS_PACKAGE = "com.android.contacts";
 
     private static final String CONTACTS_LIST_ACTIVITY_CLASS_NAME =
-            "com.android.contacts.ContactsListActivity";
+            "com.android.contacts.activities.ContactsListActivity";
     private static final String SEARCH_RESULTS_ACTIVITY_CLASS_NAME =
             "com.android.contacts.SearchResultsActivity";
     private static final String MULTIPLE_PHONE_PICKER_ACTIVITY_CLASS_NAME =
-        "com.android.contacts.MultiplePhonePickerActivity";
+            "com.android.contacts.MultiplePhonePickerActivity";
 
     private static final int LIST_DEFAULT = 0;
     private static final int LIST_ALL_CONTACTS_ACTION = 1;