diff --git a/intel_mips/README.md b/intel_mips/README.md
index 94a5bc05958175430aab965ce6011c9448a35c57..1941a221bc500b2450524a7c0bffa09baadc5e6b 100644
--- a/intel_mips/README.md
+++ b/intel_mips/README.md
@@ -303,7 +303,7 @@ config led_map led_wifi
list led_action_alert 'wireless_green = FLASH_FAST'
list led_action_error 'wireless_green = FLASH_FAST'
```
-Note that for Norrland, IopsysWrt implements the following ubus LED: catv, wifi, voice1, internet, broadband.
+Note that for Norrland, IopsysWrt implements the following ubus LED: catv, wifi, voice, internet, broadband.
For more elaborate example, see base-files/lib/db/boards/NORRLAND
diff --git a/intel_mips/base-files/lib/db/boards/NORRLAND b/intel_mips/base-files/lib/db/boards/NORRLAND
index b788e3139e3db0c3f1fa1c079c7c23fc05dddb06..256c7caf92209e69c78f745b017ae56898ac4d94 100644
--- a/intel_mips/base-files/lib/db/boards/NORRLAND
+++ b/intel_mips/base-files/lib/db/boards/NORRLAND
@@ -84,7 +84,7 @@ option mode led_sk9822
config led_map led_map
list functions catv
list functions wifi
-list functions voice1
+list functions voice
list functions internet
list functions broadband
list functions status
@@ -103,7 +103,7 @@ list led_action_notice 'wireless_green = FLASH_SLOW'
list led_action_alert 'wireless_green = FLASH_FAST'
list led_action_error 'wireless_green = FLASH_FAST'
-config led_map led_voice1
+config led_map led_voice
list led_action_ok 'voice_green = ON'
list led_action_off 'voice_green = OFF'
list led_action_notice 'voice_green = FLASH_SLOW'
diff --git a/iopsys-brcm63xx-arm/base-files/lib/db/boards/963138REF_P502 b/iopsys-brcm63xx-arm/base-files/lib/db/boards/963138REF_P502
index b793b91cff4e26b3245625074ea08351f5f8adc6..719ee6a8093064cc790646d6a2118fc967dac5dd 100644
--- a/iopsys-brcm63xx-arm/base-files/lib/db/boards/963138REF_P502
+++ b/iopsys-brcm63xx-arm/base-files/lib/db/boards/963138REF_P502
@@ -249,7 +249,7 @@ config wifi-chip '43c5'
# list press_indicator led_status
# list press_indicator led_wan
# list press_indicator led_internet
-# list press_indicator led_voice1
+# list press_indicator led_voice
# list press_indicator led_wifi
# list press_indicator led_wps
# list press_indicator led_dect
@@ -263,7 +263,7 @@ config wifi-chip '43c5'
# list functions wan_phy_speed
# list functions wan_phy_link_speed
# list functions internet
-# list functions voice1
+# list functions voice
# list functions wifi
# list functions wps
# list functions dect
@@ -348,7 +348,7 @@ config wifi-chip '43c5'
# list led_action_eok 'internet_green = ON'
# list led_action_eok 'internet_red = OFF'
-# config led_map led_voice1
+# config led_map led_voice
# list led_action_ok voice_red=OFF
# list led_action_ok voice_green=ON
# list led_action_off voice_red=OFF
diff --git a/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG301R0 b/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG301R0
index e4b48869e194566d48f4dc972fa6991e4e06c5b5..dc1ebfa3adb52e9f3ef849ca7e5531ed88f6403c 100644
--- a/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG301R0
+++ b/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG301R0
@@ -190,7 +190,7 @@ config led_map led_map
list functions wan_phy_speed
list functions internet
list functions eco
- list functions voice1
+ list functions voice
config led_map led_wan
@@ -307,7 +307,7 @@ config led_map led_internet
list led_action_eok 'Internet_green = ON'
list led_action_eok 'Internet_red = OFF'
-config led_map led_voice1
+config led_map led_voice
list led_action_ok Voice_green=ON
list led_action_off Voice_green=OFF
list led_action_notice Voice_green=FLASH_SLOW
diff --git a/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG400PRIMER0 b/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG400PRIMER0
index 559ae86509b93d865afe7dd0a92326e8c89f2157..c7c8a1c96b9b795a215509e2531f29309f587480 100644
--- a/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG400PRIMER0
+++ b/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG400PRIMER0
@@ -182,7 +182,7 @@ config led_map led_map
list functions status
list functions broadband
list functions internet
- list functions voice1
+ list functions voice
list functions ext
list functions wps
list functions dect
@@ -241,7 +241,7 @@ config led_map led_ext
list led_action_error Ext_green=OFF
list led_action_error Ext_red=ON
-config led_map led_voice1
+config led_map led_voice
list led_action_ok Voice_green=ON
list led_action_ok Voice_red=OFF
list led_action_off Voice_green=OFF
diff --git a/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG400R0 b/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG400R0
index dd5e0ee2def457f08715627fe59780d4122ca4f4..90704125e709dd5112d5d39844b8e5af7922972a 100644
--- a/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG400R0
+++ b/iopsys-brcm63xx-arm/base-files/lib/db/boards/DG400R0
@@ -250,7 +250,7 @@ list press_indicator led_logo
list press_indicator led_status
list press_indicator led_broadband
list press_indicator led_internet
-list press_indicator led_voice1
+list press_indicator led_voice
list press_indicator led_wifi
list press_indicator led_wps
list press_indicator led_dect
@@ -264,7 +264,7 @@ list functions wan_phy_link
list functions wan_phy_speed
list functions wan_phy_link_speed
list functions internet
-list functions voice1
+list functions voice
list functions wifi
list functions wps
list functions dect
@@ -349,7 +349,7 @@ list led_action_error 'internet_red = ON'
list led_action_eok 'internet_green = ON'
list led_action_eok 'internet_red = OFF'
-config led_map led_voice1
+config led_map led_voice
list led_action_ok voice_red=OFF
list led_action_ok voice_green=ON
list led_action_off voice_red=OFF
diff --git a/iopsys-brcm63xx-arm/base-files/lib/db/boards/EG400R0 b/iopsys-brcm63xx-arm/base-files/lib/db/boards/EG400R0
index 5aae9a56b76ecf46d33c4520666ce454203d7945..18a87089d261444405d134c195fbd209325397d1 100644
--- a/iopsys-brcm63xx-arm/base-files/lib/db/boards/EG400R0
+++ b/iopsys-brcm63xx-arm/base-files/lib/db/boards/EG400R0
@@ -186,7 +186,7 @@ config led_map led_map
list press_indicator led_lan
list press_indicator led_wan
list press_indicator led_internet
- list press_indicator led_voice1
+ list press_indicator led_voice
list press_indicator led_dect
list press_indicator led_ext
list functions wifi
@@ -195,7 +195,7 @@ config led_map led_map
list functions status
list functions wan
list functions internet
- list functions voice1
+ list functions voice
list functions ext
list functions dect
@@ -208,7 +208,7 @@ config led_map led_map
list dimming status
list dimming wan
list dimming internet
- list dimming voice1
+ list dimming voice
list dimming dect
list dimming ext
@@ -283,7 +283,7 @@ config led_map led_internet
list led_action_eok 'Internet_green = ON'
list led_action_eok 'Internet_red = OFF'
-config led_map led_voice1
+config led_map led_voice
list led_action_ok Voice_green=ON
list led_action_off Voice_green=OFF
list led_action_notice Voice_green=FLASH_SLOW
diff --git a/iopsys-brcm63xx-arm/dg400/base-files/etc/config/leds b/iopsys-brcm63xx-arm/dg400/base-files/etc/config/leds
index 613674b171ac94d777bbd3dcbe22b0277d8243b1..587ac3a4da9d24bf301c10077b9eccdc06bac796 100644
--- a/iopsys-brcm63xx-arm/dg400/base-files/etc/config/leds
+++ b/iopsys-brcm63xx-arm/dg400/base-files/etc/config/leds
@@ -13,7 +13,7 @@ config led 'broadband'
config led 'internet'
option enable '1'
-config led 'voice1'
+config led 'voice'
option enable '1'
option label voice