diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 8d4e77b..0ecb8a9 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -33,8 +33,8 @@
 import android.net.wifi.WifiConfiguration.ProxySettings;
 import android.net.wifi.WifiConfiguration.Status;
 import android.net.wifi.WifiInfo;
-import android.net.wifi.WpsConfiguration;
-import android.net.wifi.WpsConfiguration.Setup;
+import android.net.wifi.Wps;
+import android.net.wifi.Wps.Setup;
 import android.security.Credentials;
 import android.security.KeyStore;
 import android.text.Editable;
@@ -484,8 +484,8 @@
         return MANUAL;
     }
 
-    WpsConfiguration getWpsConfig() {
-        WpsConfiguration config = new WpsConfiguration();
+    Wps getWpsConfig() {
+        Wps config = new Wps();
         switch (mNetworkSetupSpinner.getSelectedItemPosition()) {
             case WPS_PBC:
                 config.setup = Setup.PBC;
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
index c345538..d6e80f5 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
@@ -19,8 +19,8 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.net.wifi.WpsConfiguration;
-import android.net.wifi.WpsConfiguration.Setup;
+import android.net.wifi.Wps;
+import android.net.wifi.Wps.Setup;
 import android.net.wifi.p2p.WifiP2pConfig;
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.os.Bundle;
@@ -64,7 +64,7 @@
     public WifiP2pConfig getConfig() {
         WifiP2pConfig config = new WifiP2pConfig();
         config.deviceAddress = mDeviceAddress.getText().toString();
-        config.wpsConfig = new WpsConfiguration();
+        config.wpsConfig = new Wps();
         switch (mWpsSetupIndex) {
             case WPS_PBC:
                 config.wpsConfig.setup = Setup.PBC;
