diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index 9336f75..1da94de 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -419,7 +419,7 @@
                 mContactsUnavailableFragment.setProviderStatusLoader(mProviderStatusLoader);
                 mContactsUnavailableFragment.setOnContactsUnavailableActionListener(
                         new ContactsUnavailableFragmentListener());
-                getFragmentManager().openTransaction()
+                getFragmentManager().beginTransaction()
                         .replace(R.id.contacts_unavailable_container, mContactsUnavailableFragment)
                         .commit();
             } else {
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 121b74d..2ed258f 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -261,7 +261,7 @@
         mListFragment.setQueryString(mRequest.getQueryString());
         mListFragment.setDirectoryResultLimit(DEFAULT_DIRECTORY_RESULT_LIMIT);
 
-        getFragmentManager().openTransaction()
+        getFragmentManager().beginTransaction()
                 .replace(R.id.list_container, mListFragment)
                 .commit();
     }
diff --git a/src/com/android/contacts/activities/JoinContactActivity.java b/src/com/android/contacts/activities/JoinContactActivity.java
index 2d205e6..7fa0384 100644
--- a/src/com/android/contacts/activities/JoinContactActivity.java
+++ b/src/com/android/contacts/activities/JoinContactActivity.java
@@ -87,7 +87,7 @@
 
         mListFragment = new JoinContactListFragment();
 
-        getFragmentManager().openTransaction()
+        getFragmentManager().beginTransaction()
                 .replace(R.id.list_container, mListFragment)
                 .commit();
     }
diff --git a/src/com/android/contacts/activities/NonPhoneActivity.java b/src/com/android/contacts/activities/NonPhoneActivity.java
index d37f21f..4bf56fe 100644
--- a/src/com/android/contacts/activities/NonPhoneActivity.java
+++ b/src/com/android/contacts/activities/NonPhoneActivity.java
@@ -48,7 +48,7 @@
 
         final NonPhoneDialogFragment fragment = new NonPhoneDialogFragment();
         fragment.setArguments(Bundle.forPair("PHONE_NUMBER", phoneNumber));
-        getFragmentManager().openTransaction().add(fragment, "Fragment").commit();
+        getFragmentManager().beginTransaction().add(fragment, "Fragment").commit();
     }
 
     private String getPhoneNumber() {
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index 0030845..60089f3 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -79,7 +79,7 @@
         if (fragment == null) {
             fragment = new ContactDeletionInteraction();
             fragment.setContactUri(contactUri);
-            fragmentManager.openTransaction().add(fragment, FRAGMENT_TAG).commit();
+            fragmentManager.beginTransaction().add(fragment, FRAGMENT_TAG).commit();
         } else {
             fragment.setContactUri(contactUri);
         }
