diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 7ade241a2..247b12301 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -4648,7 +4648,7 @@ function interfaces_primary_address6($interface, $realif = null, $ifconfig_detai
     return [ $ifcfgipv6, $networkv6, $subnetbitsv6 ];
 }
 
-function interfaces_linklocal_address6($interface, $realif = null, $ifconfig_details = null)
+function interfaces_scoped_address6($interface, $realif = null, $ifconfig_details = null)
 {
     return interfaces_primary_address6($interface, $realif, $ifconfig_details, true);
 }
diff --git a/src/etc/inc/plugins.inc.d/dpinger.inc b/src/etc/inc/plugins.inc.d/dpinger.inc
index 3575f8d42..fd5b1112d 100644
--- a/src/etc/inc/plugins.inc.d/dpinger.inc
+++ b/src/etc/inc/plugins.inc.d/dpinger.inc
@@ -175,7 +175,7 @@ function dpinger_configure_do($verbose = false, $gwname = null)
         } elseif ($gateway['ipprotocol'] == "inet6") { // This is an IPv6 gateway...
             if (is_linklocal($gateway['monitor'])) {
                 /* link local monitor needs a link local address for the "src" part */
-                $gwifip = interfaces_linklocal_address6($gateway['if'], null, $ifconfig_details);
+                $gwifip = interfaces_scoped_address6($gateway['if'], null, $ifconfig_details);
             } else {
                 $gwifip = interfaces_primary_address6($gateway['if'], null, $ifconfig_details);
             }
diff --git a/src/etc/inc/plugins.inc.d/unbound.inc b/src/etc/inc/plugins.inc.d/unbound.inc
index 0ffe07f23..0c93bb84b 100644
--- a/src/etc/inc/plugins.inc.d/unbound.inc
+++ b/src/etc/inc/plugins.inc.d/unbound.inc
@@ -534,7 +534,7 @@ function unbound_add_host_entries($ifconfig_details = null)
             $unbound_entries .= "local-data: \"{$config['system']['hostname']} AAAA {$laddr6}\"\n";
         }
         if (empty($config['unbound']['noreglladdr6'])) {
-            list ($lladdr6) = interfaces_linklocal_address6($interface, null, $ifconfig_details);
+            list ($lladdr6) = interfaces_scoped_address6($interface, null, $ifconfig_details);
             if (!empty($lladdr6)) {
                 /* cannot embed scope */
                 $lladdr6 = explode('%', $lladdr6)[0];
diff --git a/src/www/diag_ping.php b/src/www/diag_ping.php
index 7a00f4ef1..339f170df 100644
--- a/src/www/diag_ping.php
+++ b/src/www/diag_ping.php
@@ -58,7 +58,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                 break;
             case 'ipv6-ll':
                 $command .= '6';
-                list ($ifaddr) = interfaces_linklocal_address6($pconfig['interface']);
+                list ($ifaddr) = interfaces_scoped_address6($pconfig['interface']);
                 break;
             default:
                 list ($ifaddr) = interfaces_primary_address($pconfig['interface']);
diff --git a/src/www/diag_testport.php b/src/www/diag_testport.php
index b04491279..5ae3e4377 100644
--- a/src/www/diag_testport.php
+++ b/src/www/diag_testport.php
@@ -78,7 +78,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                 $nc_args .= ' -6';
                 break;
             case 'ipv6-ll':
-                list ($ifaddr) = interfaces_linklocal_address6($pconfig['interface']);
+                list ($ifaddr) = interfaces_scoped_address6($pconfig['interface']);
                 $nc_args .= ' -6';
                 break;
             default: