diff --git a/target/linux/kirkwood/base-files/etc/diag.sh b/target/linux/kirkwood/base-files/etc/diag.sh
index 716e6c9fbf994b48b401bb2de3478dc885103f7a..04353763088ef734811a9f38b846db2b8d23ff1c 100755
--- a/target/linux/kirkwood/base-files/etc/diag.sh
+++ b/target/linux/kirkwood/base-files/etc/diag.sh
@@ -12,8 +12,8 @@ get_status_led() {
 	pogo_e02)
 		status_led="status:orange:fault"
 		;;
-	ea4500)
-		status_led="ea4500:white:health"
+	linksys-viper)
+		status_led="viper:white:health"
 		;;
 	esac
 }
diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
index e0ae6591d36093cfea93fda82cd325280c78fd6b..d6c0e1e15e400fa9f13260971148bd97d345f5b6 100644
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
@@ -13,12 +13,12 @@ case "$board" in
 	ucidef_set_led_default "health" "health" "status:green:health" "1"
 	ucidef_set_led_default "fault" "fault" "status:orange:fault" "1"
 	;;
-"ea3500")
-	ucidef_set_led_default "power" "power" "ea3500:green:power" "1"
+"linksys-audi")
+	ucidef_set_led_default "power" "power" "audi:green:power" "1"
 	;;
-"ea4500")
-	ucidef_set_led_default "health" "health" "ea4500:white:health" "1"
-	ucidef_set_led_default "pulse" "pulse" "ea4500:white:pulse" "1"
+"linksys-viper")
+	ucidef_set_led_default "health" "health" "viper:white:health" "1"
+	ucidef_set_led_default "pulse" "pulse" "viper:white:pulse" "1"
 	;;
 "goflexhome" | \
 "goflexnet")
diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
index 150926e3a659e37a711d73cbc250daa005e57e40..3491b5807b13105abb63f6d9f1cffe5bc297c56c 100644
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
@@ -37,13 +37,13 @@ case "$board" in
 "pogo_e02")
 	set_lan_dhcp "eth0"
 	;;
-"ea3500")
+"linksys-audi")
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
 	ucidef_add_switch "switch0" "1" "1"
 	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
 	ucidef_add_switch_vlan "switch0" "2" "4 6"
 	;;
-"ea4500")
+"linksys-viper")
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
 	ucidef_add_switch "switch0" "1" "1"
 	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
diff --git a/target/linux/kirkwood/base-files/lib/kirkwood.sh b/target/linux/kirkwood/base-files/lib/kirkwood.sh
index 6e0f444d3ec6ba67f7f7b65168611161cb6aa011..0e898ac197c4d5e0c570c1a186a8ef9ee226bdb5 100755
--- a/target/linux/kirkwood/base-files/lib/kirkwood.sh
+++ b/target/linux/kirkwood/base-files/lib/kirkwood.sh
@@ -38,11 +38,11 @@ kirkwood_board_detect() {
 		;;
 
 	"Linksys EA3500")
-		name="ea3500"
+		name="linksys-audi"
 		;;
 
-	"Linksys EA4500")
-		name="ea4500"
+	"Linksys E4200v2 / EA4500")
+		name="linksys-viper"
 		;;
 
 	"Globalscale Technologies Guruplug Server Plus")