diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
index eb118ad..dea134b 100644
--- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
@@ -51,9 +51,6 @@
  */
 public class ContactEditorAccountsChangedActivity extends Activity
         implements AccountsLoader.AccountsListener {
-
-    private static final String TAG = ContactEditorAccountsChangedActivity.class.getSimpleName();
-
     private static final int SUBACTIVITY_ADD_NEW_ACCOUNT = 1;
 
     private AccountsListAdapter mAccountListAdapter;
diff --git a/src/com/android/contacts/dialog/IndeterminateProgressDialog.java b/src/com/android/contacts/dialog/IndeterminateProgressDialog.java
index 21cd4bb..f0b7eec 100644
--- a/src/com/android/contacts/dialog/IndeterminateProgressDialog.java
+++ b/src/com/android/contacts/dialog/IndeterminateProgressDialog.java
@@ -42,7 +42,7 @@
  * internally with true.
  */
 public class IndeterminateProgressDialog extends DialogFragment {
-    private static final String TAG = IndeterminateProgressDialog.class.getSimpleName();
+    private static final String TAG = "IndeterminateProgress";
 
     private CharSequence mTitle;
     private CharSequence mMessage;
diff --git a/src/com/android/contacts/editor/AggregationSuggestionEngine.java b/src/com/android/contacts/editor/AggregationSuggestionEngine.java
index 3d5af74..adc20d2 100644
--- a/src/com/android/contacts/editor/AggregationSuggestionEngine.java
+++ b/src/com/android/contacts/editor/AggregationSuggestionEngine.java
@@ -53,8 +53,6 @@
  * Runs asynchronous queries to obtain aggregation suggestions in the as-you-type mode.
  */
 public class AggregationSuggestionEngine extends HandlerThread {
-    public static final String TAG = "AggregationSuggestionEngine";
-
     public interface Listener {
         void onAggregationSuggestionChange();
     }
diff --git a/src/com/android/contacts/editor/SelectAccountDialogFragment.java b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
index 88e92b7..3b41c86 100644
--- a/src/com/android/contacts/editor/SelectAccountDialogFragment.java
+++ b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
@@ -43,7 +43,7 @@
  */
 public final class SelectAccountDialogFragment extends DialogFragment
         implements AccountsLoader.AccountsListener {
-    public static final String TAG = "SelectAccountDialogFragment";
+    public static final String TAG = "SelectAccountDialog";
 
     private static final String KEY_TITLE_RES_ID = "title_res_id";
     private static final String KEY_LIST_FILTER = "list_filter";
diff --git a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
index 950b8c6..9b4e234 100644
--- a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
+++ b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
@@ -34,7 +34,7 @@
 public class SplitContactConfirmationDialogFragment extends DialogFragment {
 
     private static final String ARG_HAS_PENDING_CHANGES = "hasPendingChanges";
-    public static final String TAG = "splitContactConfirmation";
+    public static final String TAG = "SplitConfirmation";
 
     /**
      * Callbacks for the dialog host.
diff --git a/src/com/android/contacts/interactions/CalendarInteractionsLoader.java b/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
index ec723a5..646b2db 100644
--- a/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
@@ -29,7 +29,7 @@
  * Note: the calendar provider treats mailing lists as atomic email addresses.
  */
 public class CalendarInteractionsLoader extends AsyncTaskLoader<List<ContactInteraction>> {
-    private static final String TAG = CalendarInteractionsLoader.class.getSimpleName();
+    private static final String TAG = "CalendarInteractions";
 
     private List<String> mEmailAddresses;
     private int mMaxFutureToRetrieve;
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index 161571c..240588b 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -54,7 +54,7 @@
 public class ContactDeletionInteraction extends Fragment
         implements LoaderCallbacks<Cursor>, OnDismissListener {
 
-    private static final String TAG = "ContactDeletionInteraction";
+    private static final String TAG = "ContactDeletion";
     private static final String FRAGMENT_TAG = "deleteContact";
 
     private static final String KEY_ACTIVE = "active";
diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
index 695e9f6..47b76a5 100644
--- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
@@ -57,7 +57,7 @@
     }
 
     private static final String FRAGMENT_TAG = "deleteMultipleContacts";
-    private static final String TAG = "ContactMultiDeletionInteraction";
+    private static final String TAG = "ContactMultiDeletion";
     private static final String KEY_ACTIVE = "active";
     private static final String KEY_CONTACTS_IDS = "contactIds";
     public static final String ARG_CONTACT_IDS = "contactIds";
diff --git a/src/com/android/contacts/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
index 6115b50..72aa44c 100644
--- a/src/com/android/contacts/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -61,7 +61,7 @@
         extends Fragment
         implements OnItemClickListener, OnScrollListener, OnFocusChangeListener, OnTouchListener,
                 OnItemLongClickListener, LoaderCallbacks<Cursor> {
-    private static final String TAG = "ContactEntryListFragment";
+    private static final String TAG = "ContactEntryList";
 
     // TODO: Make this protected. This should not be used from the PeopleActivity but
     // instead use the new startActivityWithResultFromFragment API
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index 2fe9e12..92087b3 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -87,7 +87,7 @@
 public class CustomContactListFilterActivity extends Activity implements
         ExpandableListView.OnChildClickListener,
         LoaderCallbacks<CustomContactListFilterActivity.AccountSet> {
-    private static final String TAG = "CustomContactListFilterActivity";
+    private static final String TAG = "CustomContactListFilter";
 
     public static final String EXTRA_CURRENT_LIST_FILTER_TYPE = "currentListFilterType";
 
diff --git a/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java b/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java
index 10d189c..1402a78 100644
--- a/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java
@@ -24,7 +24,7 @@
  */
 public class LegacyPhoneNumberPickerFragment extends PhoneNumberPickerFragment {
 
-    private static final String TAG = LegacyPhoneNumberPickerFragment.class.getSimpleName();
+    private static final String TAG = "LegacyPhoneNumberPicker";
 
     @Override
     protected boolean getVisibleScrollbarEnabled() {
diff --git a/src/com/android/contacts/list/PhoneNumberPickerFragment.java b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
index ab78e0d..cbc8def 100644
--- a/src/com/android/contacts/list/PhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
@@ -36,7 +36,7 @@
  */
 public class PhoneNumberPickerFragment extends ContactEntryListFragment<ContactEntryListAdapter>
         implements OnShortcutIntentCreatedListener, PhoneNumberListAdapter.Listener {
-    private static final String TAG = PhoneNumberPickerFragment.class.getSimpleName();
+    private static final String TAG = "PhoneNumberPicker";
 
     private static final String KEY_SHORTCUT_ACTION = "shortcutAction";
 
diff --git a/src/com/android/contacts/model/account/SamsungAccountType.java b/src/com/android/contacts/model/account/SamsungAccountType.java
index 23c7940..aa55095 100644
--- a/src/com/android/contacts/model/account/SamsungAccountType.java
+++ b/src/com/android/contacts/model/account/SamsungAccountType.java
@@ -44,7 +44,7 @@
  * since managing ringtones is handled in a different flow.
  */
 public class SamsungAccountType extends BaseAccountType {
-    private static final String TAG = "KnownExternalAccountType";
+    private static final String TAG = "KnownExternalAccount";
     private static final String ACCOUNT_TYPE_SAMSUNG = "com.osp.app.signin";
 
     public SamsungAccountType(Context context, String authenticatorPackageName, String type) {
diff --git a/tests/src/com/android/contacts/model/RawContactDeltaListTests.java b/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
index 4565495..03e1d4f 100644
--- a/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
+++ b/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
@@ -44,8 +44,6 @@
  */
 @LargeTest
 public class RawContactDeltaListTests extends AndroidTestCase {
-    public static final String TAG = RawContactDeltaListTests.class.getSimpleName();
-
     // From android.content.ContentProviderOperation
     public static final int TYPE_INSERT = 1;
     public static final int TYPE_UPDATE = 2;
diff --git a/tests/src/com/android/contacts/tests/allintents/SelectAccountDialogFragment.java b/tests/src/com/android/contacts/tests/allintents/SelectAccountDialogFragment.java
index f0c2df4..10661db 100644
--- a/tests/src/com/android/contacts/tests/allintents/SelectAccountDialogFragment.java
+++ b/tests/src/com/android/contacts/tests/allintents/SelectAccountDialogFragment.java
@@ -35,7 +35,7 @@
  * Does not perform any action by itself.
  */
 public class SelectAccountDialogFragment extends DialogFragment {
-    public static final String TAG = "SelectAccountDialogFragment";
+    public static final String TAG = "SelectAccountDialog";
 
     private static final String EXTRA_TAG = "tag";