diff --git a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
index b9c2d4315cb..3aa92f1f9aa 100644
--- a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
+++ b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
@@ -73,7 +73,7 @@ public class AdbDeviceDetailsFingerprintController extends AbstractPreferenceCon
         final CharSequence titleFormat = mContext.getText(
                 R.string.adb_device_fingerprint_title_format);
         mFingerprintPref.setTitle(String.format(
-                titleFormat.toString(), mPairedDevice.getGuid()));
+                titleFormat.toString(), mPairedDevice.guid));
         mFingerprintCategory.addPreference(mFingerprintPref);
     }
 }
diff --git a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
index a4e79eac8be..7830bb978ae 100644
--- a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
+++ b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
@@ -81,7 +81,7 @@ public class AdbDeviceDetailsHeaderController extends AbstractPreferenceControll
 
         mEntityHeaderController
                 .setIcon(mContext.getDrawable(com.android.internal.R.drawable.ic_bt_laptop))
-                .setLabel(mPairedDevice.getDeviceName())
+                .setLabel(mPairedDevice.name)
                 .done(mFragment.getActivity(), true);
     }
 }
diff --git a/src/com/android/settings/development/AdbPairedDevicePreference.java b/src/com/android/settings/development/AdbPairedDevicePreference.java
index a82a949ad01..5d30428709e 100644
--- a/src/com/android/settings/development/AdbPairedDevicePreference.java
+++ b/src/com/android/settings/development/AdbPairedDevicePreference.java
@@ -77,8 +77,8 @@ public class AdbPairedDevicePreference extends Preference {
 
     static void setTitle(AdbPairedDevicePreference preference,
                          PairDevice pairedDevice) {
-        preference.setTitle(pairedDevice.getDeviceName());
-        preference.setSummary(pairedDevice.isConnected()
+        preference.setTitle(pairedDevice.name);
+        preference.setSummary(pairedDevice.connected
                 ? preference.getContext().getText(R.string.adb_wireless_device_connected_summary)
                 : "");
     }
diff --git a/src/com/android/settings/development/WirelessDebuggingFragment.java b/src/com/android/settings/development/WirelessDebuggingFragment.java
index 47d4e52110f..46fca985270 100644
--- a/src/com/android/settings/development/WirelessDebuggingFragment.java
+++ b/src/com/android/settings/development/WirelessDebuggingFragment.java
@@ -434,7 +434,7 @@ public class WirelessDebuggingFragment extends DashboardFragment
             case FORGET_ACTION:
                 try {
                     p = (PairDevice) data.getParcelableExtra(PAIRED_DEVICE_EXTRA);
-                    mAdbManager.unpairDevice(p.getGuid());
+                    mAdbManager.unpairDevice(p.guid);
                 } catch (RemoteException e) {
                     Log.e(TAG, "Unable to forget the device");
                 }