diff --git a/samples/knot.sample.conf b/samples/knot.sample.conf
index 174aeb296e8b3fe3b57609c9f6a51589df086da0..6af92fcfc0e8f8883eb632356ec6aac940da4a46 100644
--- a/samples/knot.sample.conf
+++ b/samples/knot.sample.conf
@@ -80,15 +80,9 @@ remotes {
   }
 
   # Format 2: <name> { address <address>@<port>; }
-  server1 {
-    address 127.0.0.1@53001;
-  }
-
-  # Format 3: ACL without port (for xfr-out and notify-out) 
-  acl1 {
-    address 127.0.0.1;
-  }
-
+  # server1 {
+  #  address 127.0.0.1@53001;
+  # }
 }
 
 # Section 'zones' contains information about zones to be served.
@@ -161,10 +155,10 @@ zones {
     xfr-in server0;
 
     # ACL list of XFR slaves 
-    xfr-out acl1;
+    xfr-out server0;
 
     # ACL list of servers allowed to send NOTIFY queries 
-    notify-in acl1;
+    notify-in server0;
 
     # List of servers to send NOTIFY to 
     notify-out server0;
diff --git a/src/knot/conf/cf-lex.l b/src/knot/conf/cf-lex.l
index fe2d73876a44da5d5a0d96ea8f1a520d14f40d8e..ef748d3e13f2d8832742074efd0b6e2d02d9c67f 100644
--- a/src/knot/conf/cf-lex.l
+++ b/src/knot/conf/cf-lex.l
@@ -205,7 +205,7 @@ hmac-sha512     { lval.alg = HMAC_SHA512; return TSIG_ALGO_NAME; }
 
 ["][^"\n]*\n    cf_error(yyscanner, "Unterminated string.");
 
-[a-zA-Z0-9\.\-]+ {
+[a-zA-Z0-9\.\-\_]+ {
   lval.t = strdup(yytext);
   return TEXT /* Last resort, alphanumeric word. */;
 }