--- a/lib/update.operations	Wed Mar 21 17:04:21 2012 +0200
+++ b/lib/update.operations	Wed Mar 21 17:11:00 2012 +0200
@@ -192,12 +192,12 @@
     link_generic $out $tgt
 }
 
-## Link dhcp file directly from data to hosts
-function link_dhcp_hosts {
-    local hosts=$1
-    local base=${2:-$hosts}
+## Link dhcp file directly from data to $DHCP
+function link_dhcp_conf {
+    local conf=$1
+    local base=${2:-$conf}
 
-    local out=$DHCP/$hosts.conf
+    local out=$DHCP/$conf.conf
     local tgt=$(choose_link $out $DHCP/$base.conf $DHCP_DATA/$base.conf)
 
     link_generic $out $tgt
@@ -275,14 +275,14 @@
     fi
 }
 
-## Test DHCP configuration of given hosts file using check_dhcp $DHCP/$host.conf:
-#
-#   check_dhcp_hosts    $host
+## Test DHCP configuration of given settings/dhcp using check_dhcp $DHCP_DATA/$host.conf:
 #
-function check_dhcp_hosts {
-    local host=$1
+#   check_dhcp_conf     $conf
+#
+function check_dhcp_conf {
+    local conf=$1
 
-    check_dhcp $DHCP/$host.conf
+    check_dhcp $DHCP_DATA/$conf.conf
 }
 
 # Run rndc reload