diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index b7a191354d..bca061fce4 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -645,13 +645,13 @@ ar71xx_board_detect() {
 	*"GL-MIFI")
 		name="gl-mifi"
 		;;
-	*"EnGenius EPG5000")
+	*"EPG5000")
 		name="epg5000"
 		;;
-	*"EnGenius ESR1750")
+	*"ESR1750")
 		name="esr1750"
 		;;
-	*"EnGenius ESR900")
+	*"ESR900")
 		name="esr900"
 		;;
 	*"JA76PF")
@@ -734,7 +734,7 @@ ar71xx_board_detect() {
 	*"My Net N750")
 		name="mynet-n750"
 		;;
-	*"WD My Net Wi-Fi Range Extender")
+	*"My Net Wi-Fi Range Extender")
 		name="mynet-rext"
 		;;
 	*"MZK-W04NU")
@@ -746,10 +746,10 @@ ar71xx_board_detect() {
 	*"NBG460N/550N/550NH")
 		name="nbg460n_550n_550nh"
 		;;
-	*"Zyxel NBG6616")
+	*"NBG6616")
 		name="nbg6616"
 		;;
-	*"Zyxel NBG6716")
+	*"NBG6716")
 		name="nbg6716"
 		;;
 	*"OM2P")
@@ -939,10 +939,10 @@ ar71xx_board_detect() {
 	*"SMART-300")
 		name="smart-300"
 		;;
-	"Smart Electronics Black Swift board"*)
+	*"Black Swift board"*)
 		name="bsb"
 		;;
-	*"Telldus TellStick ZNet Lite")
+	*"TellStick ZNet Lite")
 		name="tellstick-znet-lite"
 		;;
 	*"SOM9331")
@@ -1227,7 +1227,7 @@ ar71xx_board_detect() {
 	*"WRT400N")
 		name="wrt400n"
 		;;
-	*"WRTnode2Q board")
+	*"WRTnode2Q"*)
 		name="wrtnode2q"
 		;;
 	*"WZR-450HP2")
@@ -1269,16 +1269,16 @@ ar71xx_board_detect() {
 	*"EmbWir-Dorin-Router")
 		name="ew-dorin-router"
 		;;
-	"8devices Carambola2"*)
+	*"Carambola2"*)
 		name="carambola2"
 		;;
-	"8devices Lima"*)
+	*"Lima"*)
 		name="lima"
 		;;
-	*"Sitecom WLR-8100")
+	*"WLR-8100")
 		name="wlr8100"
 		;;
-	*"BHU BXU2000n-2 rev. A1")
+	*"BXU2000n-2 rev. A1")
 		name="bxu2000n-2-a1"
 		;;
 	*"HiWiFi HC6361")