diff --git a/lib/App/Netdisco/Transport/CLI.pm b/lib/App/Netdisco/Transport/SSH.pm
similarity index 94%
rename from lib/App/Netdisco/Transport/CLI.pm
rename to lib/App/Netdisco/Transport/SSH.pm
index 6f865c7b..64190858 100644
--- a/lib/App/Netdisco/Transport/CLI.pm
+++ b/lib/App/Netdisco/Transport/SSH.pm
@@ -1,4 +1,4 @@
-package App::Netdisco::Transport::CLI;
+package App::Netdisco::Transport::SSH;
 
 use Dancer qw/:syntax :script/;
 
@@ -11,14 +11,14 @@ use base 'Dancer::Object::Singleton';
 
 =head1 NAME
 
-App::Netdisco::Transport::CLI
+App::Netdisco::Transport::SSH
 
 =head1 DESCRIPTION
 
 Returns an object which has an active SSH connection which can be used
 for some actions such as arpnip.
 
- my $cli = App::Netdisco::Transport::CLI->session_for( ... );
+ my $cli = App::Netdisco::Transport::SSH->session_for( ... );
 
 =cut
 
diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm
index 3ac3c307..e303f0dc 100644
--- a/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Arpnip/Nodes.pm
@@ -3,7 +3,7 @@ package App::Netdisco::Worker::Plugin::Arpnip::Nodes;
 use Dancer ':syntax';
 use App::Netdisco::Worker::Plugin;
 use aliased 'App::Netdisco::Worker::Status';
-use App::Netdisco::Transport::CLI ();
+use App::Netdisco::Transport::SSH ();
 use App::Netdisco::Transport::SNMP ();
 use App::Netdisco::Util::Node qw/check_mac store_arp/;
 use App::Netdisco::Util::FastResolver 'hostnames_resolve_async';
@@ -67,7 +67,7 @@ register_worker({ phase => 'main', driver => 'cli' }, sub {
     my ($job, $workerconf) = @_;
 
     my $device = $job->device;
-    my $cli = App::Netdisco::Transport::CLI->session_for($device)
+    my $cli = App::Netdisco::Transport::SSH->session_for($device)
       or return Status->defer("arpnip failed: could not SSH connect to $device");
 
     # should be both v4 and v6
diff --git a/share/config.yml b/share/config.yml
index 5422e4ea..9ff5906b 100644
--- a/share/config.yml
+++ b/share/config.yml
@@ -415,7 +415,6 @@ worker_plugins:
   - 'Vlan::Core'
 
 extra_worker_plugins: []
-#  - Discover::ConfigBackup::CLI
 
 driver_priority:
   restconf: 500