diff --git a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
index 255cbad..a0a4312 100644
--- a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
@@ -396,7 +396,10 @@ public class ChooseDataSimPage extends SetupPage {
 
         private void updateCarrierText(SubscriptionInfo subInfoRecord) {
             if (mIsAttached) {
-                String name = mPhone.getNetworkOperatorName(subInfoRecord.getSubscriptionId());
+                String name = mPhone.getSimOperatorNameForSubscription(subInfoRecord.getSubscriptionId());
+                if (TextUtils.isEmpty(name)) {
+                    name = mPhone.getNetworkOperatorName(subInfoRecord.getSubscriptionId());
+                }
                 ServiceState serviceState = mServiceStates.get(subInfoRecord.getSimSlotIndex());
                 final int slot = subInfoRecord.getSimSlotIndex();
                 final View v = mRows.get(slot);
diff --git a/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java b/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java
index 8940fd3..da3872e 100644
--- a/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java
@@ -237,7 +237,10 @@ public class MobileDataPage extends SetupPage {
         private void updateCarrierText() {
             if (mIsAttached) {
                 String name =
-                        mPhone.getNetworkOperatorName(SubscriptionManager.getDefaultDataSubId());
+                        mPhone.getSimOperatorNameForSubscription(SubscriptionManager.getDefaultDataSubId());
+                if (TextUtils.isEmpty(name)) {
+                    name = mPhone.getNetworkOperatorName(SubscriptionManager.getDefaultDataSubId());
+                }
                 if (TextUtils.isEmpty(name)) {
                     if (mServiceState != null && mServiceState.isEmergencyOnly()) {
                         name = getString(R.string.setup_mobile_data_emergency_only);