diff --git a/bin/netdisco-rancid-export b/bin/netdisco-rancid-export
index 60dfee22..6128aae7 100755
--- a/bin/netdisco-rancid-export
+++ b/bin/netdisco-rancid-export
@@ -73,7 +73,7 @@ foreach my $d (@devices) {
   my $old = $d->get_column( 'old' );
   my $devgroup = 'other';
   foreach my $g (keys %$groups) {
-    if (check_acl( $d, $groups->{$g} )) {
+    if (check_acl_only( $d, $groups->{$g} )) {
       $devgroup = $g;
       last;
     }
diff --git a/lib/App/Netdisco/Core/Discover.pm b/lib/App/Netdisco/Core/Discover.pm
index aeed9b5c..dca91119 100644
--- a/lib/App/Netdisco/Core/Discover.pm
+++ b/lib/App/Netdisco/Core/Discover.pm
@@ -5,6 +5,7 @@ use Dancer::Plugin::DBIC 'schema';
 
 use App::Netdisco::Util::Device
   qw/get_device match_devicetype is_discoverable/;
+use App::Netdisco::Util::Permission 'check_acl_only';
 use App::Netdisco::Util::DNS ':all';
 use App::Netdisco::JobQueue qw/jq_queued jq_insert/;
 use NetAddr::IP::Lite ':lower';
@@ -76,8 +77,8 @@ sub set_canonical_ip {
 
         foreach my $key (sort keys %$map) {
           # lhs matches device, rhs matches device_ip
-          if (check_acl($device, $key)
-                and check_acl($alias, $map->{$key})) {
+          if (check_acl_only($device, $key)
+                and check_acl_only($alias, $map->{$key})) {
 
             if ($snmp->snmp_connect_ip( $alias->alias )) {
               $new_ip = $alias->alias;
diff --git a/lib/App/Netdisco/Util/DNS.pm b/lib/App/Netdisco/Util/DNS.pm
index fe823742..09eea849 100644
--- a/lib/App/Netdisco/Util/DNS.pm
+++ b/lib/App/Netdisco/Util/DNS.pm
@@ -8,7 +8,7 @@ use Net::DNS;
 use AnyEvent::DNS;
 use NetAddr::IP::Lite ':lower';
 
-use App::Netdisco::Util::Permission 'check_acl';
+use App::Netdisco::Util::Permission 'check_acl_no';
 
 use base 'Exporter';
 our @EXPORT = ();
@@ -129,7 +129,7 @@ sub hostnames_resolve_async {
 
   IP: foreach my $hash_ref (@$ips) {
     my $ip = $hash_ref->{'ip'} || $hash_ref->{'alias'};
-    next IP if check_acl($ip, $skip);
+    next IP if check_acl_no($ip, $skip);
 
     # check /etc/hosts file and short-circuit if found
     foreach my $name (reverse sort keys %HOSTS) {
diff --git a/lib/App/Netdisco/Util/SNMP.pm b/lib/App/Netdisco/Util/SNMP.pm
index dcfe08fb..8caaeddd 100644
--- a/lib/App/Netdisco/Util/SNMP.pm
+++ b/lib/App/Netdisco/Util/SNMP.pm
@@ -2,7 +2,7 @@ package App::Netdisco::Util::SNMP;
 
 use Dancer qw/:syntax :script/;
 use App::Netdisco::Util::Device 'get_device';
-use App::Netdisco::Util::Permission qw/check_acl_no check_acl/;
+use App::Netdisco::Util::Permission ':all';
 
 use SNMP::Info;
 use Try::Tiny;
@@ -300,7 +300,7 @@ sub _build_communities {
         if not $stanza->{tag}
            and !exists $stanza->{community};
 
-      if ($stanza->{$mode} and check_acl($device, $stanza->{only})) {
+      if ($stanza->{$mode} and check_acl_only($device, $stanza->{only})) {
           if ($device->in_storage and
             $stored_tag and $stored_tag eq $stanza->{tag}) {
               # last known-good by tag