diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index 4b21c9d19..e3222cb20 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -269,7 +269,7 @@ our %config;
 #
 # Entries in shorewall.conf that have been renamed
 #
-our %renamed = ( AUTO_COMMENT => 'AUTOCOMMENT' );
+our %renamed = ( AUTO_COMMENT => 'AUTOCOMMENT', BLACKLIST_LOGLEVEL => 'BLACKLIST_LOG_LEVEL' );
 #
 # Config options and global settings that are to be copied to output script
 #
@@ -665,7 +665,7 @@ sub initialize( $;$$) {
 	  LOGRATE => undef,
 	  LOGBURST => undef,
 	  LOGALLNEW => undef,
-	  BLACKLIST_LOGLEVEL => undef,
+	  BLACKLIST_LOG_LEVEL => undef,
 	  RELATED_LOG_LEVEL => undef,
 	  RFC1918_LOG_LEVEL => undef,
 	  MACLIST_LOG_LEVEL => undef,
@@ -5286,13 +5286,13 @@ sub get_configuration( $$$$ ) {
 
     require_capability 'AUDIT_TARGET', "SMURF_DISPOSITION=$val", 's' if $val =~ /^A_/;
 
-    default_log_level 'BLACKLIST_LOGLEVEL',  '';
-    default_log_level 'MACLIST_LOG_LEVEL',   '';
-    default_log_level 'TCP_FLAGS_LOG_LEVEL', '';
-    default_log_level 'RFC1918_LOG_LEVEL',   '';
-    default_log_level 'RELATED_LOG_LEVEL',   '';
-    default_log_level 'INVALID_LOG_LEVEL',   '';
-    default_log_level 'UNTRACKED_LOG_LEVEL', '';
+    default_log_level 'BLACKLIST_LOG_LEVEL',  '';
+    default_log_level 'MACLIST_LOG_LEVEL',    '';
+    default_log_level 'TCP_FLAGS_LOG_LEVEL',  '';
+    default_log_level 'RFC1918_LOG_LEVEL',    '';
+    default_log_level 'RELATED_LOG_LEVEL',    '';
+    default_log_level 'INVALID_LOG_LEVEL',    '';
+    default_log_level 'UNTRACKED_LOG_LEVEL',  '';
 
     warning_message "RFC1918_LOG_LEVEL=$config{RFC1918_LOG_LEVEL} ignored. The 'norfc1918' interface/host option is no longer supported" if $config{RFC1918_LOG_LEVEL};
 
diff --git a/Shorewall/Perl/Shorewall/Misc.pm b/Shorewall/Perl/Shorewall/Misc.pm
index 65c652fc2..6c17aa7bc 100644
--- a/Shorewall/Perl/Shorewall/Misc.pm
+++ b/Shorewall/Perl/Shorewall/Misc.pm
@@ -199,7 +199,7 @@ sub setup_blacklist() {
     my $zones1 = find_zones_by_option 'blacklist', 'out';
     my $chainref;
     my $chainref1;
-    my ( $level, $disposition ) = @config{'BLACKLIST_LOGLEVEL', 'BLACKLIST_DISPOSITION' };
+    my ( $level, $disposition ) = @config{'BLACKLIST_LOG_LEVEL', 'BLACKLIST_DISPOSITION' };
     my $audit       = $disposition =~ /^A_/;
     my $target      = $disposition eq 'REJECT' ? 'reject' : $disposition;
     my $orig_target = $target;
@@ -379,7 +379,7 @@ sub remove_blacklist( $ ) {
 sub convert_blacklist() {
     my $zones  = find_zones_by_option 'blacklist', 'in';
     my $zones1 = find_zones_by_option 'blacklist', 'out';
-    my ( $level, $disposition ) = @config{'BLACKLIST_LOGLEVEL', 'BLACKLIST_DISPOSITION' };
+    my ( $level, $disposition ) = @config{'BLACKLIST_LOG_LEVEL', 'BLACKLIST_DISPOSITION' };
     my $audit       = $disposition =~ /^A_/;
     my $target      = $disposition eq 'REJECT' ? 'reject' : $disposition;
     my $orig_target = $target;
@@ -766,7 +766,7 @@ sub add_common_rules ( $ ) {
 
     my @state     = state_imatch( $globals{BLACKLIST_STATES} );
     my $faststate = $config{RELATED_DISPOSITION} eq 'ACCEPT' && $config{RELATED_LOG_LEVEL} eq '' ? 'ESTABLISHED,RELATED' : 'ESTABLISHED';
-    my $level     = $config{BLACKLIST_LOGLEVEL};
+    my $level     = $config{BLACKLIST_LOG_LEVEL};
     my $rejectref = $filter_table->{reject};
 
     if ( $config{DYNAMIC_BLACKLIST} ) {
diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm
index 5ad8ca608..0d5c878e6 100644
--- a/Shorewall/Perl/Shorewall/Rules.pm
+++ b/Shorewall/Perl/Shorewall/Rules.pm
@@ -3143,7 +3143,7 @@ sub process_rules( $ ) {
 
     if ( $fn ) {
 	first_entry( sub () {
-			 my ( $level, $disposition ) = @config{'BLACKLIST_LOGLEVEL', 'BLACKLIST_DISPOSITION' };
+			 my ( $level, $disposition ) = @config{'BLACKLIST_LOG_LEVEL', 'BLACKLIST_DISPOSITION' };
 			 my  $audit       = $disposition =~ /^A_/;
 			 my  $target      = $disposition eq 'REJECT' ? 'reject' : $disposition;
 
diff --git a/Shorewall/Samples/Universal/shorewall.conf b/Shorewall/Samples/Universal/shorewall.conf
index b8470fcea..99aa50f0d 100644
--- a/Shorewall/Samples/Universal/shorewall.conf
+++ b/Shorewall/Samples/Universal/shorewall.conf
@@ -21,7 +21,7 @@ VERBOSITY=1
 #		                L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+BLACKLIST_LOG_LEVEL=
 
 INVALID_LOG_LEVEL=
 
diff --git a/Shorewall/Samples/one-interface/shorewall.conf b/Shorewall/Samples/one-interface/shorewall.conf
index ebd806ce7..860d6f746 100644
--- a/Shorewall/Samples/one-interface/shorewall.conf
+++ b/Shorewall/Samples/one-interface/shorewall.conf
@@ -32,7 +32,7 @@ VERBOSITY=1
 #		                L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+BLACKLIST_LOG_LEVEL=
 
 INVALID_LOG_LEVEL=
 
diff --git a/Shorewall/Samples/three-interfaces/shorewall.conf b/Shorewall/Samples/three-interfaces/shorewall.conf
index 46877f93e..25dac6b6d 100644
--- a/Shorewall/Samples/three-interfaces/shorewall.conf
+++ b/Shorewall/Samples/three-interfaces/shorewall.conf
@@ -30,7 +30,7 @@ VERBOSITY=1
 #		                L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+BLACKLIST_LOG_LEVEL=
 
 INVALID_LOG_LEVEL=
 
diff --git a/Shorewall/Samples/two-interfaces/shorewall.conf b/Shorewall/Samples/two-interfaces/shorewall.conf
index 53b74c5b8..49258e0c1 100644
--- a/Shorewall/Samples/two-interfaces/shorewall.conf
+++ b/Shorewall/Samples/two-interfaces/shorewall.conf
@@ -33,7 +33,7 @@ VERBOSITY=1
 #		                L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+BLACKLIST_LOG_LEVEL=
 
 INVALID_LOG_LEVEL=
 
diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf
index cc13d51e3..bd8aecef2 100644
--- a/Shorewall/configfiles/shorewall.conf
+++ b/Shorewall/configfiles/shorewall.conf
@@ -21,7 +21,7 @@ VERBOSITY=1
 #		                L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+BLACKLIST_LOG_LEVEL=
 
 INVALID_LOG_LEVEL=
 
diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml
index b8abea340..54b4ecbf1 100644
--- a/Shorewall/manpages/shorewall.conf.xml
+++ b/Shorewall/manpages/shorewall.conf.xml
@@ -422,19 +422,17 @@
 
       <varlistentry>
         <term><emphasis
-        role="bold">BLACKLIST_LOGLEVEL=</emphasis>[<emphasis>log-level</emphasis>]</term>
+        role="bold">BLACKLIST_LOG_LEVEL=</emphasis>[<emphasis>log-level</emphasis>]</term>
 
         <listitem>
-          <para>This parameter determines if packets from blacklisted hosts
-          are logged and it determines the syslog level that they are to be
-          logged at. Its value is a syslog level (Example:
-          BLACKLIST_LOGLEVEL=debug). If you do not assign a value or if you
-          assign an empty value then packets from blacklisted hosts are not
-          logged. The BLACKLIST_LOGLEVEL setting has no effect on entries in
-          the BLACKLIST section of <ulink
-          url="shorewall-rules.html">shorewall-rules</ulink> (5). It
-          determines the log level of packets sent to the <emphasis
-          role="bold">blacklog</emphasis> target of <ulink
+          <para>Formerly named BLACKLIST_LOGLEVEL. This parameter determines
+          if packets from blacklisted hosts are logged and it determines the
+          syslog level that they are to be logged at. Its value is a syslog
+          level (Example: BLACKLIST_LOG_LEVEL=debug). If you do not assign a
+          value or if you assign an empty value then packets from blacklisted
+          hosts are not logged. The setting determines the log level of
+          packets sent to the <emphasis role="bold">blacklog</emphasis> target
+          of <ulink
           url="shorewall-blrules.html">shorewall-blrules</ulink>(5).</para>
         </listitem>
       </varlistentry>
diff --git a/Shorewall6/Samples6/Universal/shorewall6.conf b/Shorewall6/Samples6/Universal/shorewall6.conf
index 48a8df721..0997f2903 100644
--- a/Shorewall6/Samples6/Universal/shorewall6.conf
+++ b/Shorewall6/Samples6/Universal/shorewall6.conf
@@ -22,7 +22,7 @@ VERBOSITY=1
 #			       L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+BLACKLIST_LOG_LEVEL=
 
 INVALID_LOG_LEVEL=
 
diff --git a/Shorewall6/Samples6/one-interface/shorewall6.conf b/Shorewall6/Samples6/one-interface/shorewall6.conf
index 5975448b4..58f4e6e61 100644
--- a/Shorewall6/Samples6/one-interface/shorewall6.conf
+++ b/Shorewall6/Samples6/one-interface/shorewall6.conf
@@ -22,7 +22,7 @@ VERBOSITY=1
 #			       L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+BLACKLIST_LOG_LEVEL=
 
 INVALID_LOG_LEVEL=
 
diff --git a/Shorewall6/Samples6/three-interfaces/shorewall6.conf b/Shorewall6/Samples6/three-interfaces/shorewall6.conf
index 0cb5eaa12..c0c83e13f 100644
--- a/Shorewall6/Samples6/three-interfaces/shorewall6.conf
+++ b/Shorewall6/Samples6/three-interfaces/shorewall6.conf
@@ -22,7 +22,7 @@ VERBOSITY=1
 #			       L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+BLACKLIST_LOG_LEVEL=
 
 INVALID_LOG_LEVEL=
 
diff --git a/Shorewall6/Samples6/two-interfaces/shorewall6.conf b/Shorewall6/Samples6/two-interfaces/shorewall6.conf
index bd57dea15..624b12f3f 100644
--- a/Shorewall6/Samples6/two-interfaces/shorewall6.conf
+++ b/Shorewall6/Samples6/two-interfaces/shorewall6.conf
@@ -22,7 +22,7 @@ VERBOSITY=1
 #			       L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+BLACKLIST_LOG_LEVEL=
 
 INVALID_LOG_LEVEL=
 
diff --git a/Shorewall6/configfiles/shorewall6.conf b/Shorewall6/configfiles/shorewall6.conf
index ca3d2ceeb..d4e2d549c 100644
--- a/Shorewall6/configfiles/shorewall6.conf
+++ b/Shorewall6/configfiles/shorewall6.conf
@@ -22,7 +22,7 @@ VERBOSITY=1
 #			       L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+BLACKLIST_LOG_LEVEL=
 
 INVALID_LOG_LEVEL=
 
diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml
index ea102d21a..a8f274bb1 100644
--- a/Shorewall6/manpages/shorewall6.conf.xml
+++ b/Shorewall6/manpages/shorewall6.conf.xml
@@ -341,10 +341,7 @@
           be dropped or REJECT if the packets are to be replied with an ICMP
           port unreachable reply or a TCP RST (tcp only). If you do not assign
           a value or if you assign an empty value then DROP is assumed. The
-          BLACKLIST_DISPOSITION setting has no effect on entries in the
-          BLACKLIST section of <ulink
-          url="shorewall6-rules.html">shorewall6-rules</ulink> (5). It
-          determines the disposition of packets sent to the <emphasis
+          setting determines the disposition of packets sent to the <emphasis
           role="bold">blacklog</emphasis> target of <ulink
           url="shorewall6-blrules.html">shorewall6-blrules</ulink>(5).</para>
         </listitem>
@@ -352,19 +349,17 @@
 
       <varlistentry>
         <term><emphasis
-        role="bold">BLACKLIST_LOGLEVEL=</emphasis>[<emphasis>log-level</emphasis>]</term>
+        role="bold">BLACKLIST_LOG_LEVEL=</emphasis>[<emphasis>log-level</emphasis>]</term>
 
         <listitem>
-          <para>This parameter determines if packets from blacklisted hosts
-          are logged and it determines the syslog level that they are to be
-          logged at. Its value is a syslog level (Example:
-          BLACKLIST_LOGLEVEL=debug). If you do not assign a value or if you
-          assign an empty value then packets from blacklisted hosts are not
-          logged. The BLACKLIST_LOGLEVEL setting has no effect on entries in
-          the BLACKLIST section of <ulink
-          url="shorewall6-rules.html">shorewall6-rules</ulink> (5). It
-          determines the log level of packets sent to the <emphasis
-          role="bold">blacklog</emphasis> target of <ulink
+          <para>Formerly named BLACKLIST_LOGLEVEL. This parameter determines
+          if packets from blacklisted hosts are logged and it determines the
+          syslog level that they are to be logged at. Its value is a syslog
+          level (Example: BLACKLIST_LOG_LEVEL=debug). If you do not assign a
+          value or if you assign an empty value then packets from blacklisted
+          hosts are not logged. The setting determines the log level of
+          packets sent to the <emphasis role="bold">blacklog</emphasis> target
+          of <ulink
           url="shorewall6-blrules.html">shorewall6-blrules</ulink>(5).</para>
         </listitem>
       </varlistentry>