diff --git a/device.mk b/device.mk
index 496c5c8..94ce16f 100644
--- a/device.mk
+++ b/device.mk
@@ -96,7 +96,7 @@ endif
 
 # Kernel Modules
 PRODUCT_PACKAGES += \
-    cypress-fmac
+    cypress-fmac-upstream
 
 # Keylayouts
 PRODUCT_PACKAGES += \
diff --git a/initfiles/lkm_loader.sh b/initfiles/lkm_loader.sh
index 842abce..dcb8d03 100644
--- a/initfiles/lkm_loader.sh
+++ b/initfiles/lkm_loader.sh
@@ -45,7 +45,7 @@ do_insmod /vendor/lib/modules/bluedroid_pm.ko
 if [ "`cat /proc/device-tree/brcmfmac_pcie_wlan/status`" = "okay" ]; then
         /vendor/bin/log -t "wifiloader" -p i " Loading brcmfmac driver for wlan"
         do_insmod /vendor/lib/modules/compat.ko
-        do_insmod /vendor/lib/modules/cy_cfg80211.ko
+        do_insmod /vendor/lib/modules/cfg80211.ko
         do_insmod /vendor/lib/modules/brcmutil.ko
         do_insmod /vendor/lib/modules/brcmfmac.ko
 fi
diff --git a/lineage.dependencies b/lineage.dependencies
index 87eb380..dbf7763 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -4,8 +4,8 @@
    "target_path": "device/nvidia/t210-common"
  },
  {
-   "repository": "android_kernel_nvidia_cypress-fmac",
-   "target_path": "kernel/nvidia/cypress-fmac"
+   "repository": "android_kernel_nvidia_cypress-fmac-upstream",
+   "target_path": "kernel/nvidia/cypress-fmac-upstream"
  },
  {
    "repository": "android_kernel_nvidia_kernel",