diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc
index 5ec839d4c..ff5bd5ccc 100644
--- a/src/etc/inc/xmlrpc/legacy.inc
+++ b/src/etc/inc/xmlrpc/legacy.inc
@@ -127,8 +127,8 @@ function filter_configure_xmlrpc()
     require_once("interfaces.inc");
 
     system_routing_configure();
+    system_resolver_configure();
     filter_configure();
-    system_hosts_generate();
 
     return true;
 }
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index 71c3a9817..150888fde 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -59,8 +59,7 @@ if (!isset($config['interfaces'][$interface]['enable'])) {
 }
 
 /* this may be required to cleanse the DNS information no longer available */
-system_resolvconf_generate();
-system_hosts_generate();
+system_resolver_configure();
 
 $interface_descr = convert_friendly_interface_to_friendly_descr($interface);
 $ip = get_interface_ip($interface);
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 9254a4f15..852bcceb8 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -59,8 +59,7 @@ if (!isset($config['interfaces'][$interface]['enable'])) {
 }
 
 /* this may be required to cleanse the DNS information no longer available */
-system_resolvconf_generate();
-system_hosts_generate();
+system_resolver_configure();
 
 $interface_descr = convert_friendly_interface_to_friendly_descr($interface);
 $ip = get_interface_ipv6($interface);
diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index 65841b585..d91db8fe2 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -48,7 +48,7 @@ function validate_partial_mac_list($maclist)
 
 function reconfigure_dhcpd()
 {
-    system_hosts_generate();
+    system_resolver_configure();
     plugins_configure('hosts');
     clear_subsystem_dirty('hosts');
     dhcpd_dhcp4_configure();
diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php
index 8174e9edb..c92c024e3 100644
--- a/src/www/services_dhcpv6.php
+++ b/src/www/services_dhcpv6.php
@@ -36,7 +36,7 @@ require_once("plugins.inc.d/dhcpd.inc");
 
 function reconfigure_dhcpd()
 {
-    system_hosts_generate();
+    system_resolver_configure();
     plugins_configure('hosts');
     clear_subsystem_dirty('hosts');
     dhcpd_dhcp6_configure();
diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php
index a2e152858..7197337a5 100644
--- a/src/www/services_dnsmasq.php
+++ b/src/www/services_dnsmasq.php
@@ -127,17 +127,19 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             } elseif (isset($a_dnsmasq['local_ttl'])) {
                 unset($a_dnsmasq['local_ttl']);
             }
+
             write_config();
-            system_resolvconf_generate();
+
+            system_resolver_configure();
             dnsmasq_configure_do();
             plugins_configure('dhcp');
+
             header(url_safe('Location: /services_dnsmasq.php'));
             exit;
         }
     } elseif (isset($pconfig['apply'])) {
         filter_configure();
-        system_resolvconf_generate();
-        system_hosts_generate();
+        system_resolver_configure();
         dnsmasq_configure_do();
         plugins_configure('dhcp');
         clear_subsystem_dirty('hosts');
diff --git a/src/www/services_opendns.php b/src/www/services_opendns.php
index 37a299a2a..9d6522467 100644
--- a/src/www/services_opendns.php
+++ b/src/www/services_opendns.php
@@ -98,7 +98,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             $config['system']['dnsallowoverride'] = true;
         }
         write_config('OpenDNS filter configuration change');
-        system_resolvconf_generate();
+        system_resolver_configure();
         plugins_configure('dhcp');
         $savemsg = get_std_save_message();
     }
diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php
index da8f03836..c2e93b9b9 100644
--- a/src/www/services_unbound.php
+++ b/src/www/services_unbound.php
@@ -63,9 +63,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig = $_POST;
 
     if (!empty($pconfig['apply'])) {
-        system_resolvconf_generate(); /* checks for 'enable' */
+        system_resolver_configure();
         unbound_configure_do();
-        plugins_configure('dhcp'); /* checks for 'enable' */
+        plugins_configure('dhcp');
         clear_subsystem_dirty('unbound');
         header(url_safe('Location: /services_unbound.php'));
         exit;
diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php
index 00515bb46..d0df725df 100644
--- a/src/www/system_advanced_admin.php
+++ b/src/www/system_advanced_admin.php
@@ -363,7 +363,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
         filter_configure();
         system_login_configure();
-        system_hosts_generate();
+        system_resolver_confiugure();
         plugins_configure('dns');
         plugins_configure('dhcp');
         configd_run('openssh restart', true);