diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 3f60c5b862d74c34157e51e9807de090a6bfa2b5..9a3b30065d8a2b36aa0be3f21d9b517fe6878a08 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -62,7 +62,7 @@ EOF
 set network.$1.proto='dhcp'
 delete network.wan6
 set network.wan6='interface'
-set network.wan6.ifname='@wan'
+set network.wan6.ifname='$ifname'
 set network.wan6.proto='dhcpv6'
 EOF
 		;;
diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network
index 3c9c30a59f3c69da1ebb1fc2d9e34a1291a781f6..d3cd3c613a18c148955c344051a924aaeedbaa5c 100644
--- a/package/base-files/files/etc/config/network
+++ b/package/base-files/files/etc/config/network
@@ -14,9 +14,5 @@ config interface lan
 	option netmask	255.255.255.0
 	option ip6assign 60
 
-config interface wan6
-	option ifname	@wan
-	option proto	dhcpv6
-
 config globals globals
 	option ula_prefix auto
diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index e90090c40b0fe8e5605254fd01e6b279c3ef36f2..798d6baa792b306a2f7b97174c207194ba7c38eb 100644
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -190,7 +190,7 @@ set network.wan='interface'
 set network.wan.ifname='$ifname'
 set network.wan.proto='dhcp'
 set network.wan6='interface'
-set network.wan6.ifname='@wan'
+set network.wan6.ifname='$ifname'
 set network.wan6.proto='dhcpv6'
 EOF
 }
diff --git a/target/linux/adm5120/base-files/etc/config/network b/target/linux/adm5120/base-files/etc/config/network
index 9c52c0e39474c091c20b1996df4deadf3c2d84cb..87782f47825b0c2987c6bef5314f608e0fecff63 100644
--- a/target/linux/adm5120/base-files/etc/config/network
+++ b/target/linux/adm5120/base-files/etc/config/network
@@ -30,7 +30,7 @@ config interface	wan
 
 #### WAN6 configuration
 config interface	wan6
-	option ifname	"@wan"
+	option ifname	"eth1"
 	option proto	dhcpv6
 
 
diff --git a/target/linux/adm8668/base-files/etc/config/network b/target/linux/adm8668/base-files/etc/config/network
index 2b53cf6c5dc43e86f5756a91e68e42bc1f1c4f21..5967cdd06739343ffb0d94c4c57408c402af35bd 100644
--- a/target/linux/adm8668/base-files/etc/config/network
+++ b/target/linux/adm8668/base-files/etc/config/network
@@ -17,7 +17,7 @@ config interface wan
 	option proto	dhcp
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth1
 	option proto    dhcpv6
 
 config globals globals
diff --git a/target/linux/mcs814x/base-files/etc/config/network b/target/linux/mcs814x/base-files/etc/config/network
index e2f779e7bac36c2ea42653143064ee93c3dee0b4..cec7b2525cf2b84f5952fd7a35cd34cc017ec571 100644
--- a/target/linux/mcs814x/base-files/etc/config/network
+++ b/target/linux/mcs814x/base-files/etc/config/network
@@ -14,7 +14,7 @@ config interface lan
 	option ip6assign 60
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth0
 	option proto    dhcpv6
 
 config globals globals
diff --git a/target/linux/orion/base-files/etc/uci-defaults/10-network b/target/linux/orion/base-files/etc/uci-defaults/10-network
index 3baa679a8b527937fb2294c4c57e82f05497fa7e..5d5a5851f97b39e67c5e7bf7387ed7b5a757d85c 100644
--- a/target/linux/orion/base-files/etc/uci-defaults/10-network
+++ b/target/linux/orion/base-files/etc/uci-defaults/10-network
@@ -29,7 +29,7 @@ config interface lan
 	option ip6assign 60
 
 config interface wan6
-	option ifname   @wan
+	option ifname   wan
 	option proto    dhcpv6
 
 config globals globals
diff --git a/target/linux/rb532/base-files/etc/config/network b/target/linux/rb532/base-files/etc/config/network
index 11537993c862055ff748a48d1c0bc0c7779fe5d4..75a14a7308ea6c2e19e811c805108f59292990ac 100644
--- a/target/linux/rb532/base-files/etc/config/network
+++ b/target/linux/rb532/base-files/etc/config/network
@@ -18,7 +18,7 @@ config interface lan
 	option ip6assign 60
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth0
 	option proto    dhcpv6
 
 config globals globals
diff --git a/target/linux/x86/alix2/base-files/etc/config/network b/target/linux/x86/alix2/base-files/etc/config/network
index 505628e94957b3a69d16a4ed1212addc323e6b50..4683402843eafb1e88d00029c992be29dd56b998 100644
--- a/target/linux/x86/alix2/base-files/etc/config/network
+++ b/target/linux/x86/alix2/base-files/etc/config/network
@@ -21,7 +21,7 @@ config interface wan
 	option proto	dhcp
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth0
 	option proto    dhcpv6
 
 config globals globals
diff --git a/target/linux/x86/base-files/etc/defconfig/net4801/network b/target/linux/x86/base-files/etc/defconfig/net4801/network
index 172d51315903fe28b56bf43cdbd0acfce78c5a54..6821c807d05148056388b311fc8fb68d3ca9a1f2 100644
--- a/target/linux/x86/base-files/etc/defconfig/net4801/network
+++ b/target/linux/x86/base-files/etc/defconfig/net4801/network
@@ -17,7 +17,7 @@ config interface wan
 	option proto	dhcp
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth0
 	option proto    dhcpv6
 
 config globals globals
diff --git a/target/linux/x86/geos/base-files/etc/config/network b/target/linux/x86/geos/base-files/etc/config/network
index a60fcdf28d00121b1e737625089cb35964b15d4a..d12d5280323cf2965c38b95e7920698ceb618f0f 100644
--- a/target/linux/x86/geos/base-files/etc/config/network
+++ b/target/linux/x86/geos/base-files/etc/config/network
@@ -30,7 +30,7 @@ config interface wan
 	# option macaddr '00:0A:FA:22:00:80'
 
 config interface wan6
-	option ifname   @wan
+	option ifname   nas0
 	option proto    dhcpv6
 
 config globals globals
diff --git a/target/linux/x86/net5501/base-files/etc/config/network b/target/linux/x86/net5501/base-files/etc/config/network
index 330c60b3242d8e942b4a987b61be25ca4bc1aed6..4aa8096584531471a77a112159ae27ba8611a18f 100644
--- a/target/linux/x86/net5501/base-files/etc/config/network
+++ b/target/linux/x86/net5501/base-files/etc/config/network
@@ -19,7 +19,7 @@ config interface wan
 	option proto	dhcp
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth0
 	option proto    dhcpv6
 
 config globals globals
diff --git a/target/linux/x86/rdc/base-files/etc/config/network b/target/linux/x86/rdc/base-files/etc/config/network
index 9ee12dc0082f9ce864b985879da24d7cfc9f5d8c..69627f7c1adffcf0f90b46981a97df3afbbf3161 100644
--- a/target/linux/x86/rdc/base-files/etc/config/network
+++ b/target/linux/x86/rdc/base-files/etc/config/network
@@ -19,7 +19,7 @@ config interface wan
 	option proto	dhcp
 
 config interface wan6
-        option ifname   @wan
+        option ifname   eth0
         option proto    dhcpv6
 
 config globals globals