diff --git a/BoardConfig.mk b/BoardConfig.mk
index ba5b767..5f91524 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -57,7 +57,7 @@ BOARD_WLAN_DEVICE           := bcm4329
 WIFI_DRIVER_MODULE_PATH     := "/system/lib/modules/bcm4329.ko"
 WIFI_DRIVER_FW_PATH_STA     := "/vendor/firmware/fw_bcm4329.bin"
 WIFI_DRIVER_FW_PATH_AP      := "/vendor/firmware/fw_bcm4329_apsta.bin"
-WIFI_DRIVER_MODULE_ARG      := "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/proc/calibration"
+WIFI_DRIVER_MODULE_ARG      := "iface_name=wlan firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/proc/calibration"
 WIFI_DRIVER_MODULE_NAME     := "bcm4329"
 
 BOARD_KERNEL_CMDLINE := no_console_suspend=1 wire.search_count=5
diff --git a/leo.mk b/leo.mk
index 357fbc9..633dbc2 100644
--- a/leo.mk
+++ b/leo.mk
@@ -53,7 +53,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.ril.enable.managed.roaming=1 \
 	ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
 	ro.ril.emc.mode=2 \
-	wifi.interface=eth0 \
 	mobiledata.interfaces=rmnet0,rmnet1,rmnet2,ppp0
 	
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -67,8 +66,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # 3 => /* GSM/WCDMA (auto mode, according to PRL) */
 PRODUCT_PROPERTY_OVERRIDES += ro.telephony.default_network=0
 	
-# Reduce wifi scan. Better batery life
 PRODUCT_PROPERTY_OVERRIDES += \
+	wifi.interface=wlan0 \
 	ro.ril.disable.power.collapse=0 \
 	wifi.supplicant_scan_interval=180 
 
diff --git a/prebuilt/init.htcleo.rc b/prebuilt/init.htcleo.rc
index 9e3d617..9190a27 100644
--- a/prebuilt/init.htcleo.rc
+++ b/prebuilt/init.htcleo.rc
@@ -196,17 +196,17 @@ service akmd /system/bin/akmd
     group compass misc input
 
 service wpa_supplicant /system/bin/wpa_supplicant \
-    -Dwext -ieth0 -c/data/misc/wifi/wpa_supplicant.conf
+    -Dwext -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf
 #   we will start as root and wpa_supplicant will switch to user wifi
 #   after setting up the capabilities required for WEXT
 #   user wifi
 #   group wifi inet keystore
     class main
-    socket wpa_eth0 dgram 660 wifi wifi
+    socket wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot
 
-service dhcpcd_eth0 /system/bin/dhcpcd -ABKL
+service dhcpcd_wlan0 /system/bin/dhcpcd -ABKL
     class main
     disabled
     oneshot
@@ -216,7 +216,7 @@ service dhcpcd_bnep0 /system/bin/dhcpcd -ABKL
     disabled
     oneshot
 
-service iprenew_eth0 /system/bin/dhcpcd -n
+service iprenew_wlan0 /system/bin/dhcpcd -n
     class main
     disabled
     oneshot