diff --git a/bsp/ath79-generic.bsp b/bsp/ath79-generic.bsp
index b06039b3..907e0f7c 100644
--- a/bsp/ath79-generic.bsp
+++ b/bsp/ath79-generic.bsp
@@ -20,6 +20,6 @@ images=("openwrt-${chipset}-${subtarget}-glinet_gl-ar150-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v4-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_tl-wr1043n-v5-squashfs-*"
         "openwrt-${chipset}-${subtarget}-ubnt_nanostation-loco-m-xw-squashfs-*"
-        "openwrt-${chipset}-${subtarget}-ubnt_unifi-squashfs-*"
+        "openwrt-${chipset}-${subtarget}-ubnt_unifi-ap-squashfs-*"
         "openwrt-${chipset}-${subtarget}-ubnt_unifiac-mesh-squashfs-*"
         )
diff --git a/bsp/ath79-generic/.config b/bsp/ath79-generic/.config
index e7d567ce..b812287c 100644
--- a/bsp/ath79-generic/.config
+++ b/bsp/ath79-generic/.config
@@ -60,8 +60,8 @@ CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-m=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_nanostation-m="-rssileds"
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_picostation-m=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_picostation-m="-rssileds"
-CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_unifi=y
-CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_unifi=""
+CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_unifi-ap=y
+CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_unifi-ap=""
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_unifiac-mesh=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_unifiac-mesh="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
 CONFIG_BUSYBOX_CUSTOM=y
diff --git a/src/packages/fff/fff-network/files/lib/functions/fff/cpuport b/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
index 31cfb600..77de67ce 100644
--- a/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
+++ b/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
@@ -22,7 +22,7 @@ get_cpu_port() {
 		ubnt,edgerouter-x|\
 		ubnt,edgerouter-x-sfp|\
 		ubnt,nanostation-loco-m-xw|\
-		ubnt,unifi|\
+		ubnt,unifi-ap|\
 		ubnt,unifiac-mesh|\
 		x86_64|\
 		xiaomi,mi-router-4a-gigabit)
diff --git a/src/packages/fff/fff-network/mips/network.mode b/src/packages/fff/fff-network/mips/network.mode
index f3a27939..63da1230 100644
--- a/src/packages/fff/fff-network/mips/network.mode
+++ b/src/packages/fff/fff-network/mips/network.mode
@@ -21,7 +21,7 @@
 ## ETHMODE. The default mode for these devices is "BATMAN".
 ## For example this is the case for: gl-ar150, tl-mr3020-v1, tl-wa850re-v1,
 ## tl-wa860re-v1, tl-wa901nd-v2, ubnt-bullet-m, ubnt-loco-m-xw, ubnt-nano-m,
-## ubnt-unifi
+## ubnt-unifi-ap
 ETHMODE="CLIENT"
 ## Devices featuring 2 ethernet ports are configured by SPECIFIERs ressembling
 ## the labels on the PORT itself. For the cpe210 these are called LAN0 and LAN1.
diff --git a/src/packages/fff/fff-network/mips/network.ubnt,unifi b/src/packages/fff/fff-network/mips/network.ubnt,unifi-ap
similarity index 100%
rename from src/packages/fff/fff-network/mips/network.ubnt,unifi
rename to src/packages/fff/fff-network/mips/network.ubnt,unifi-ap
diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
index 418042e1..c4321ab1 100644
--- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
+++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
@@ -10,7 +10,7 @@ case "$BOARD" in
 		uci set wireless.radio0.antenna_gain=9
 		uci commit wireless
 		;;
-	ubnt,unifi)
+	ubnt,unifi-ap)
 		# No support for Unifi AP Pro!
 		uci set wireless.radio0.antenna_gain=3
 		uci commit wireless