diff --git a/src/etc/inc/filter.lib.inc b/src/etc/inc/filter.lib.inc
index 260cb45fa..de4ce53fd 100644
--- a/src/etc/inc/filter.lib.inc
+++ b/src/etc/inc/filter.lib.inc
@@ -537,7 +537,7 @@ function filter_core_rules_system($fw, $defaults)
             if (!isset($ifcfg['internal_dynamic']) && $ifcfg['if'] != 'lo0') {
                 $intf_has_v4 = false;
                 $intf_has_v6 = false;
-                foreach (legacy_getall_interface_addresses($ifcfg['if']) as $addr) {
+                foreach (interfaces_addresses($ifcfg['if'], true) as $addr) {
                     $intf_has_v4 = $intf_has_v4 || is_subnetv4($addr);
                     $intf_has_v6 = $intf_has_v6 || is_subnetv6($addr);
                 }
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index b995a30a9..c185db150 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2330,7 +2330,7 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal
 
     if (!file_exists("/var/run/booting") && !(substr($realif, 0, 4) == "ovpn")) {
         /* remove all IPv4 and IPv6 addresses */
-        $tmpifaces = legacy_getall_interface_addresses($realif);
+        $tmpifaces = interfaces_addresses($realif, true);
         foreach ($tmpifaces as $tmpiface) {
             if (is_ipaddrv6($tmpiface) || is_subnetv6($tmpiface)) {
                 if (!is_linklocal($tmpiface)) {
diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc
index 422e99c22..de9fd64a2 100644
--- a/src/etc/inc/xmlrpc/legacy.inc
+++ b/src/etc/inc/xmlrpc/legacy.inc
@@ -64,7 +64,7 @@ function does_vip_exist($vip)
             return false;
     }
 
-    $ifacedata = legacy_getall_interface_addresses($realif);
+    $ifacedata = interfaces_addresses($realif, true);
     foreach ($ifacedata as $vipips) {
         if ($vipips == "{$vip['subnet']}/{$vip['subnet_bits']}") {
             return true;