diff --git a/config.sample/plugins b/config.sample/plugins
index 4839773..0775c24 100644
--- a/config.sample/plugins
+++ b/config.sample/plugins
@@ -38,7 +38,7 @@ require_resolvable_fromhost
 
 rhsbl
 dnsbl
-check_badmailfrom
+badmailfrom
 check_badrcptto
 check_spamhelo
 
diff --git a/plugins/badmailfromto b/plugins/badmailfromto
index 154f336..351345a 100644
--- a/plugins/badmailfromto
+++ b/plugins/badmailfromto
@@ -2,18 +2,18 @@
 
 =head1 NAME
 
-check_badmailfromto - checks the badmailfromto config
+badmailfromto - checks the badmailfromto config
 
 =head1 DESCRIPTION
 
-Much like the similar check_badmailfrom, this plugin references both the
+Much like the similar badmailfrom, this plugin references both the
 FROM: and TO: lines, and if they both are present in the badmailfromto
 config file (a tab delimited list of FROM/TO pairs), then the message is
 blocked as if the recipient (TO) didn't exist.  This is specifically designed
 to not give the impression that the sender is blocked (good for cases of
 harassment).
 
-Based heavily on check_badmailfrom.
+Based heavily on badmailfrom.
 
 =cut
 
diff --git a/t/plugin_tests/badmailfrom b/t/plugin_tests/badmailfrom
index 042d3d0..463d5f7 100644
--- a/t/plugin_tests/badmailfrom
+++ b/t/plugin_tests/badmailfrom
@@ -70,25 +70,25 @@ sub test_badmailfrom_match {
 # is_match receives ( $from, $bad, $host )
 
     my $r = $self->is_match( 'matt@test.net', 'matt@test.net', 'test.net' );
-    ok($r, "check_badmailfrom match");
+    ok($r, "match");
     
     ok( ! $self->is_match( 'matt@test.net', 'matt@test.com', 'tnpi.net' ),
-        "check_badmailfrom non-match");
+        "non-match");
 
     ok( $self->is_match( 'matt@test.net', '@test.net', 'test.net' ),
-        "check_badmailfrom match host");
+        "match host");
 
     ok( ! $self->is_match( 'matt@test.net', '@test.not', 'test.net' ),
-        "check_badmailfrom non-match host");
+        "non-match host");
 
     ok( ! $self->is_match( 'matt@test.net', '@test.net', 'test.not' ),
-        "check_badmailfrom non-match host");
+        "non-match host");
 
     ok( $self->is_match( 'matt@test.net', 'test.net$', 'tnpi.net' ),
-        "check_badmailfrom pattern match");
+        "pattern match");
 
     ok( ! $self->is_match( 'matt@test.net', 'test.not$', 'tnpi.net' ),
-        "check_badmailfrom pattern non-match");
+        "pattern non-match");
 };
 
 sub _reset_connection_flags {