diff --git a/device.mk b/device.mk
index bc7a57be..4ccfaec7 100644
--- a/device.mk
+++ b/device.mk
@@ -552,7 +552,7 @@ endif
 
 # WiFi
 PRODUCT_PACKAGES += \
-	android.hardware.wifi@1.0-service \
+	android.hardware.wifi-service \
 	wificond \
 	libwpa_client
 
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index fa007a42..fc00f31b 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -151,9 +151,9 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1.3</version>
+        <version>1</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>