diff --git a/bin/flickr.pl b/bin/flickr.pl
index fd32567..88e478d 100644
--- a/bin/flickr.pl
+++ b/bin/flickr.pl
@@ -20,9 +20,9 @@ BEGIN {
 }
 
 use lib ("$workdir/lib", "$workdir/vendor_perl", "$workdir/vendor_perl/lib/perl5");
-use flickr qw (flickr_by_tags);
+use BotLib::Image::Flickr qw (FlickrByTags);
 
-my $url = flickr_by_tags ('bird,owl');
+my $url = FlickrByTags ('bird,owl');
 
 if ($url) {
 	say $url; ## no critic (InputOutput::RequireCheckedSyscalls)
diff --git a/bin/fortune_seed.pl b/bin/fortune_seed.pl
index 8757f1a..a6f5b7d 100644
--- a/bin/fortune_seed.pl
+++ b/bin/fortune_seed.pl
@@ -20,9 +20,7 @@ BEGIN {
 }
 
 use lib ("$workdir/lib", "$workdir/vendor_perl", "$workdir/vendor_perl/lib/perl5");
-use fortune qw (seed);
-use Carp;
-local $SIG{__DIE__} = sub { Carp::confess @_ };
+use BotLib::Fortune qw (Seed);
 
-seed ();
+Seed ();
 exit 0;
diff --git a/bin/train_lat.pl b/bin/train_lat.pl
index 2d14997..5ef0f02 100644
--- a/bin/train_lat.pl
+++ b/bin/train_lat.pl
@@ -20,7 +20,7 @@ BEGIN {
 }
 
 use lib ("$workdir/lib", "$workdir/vendor_perl", "$workdir/vendor_perl/lib/perl5");
-use lat qw (train);
+use BotLib::Lat qw (Train);
 
-train ();
+Train ();
 exit 0;