From 58a0b9b5c10b08c4f37d6795ff1e0415b07ab019 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 9 Jan 2012 07:19:10 -0800
Subject: [PATCH] Rename route_rules to rtrules -- phase 2

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Providers.pm            |  8 ++++----
 Shorewall/install.sh                             |  4 ++--
 docs/Manpages.xml                                |  2 +-
 docs/Manpages6.xml                               |  2 +-
 docs/MultiISP.xml                                |  8 ++++----
 docs/MultiISP_ru.xml                             | 16 ++++++++--------
 docs/MyNetwork.xml                               |  4 ++--
 docs/OpenVZ.xml                                  |  6 +++---
 docs/configuration_file_basics.xml               |  4 ++--
 manpages/shorewall-accounting.xml                |  2 +-
 manpages/shorewall-actions.xml                   |  2 +-
 manpages/shorewall-blacklist.xml                 |  2 +-
 manpages/shorewall-blrules.xml                   |  2 +-
 manpages/shorewall-ecn.xml                       |  2 +-
 manpages/shorewall-exclusion.xml                 |  2 +-
 manpages/shorewall-hosts.xml                     |  2 +-
 manpages/shorewall-init.xml                      |  2 +-
 manpages/shorewall-interfaces.xml                |  2 +-
 manpages/shorewall-ipsets.xml                    |  2 +-
 manpages/shorewall-maclist.xml                   |  2 +-
 manpages/shorewall-masq.xml                      |  4 ++--
 manpages/shorewall-modules.xml                   |  2 +-
 manpages/shorewall-nat.xml                       |  2 +-
 manpages/shorewall-nesting.xml                   |  2 +-
 manpages/shorewall-netmap.xml                    |  2 +-
 manpages/shorewall-notrack.xml                   |  2 +-
 manpages/shorewall-params.xml                    |  2 +-
 manpages/shorewall-policy.xml                    |  2 +-
 manpages/shorewall-providers.xml                 |  2 +-
 manpages/shorewall-proxyarp.xml                  |  2 +-
 manpages/shorewall-routes.xml                    |  2 +-
 manpages/shorewall-routestopped.xml              |  2 +-
 ...all-route_rules.xml => shorewall-rtrules.xml} |  8 ++++----
 manpages/shorewall-rules.xml                     |  2 +-
 manpages/shorewall-secmarks.xml                  |  2 +-
 manpages/shorewall-tcclasses.xml                 |  2 +-
 manpages/shorewall-tcdevices.xml                 |  2 +-
 manpages/shorewall-tcfilters.xml                 |  2 +-
 manpages/shorewall-tcinterfaces.xml              |  2 +-
 manpages/shorewall-tcpri.xml                     |  2 +-
 manpages/shorewall-tcrules.xml                   |  2 +-
 manpages/shorewall-template.xml                  |  2 +-
 manpages/shorewall-tos.xml                       |  2 +-
 manpages/shorewall-tunnels.xml                   |  2 +-
 manpages/shorewall-vardir.xml                    |  2 +-
 manpages/shorewall-zones.xml                     |  2 +-
 manpages/shorewall.conf.xml                      |  4 ++--
 manpages/shorewall.xml                           |  2 +-
 manpages6/shorewall6-accounting.xml              |  2 +-
 manpages6/shorewall6-actions.xml                 |  2 +-
 manpages6/shorewall6-blacklist.xml               |  2 +-
 manpages6/shorewall6-blrules.xml                 |  2 +-
 manpages6/shorewall6-exclusion.xml               |  2 +-
 manpages6/shorewall6-hosts.xml                   |  2 +-
 manpages6/shorewall6-interfaces.xml              |  2 +-
 manpages6/shorewall6-ipsets.xml                  |  2 +-
 manpages6/shorewall6-maclist.xml                 |  2 +-
 manpages6/shorewall6-modules.xml                 |  2 +-
 manpages6/shorewall6-nesting.xml                 |  2 +-
 manpages6/shorewall6-notrack.xml                 |  2 +-
 manpages6/shorewall6-params.xml                  |  2 +-
 manpages6/shorewall6-policy.xml                  |  2 +-
 manpages6/shorewall6-providers.xml               |  2 +-
 manpages6/shorewall6-proxyndp.xml                |  2 +-
 manpages6/shorewall6-routes.xml                  |  2 +-
 manpages6/shorewall6-routestopped.xml            |  2 +-
 ...l6-route_rules.xml => shorewall6-rtrules.xml} |  8 ++++----
 manpages6/shorewall6-rules.xml                   |  2 +-
 manpages6/shorewall6-secmarks.xml                |  2 +-
 manpages6/shorewall6-tcclasses.xml               |  2 +-
 manpages6/shorewall6-tcdevices.xml               |  2 +-
 manpages6/shorewall6-tcinterfaces.xml            |  2 +-
 manpages6/shorewall6-tcpri.xml                   |  2 +-
 manpages6/shorewall6-tcrules.xml                 |  2 +-
 manpages6/shorewall6-template.xml                |  2 +-
 manpages6/shorewall6-tos.xml                     |  2 +-
 manpages6/shorewall6-tunnels.xml                 |  2 +-
 manpages6/shorewall6-vardir.xml                  |  2 +-
 manpages6/shorewall6-zones.xml                   |  2 +-
 manpages6/shorewall6.conf.xml                    |  4 ++--
 manpages6/shorewall6.xml                         |  2 +-
 81 files changed, 108 insertions(+), 108 deletions(-)
 rename manpages/{shorewall-route_rules.xml => shorewall-rtrules.xml} (97%)
 rename manpages6/{shorewall6-route_rules.xml => shorewall6-rtrules.xml} (96%)

diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm
index d68e55543..30e7b713e 100644
--- a/Shorewall/Perl/Shorewall/Providers.pm
+++ b/Shorewall/Perl/Shorewall/Providers.pm
@@ -21,7 +21,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MAS 02110-1301 USA.
 #
 #   This module deals with the /etc/shorewall/providers,
-#   /etc/shorewall/route_rules and /etc/shorewall/routes files.
+#   /etc/shorewall/rtrules and /etc/shorewall/routes files.
 #
 package Shorewall::Providers;
 require Exporter;
@@ -817,7 +817,7 @@ sub add_a_provider( $$ ) {
 }
 
 sub add_an_rtrule( ) {
-    my ( $source, $dest, $provider, $priority, $originalmark ) = split_line 'route_rules file', { source => 0, dest => 1, provider => 2, priority => 3 , mark => 4 };
+    my ( $source, $dest, $provider, $priority, $originalmark ) = split_line 'rtrules file', { source => 0, dest => 1, provider => 2, priority => 3 , mark => 4 };
 
     our $current_if;
 
@@ -844,7 +844,7 @@ sub add_an_rtrule( ) {
     my $number = $providerref->{number};
 
     fatal_error "You may not add rules for the $provider provider" if $number == LOCAL_TABLE || $number == UNSPEC_TABLE;
-    fatal_error "You must specify either the source or destination in a route_rules entry" if $source eq '-' && $dest eq '-';
+    fatal_error "You must specify either the source or destination in a rtrules entry" if $source eq '-' && $dest eq '-';
 
     if ( $dest eq '-' ) {
 	$dest = 'to ' . ALLIP;
@@ -1108,7 +1108,7 @@ sub process_providers( $ ) {
     }
 
     if ( $providers ) {
-	my $fn = open_file 'route_rules';
+	my $fn = open_file( 'route_rules' ) || open_file( 'rtrules' );
 
 	if ( $fn ) {
 	    first_entry "$doing $fn...";
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 7998b5aaa..6c101d690 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -731,8 +731,8 @@ fi
 #
 # Install the Route Rules file
 #
-run_install $OWNERSHIP -m 0644 rtrules          ${DESTDIR}/usr/share/$PRODUCT/configfiles/
-run_install $OWNERSHIP -m 0644 rrules.annotated ${DESTDIR}/usr/share/$PRODUCT/configfiles/
+run_install $OWNERSHIP -m 0644 rtrules           ${DESTDIR}/usr/share/$PRODUCT/configfiles/
+run_install $OWNERSHIP -m 0644 rtrules.annotated ${DESTDIR}/usr/share/$PRODUCT/configfiles/
 
 if [ -f ${DESTDIR}/etc/$PRODUCT/route_rules -a ! ${DESTDIR}/etc/$PRODUCT/rtrules ]; then
     mv -f ${DESTDIR}/etc/$PRODUCT/route_rules ${DESTDIR}/etc/$PRODUCT/rtrules
diff --git a/docs/Manpages.xml b/docs/Manpages.xml
index c76b1fa10..bf3ac8362 100644
--- a/docs/Manpages.xml
+++ b/docs/Manpages.xml
@@ -124,7 +124,7 @@
         - Define Proxy ARP.</member>
 
         <member><ulink
-        url="manpages/shorewall-route_rules.html">route_rules</ulink> - Define
+        url="manpages/shorewall-rtrules.html">rtrules</ulink> - Define
         routing rules.</member>
 
         <member><ulink url="manpages/shorewall-routes.html">routes</ulink> -
diff --git a/docs/Manpages6.xml b/docs/Manpages6.xml
index cf4b05fa5..69ed41ad0 100644
--- a/docs/Manpages6.xml
+++ b/docs/Manpages6.xml
@@ -109,7 +109,7 @@
         Proxy NDP</member>
 
         <member><ulink
-        url="manpages6/shorewall6-route_rules.html">route_rules</ulink> -
+        url="manpages6/shorewall6-rtrules.html">rtrules</ulink> -
         Define routing rules.</member>
 
         <member><ulink url="manpages6/shorewall6-routes.html">routes</ulink> -
diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml
index f93602f5d..bd5730c84 100644
--- a/docs/MultiISP.xml
+++ b/docs/MultiISP.xml
@@ -144,7 +144,7 @@
       <para>Entries in <filename>/etc/shorewall/providers</filename> can
       specify that outgoing connections are to be load-balanced between the
       two ISPs. Entries in <filename>/etc/shorewall/tcrules</filename> and
-      <filename>/etc/shorewall/route_rules</filename> can be used to direct
+      <filename>/etc/shorewall/rtrules</filename> can be used to direct
       particular outgoing connections to one ISP or the other. Use of
       <filename>/etc/shorewall/tcrules</filename> is not required for
       <filename>/etc/shorewall/providers</filename> to work, but in most
@@ -973,7 +973,7 @@ eth3             0.0.0.0/0         16.105.78.4</programlisting></para>
 lo          -         shorewall       1000</programlisting>
     </section>
 
-    <section id="route_rules">
+    <section id="rtrules">
       <title>/etc/shorewall/rtrules (formerly
       /etc/shorewall/route_rules)</title>
 
@@ -1005,7 +1005,7 @@ gateway:~ #</programlisting>
         with MARK 1 going to Blarg and mark 2 going to Comcast.</para>
       </section>
 
-      <section id="route_rules_columns">
+      <section id="rtrules_columns">
         <title>Columns in the rtrules file</title>
 
         <para>Columns in the file are:</para>
@@ -1301,7 +1301,7 @@ lillycat: #</programlisting>
       USE_DEFAULT_RT=Yes, you can easily cause all traffic to use one provider
       except when you explicitly direct it to use the other provider via
       <ulink
-      url="manpages/shorewall-route_rules.html">shorewall-rtrules</ulink> (5)
+      url="manpages/shorewall-rtrules.html">shorewall-rtrules</ulink> (5)
       or <ulink
       url="manpages/shorewall-tcrules.html">shorewall-tcrules</ulink>
       (5).</para>
diff --git a/docs/MultiISP_ru.xml b/docs/MultiISP_ru.xml
index 9c8372f57..09592af6a 100644
--- a/docs/MultiISP_ru.xml
+++ b/docs/MultiISP_ru.xml
@@ -326,7 +326,7 @@
         </listitem>
       </orderedlist>
 
-      <para>Итак, если вы хотите направить трафик через определённого провайдера, то <emphasis>необходимо </emphasis>пометить этот трафик значением MARK провайдера в файле <filename>/etc/shorewall/tcrules</filename> и пометить пакет в цепочке PREROUTING; другим способом будет указание соответствующих правил в файле <filename>/etc/shorewall/route_rules</filename>.</para>
+      <para>Итак, если вы хотите направить трафик через определённого провайдера, то <emphasis>необходимо </emphasis>пометить этот трафик значением MARK провайдера в файле <filename>/etc/shorewall/tcrules</filename> и пометить пакет в цепочке PREROUTING; другим способом будет указание соответствующих правил в файле <filename>/etc/shorewall/rtrules</filename>.</para>
 
       <warning id="Undo">
         <para>В Shorewall версий ниже 3.4.0 записи из файла <filename>/etc/shorewall/providers</filename> необратимо изменяют маршрутизацию системы, то есть эти изменения не отменяются при вызове команды <command>shorewall stop</command> или <command>shorewall clear</command>. Для того чтобы восстановить исходные маршруты, может потребоваться перезапустить сеть. Обычно это делает команда <command>/etc/init.d/network restart</command> или <command>/etc/init.d/networking restart</command>. Обратитесь к документации по сети вашего дистрибутива.</para>
@@ -484,7 +484,7 @@ eth0             eth2              206.124.146.176
 eth1             eth2              130.252.99.27</programlisting>
 
       <warning>
-        <para>Записи в файле <filename>/etc/shorewall/masq</filename> никак не влияют на то, через какого провайдера пройдёт конкретное соединение. Для этого применяются правила в файле <filename>/etc/shorewall/tcrules</filename> или <filename>/etc/shorewall/route_rules</filename>.</para>
+        <para>Записи в файле <filename>/etc/shorewall/masq</filename> никак не влияют на то, через какого провайдера пройдёт конкретное соединение. Для этого применяются правила в файле <filename>/etc/shorewall/tcrules</filename> или <filename>/etc/shorewall/rtrules</filename>.</para>
       </warning>
 
       <para>Предположим, что требуется направить весь исходящий трафик SMTP из локальной сети через провайдера 2. В файле <ulink url="traffic_shaping.htm">/etc/shorewall/tcrules</ulink> укажите следующее (и в версии Shorewall ниже 3.0.0 также задайте TC_ENABLED=Yes в файле <ulink url="???">/etc/shorewall/shorewall.conf</ulink>).</para>
@@ -546,13 +546,13 @@ eth3             eth2              16.105.78.4</programlisting></para>
       </itemizedlist>
     </section>
 
-    <section id="route_rules">
-      <title>/etc/shorewall/route_rules</title>
+    <section id="rtrules">
+      <title>/etc/shorewall/rtrules</title>
 
-      <para>Файл <filename>/etc/shorewall/route_rules</filename> добавлен в Shorewall в версии 3.2.0. Файл <filename>route_rules</filename> позволяет направлять определенный трафик через конкретного провайдера, как и записи из файла <filename>tcrules</filename> . Разница между этими двумя файлами состоит в том что записи в <filename>route_rules</filename> никак не связаны с Netfilter.</para>
+      <para>Файл <filename>/etc/shorewall/rtrules</filename> добавлен в Shorewall в версии 3.2.0. Файл <filename>rtrules</filename> позволяет направлять определенный трафик через конкретного провайдера, как и записи из файла <filename>tcrules</filename> . Разница между этими двумя файлами состоит в том что записи в <filename>rtrules</filename> никак не связаны с Netfilter.</para>
 
       <warning>
-        <para>В Shorewall версий ниже 3.4.0 записи из файла <filename>/etc/shorewall/route_rules</filename> необратимо изменяют маршрутизацию в системе, то есть эти изменения не отменяются при вызове команды <command>shorewall stop</command> или <command>shorewall clear</command>. Для того чтобы восстановить исходные маршруты, может потребоваться перезапустить сеть. Обычно это делает команда <command>/etc/init.d/network restart</command> или <command>/etc/init.d/networking restart</command>. Обратитесь к документации по сети вашего дистрибутива.</para>
+        <para>В Shorewall версий ниже 3.4.0 записи из файла <filename>/etc/shorewall/rtrules</filename> необратимо изменяют маршрутизацию в системе, то есть эти изменения не отменяются при вызове команды <command>shorewall stop</command> или <command>shorewall clear</command>. Для того чтобы восстановить исходные маршруты, может потребоваться перезапустить сеть. Обычно это делает команда <command>/etc/init.d/network restart</command> или <command>/etc/init.d/networking restart</command>. Обратитесь к документации по сети вашего дистрибутива.</para>
 
         <para>Также обратите внимание на <link linkend="Undo">предупреждение в разделе <emphasis>Какие функции выполняет запись в файле providers</emphasis></link>.</para>
       </warning>
@@ -575,8 +575,8 @@ gateway:~ #</programlisting>
         <para>В этом примере настроены два провайдера:  Blarg и Comcast, с метками MARK 1 и 2 соответственно.</para>
       </section>
 
-      <section id="route_rules_columns">
-        <title>Файл route_rules</title>
+      <section id="rtrules_columns">
+        <title>Файл rtrules</title>
 
         <para>Далее описаны столбцы файла:</para>
 
diff --git a/docs/MyNetwork.xml b/docs/MyNetwork.xml
index 6474fa728..e3b4fe117 100644
--- a/docs/MyNetwork.xml
+++ b/docs/MyNetwork.xml
@@ -595,8 +595,8 @@ chmod 744 ${VARDIR}/state</programlisting>If lsm isn't running then start it.
       Make the state file world-readable.</para>
     </section>
 
-    <section id="route_rules">
-      <title>/etc/shorewall/route_rules</title>
+    <section id="rtrules">
+      <title>/etc/shorewall/rtrules</title>
 
       <para><programlisting>#SOURCE             DEST             PROVIDER  PRIORITY
 
diff --git a/docs/OpenVZ.xml b/docs/OpenVZ.xml
index c4b2aedc2..18162042c 100644
--- a/docs/OpenVZ.xml
+++ b/docs/OpenVZ.xml
@@ -159,7 +159,7 @@ vz       venet0             -              <emphasis role="bold">routeback,rp_fi
 
       <para>If you run Shorewall Multi-ISP support on the host, you should
       arrange for traffic to your containers to use the main routing table. In
-      the configuration shown here, this entry in /etc/shorewall/route_rules
+      the configuration shown here, this entry in /etc/shorewall/rtrules
       is appropriate:</para>
 
       <programlisting>#SOURCE            DEST              PROVIDER          PRIORITY
@@ -478,7 +478,7 @@ net     $NET_IF         detect                  dhcp,blacklist,tcpflags,optional
 loc     $INT_IF         detect                  dhcp,logmartians=1,routefilter=1,nets=(172.20.1.0/24),tcpflags
 <emphasis role="bold">dmz     $VPS_IF         detect                  logmartians=0,routefilter=0,nets=(206.124.146.177,206.124.146.178),routeback</emphasis>
 ...</programlisting>This is a multi-ISP configuration so entries are required
-      in <filename>/etc/shorewall/route_rules</filename>:</para>
+      in <filename>/etc/shorewall/rtrules</filename>:</para>
 
       <programlisting>#SOURCE   DEST                 PROVIDER  PRIORITY
 -         172.20.0.0/24        main      1000
@@ -796,7 +796,7 @@ dmz     $VPS_IF         detect                  logmartians=0,routefilter=0,nets
 206.124.146.178 DMZ_IF        eth2       no          yes</emphasis></programlisting>
 
       <para>This is a multi-ISP configuration so entries are required in
-      <filename>/etc/shorewall/route_rules</filename>:</para>
+      <filename>/etc/shorewall/rtrules</filename>:</para>
 
       <programlisting>#SOURCE   DEST                 PROVIDER  PRIORITY
 -         172.20.0.0/24        main      1000
diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml
index 444f8b983..d24afd494 100644
--- a/docs/configuration_file_basics.xml
+++ b/docs/configuration_file_basics.xml
@@ -190,7 +190,7 @@
         </listitem>
 
         <listitem>
-          <para><filename>/etc/shorewall/route_rules</filename> - Defines
+          <para><filename>/etc/shorewall/rtrules</filename> - Defines
           routing rules to be used in conjunction with the routing tables
           defined in <filename>/etc/shorewall/providers</filename>.</para>
         </listitem>
@@ -640,7 +640,7 @@ ACCEPT      net:\
           </row>
 
           <row>
-            <entry>route_rules</entry>
+            <entry>rtrules</entry>
 
             <entry>source,dest,provider,priority</entry>
           </row>
diff --git a/manpages/shorewall-accounting.xml b/manpages/shorewall-accounting.xml
index 5da421078..0415b2ff9 100644
--- a/manpages/shorewall-accounting.xml
+++ b/manpages/shorewall-accounting.xml
@@ -702,7 +702,7 @@
     shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-actions.xml b/manpages/shorewall-actions.xml
index a5dd0db2a..608002a94 100644
--- a/manpages/shorewall-actions.xml
+++ b/manpages/shorewall-actions.xml
@@ -51,7 +51,7 @@
     shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-blacklist.xml b/manpages/shorewall-blacklist.xml
index b2ff8300a..5718fcca1 100644
--- a/manpages/shorewall-blacklist.xml
+++ b/manpages/shorewall-blacklist.xml
@@ -189,7 +189,7 @@
     shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-blrules.xml b/manpages/shorewall-blrules.xml
index 3145e5158..5bf4c6a71 100644
--- a/manpages/shorewall-blrules.xml
+++ b/manpages/shorewall-blrules.xml
@@ -292,7 +292,7 @@
     <para>shorewall(8), shorewall-accounting(5), shorewall-actions(5),
     shorewall-hosts(5), shorewall-interfaces(5), shorewall-maclist(5),
     shoewall6-netmap(5),shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-ecn.xml b/manpages/shorewall-ecn.xml
index 703a768cf..40ecd1a07 100644
--- a/manpages/shorewall-ecn.xml
+++ b/manpages/shorewall-ecn.xml
@@ -67,7 +67,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5),
     shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
     shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-exclusion.xml b/manpages/shorewall-exclusion.xml
index 6c0a7841a..08c21bf15 100644
--- a/manpages/shorewall-exclusion.xml
+++ b/manpages/shorewall-exclusion.xml
@@ -180,7 +180,7 @@ ACCEPT          all!z2        net         tcp           22</programlisting>
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
     shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5),
     shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-hosts.xml b/manpages/shorewall-hosts.xml
index d1c4c09d6..d2eed8a0a 100644
--- a/manpages/shorewall-hosts.xml
+++ b/manpages/shorewall-hosts.xml
@@ -269,7 +269,7 @@ vpn         ppp+:192.168.3.0/24</programlisting></para>
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-nesting(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
     shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5),
     shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-init.xml b/manpages/shorewall-init.xml
index 4e052b8b2..c8a535742 100644
--- a/manpages/shorewall-init.xml
+++ b/manpages/shorewall-init.xml
@@ -166,7 +166,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5),
     shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
     shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-interfaces.xml b/manpages/shorewall-interfaces.xml
index 675f20d49..a7802ce62 100644
--- a/manpages/shorewall-interfaces.xml
+++ b/manpages/shorewall-interfaces.xml
@@ -772,7 +772,7 @@ net     ppp0      -</programlisting>
     shorewall-blacklist(5), shorewall-hosts(5), shorewall-maclist(5),
     shorewall-masq(5), shorewall-nat(5), shorewall-netmap(5),
     shorewall-params(5), shorewall-policy(5), shorewall-providers(5),
-    shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-ipsets.xml b/manpages/shorewall-ipsets.xml
index 70644b691..e737bc402 100644
--- a/manpages/shorewall-ipsets.xml
+++ b/manpages/shorewall-ipsets.xml
@@ -120,7 +120,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-maclist.xml b/manpages/shorewall-maclist.xml
index 6d573056a..b4f8fc96a 100644
--- a/manpages/shorewall-maclist.xml
+++ b/manpages/shorewall-maclist.xml
@@ -110,7 +110,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5),
     shorewall-ipsets(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-masq.xml b/manpages/shorewall-masq.xml
index 3826cceb0..0c965e1f8 100644
--- a/manpages/shorewall-masq.xml
+++ b/manpages/shorewall-masq.xml
@@ -35,7 +35,7 @@
       <para>If you have more than one ISP link, adding entries to this file
       will <emphasis role="bold">not</emphasis> force connections to go out
       through a particular link. You must use entries in <ulink
-      url="shorewall-route_rules.html">shorewall-route_rules</ulink>(5) or
+      url="shorewall-rtrules.html">shorewall-rtrules</ulink>(5) or
       PREROUTING entries in <ulink
       url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5) to do
       that.</para>
@@ -568,7 +568,7 @@
     shorewall_interfaces(5), shorewall-ipsets(5), shorewall-maclist(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
     shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5),
     shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-modules.xml b/manpages/shorewall-modules.xml
index 0563f4080..d75804594 100644
--- a/manpages/shorewall-modules.xml
+++ b/manpages/shorewall-modules.xml
@@ -89,7 +89,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-nat.xml b/manpages/shorewall-nat.xml
index 02d13ac8b..88f4795d1 100644
--- a/manpages/shorewall-nat.xml
+++ b/manpages/shorewall-nat.xml
@@ -147,7 +147,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5),
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-nesting.xml b/manpages/shorewall-nesting.xml
index b2bb10068..0d2117ce9 100644
--- a/manpages/shorewall-nesting.xml
+++ b/manpages/shorewall-nesting.xml
@@ -207,7 +207,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5),
     shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
     shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-netmap.xml b/manpages/shorewall-netmap.xml
index 1355f7773..5842174a2 100644
--- a/manpages/shorewall-netmap.xml
+++ b/manpages/shorewall-netmap.xml
@@ -198,7 +198,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5),
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-notrack.xml b/manpages/shorewall-notrack.xml
index 756cbffd8..7fabb3e12 100644
--- a/manpages/shorewall-notrack.xml
+++ b/manpages/shorewall-notrack.xml
@@ -241,7 +241,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5),
     shorewall-ipsets(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-params.xml b/manpages/shorewall-params.xml
index 4cbaf129b..d1f9446ab 100644
--- a/manpages/shorewall-params.xml
+++ b/manpages/shorewall-params.xml
@@ -131,7 +131,7 @@ net     eth0            130.252.100.255 routefilter,norfc1918</programlisting>
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-policy(5), shorewall-providers(5),
-    shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5),
     shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
     shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-policy.xml b/manpages/shorewall-policy.xml
index 0f12939ad..9a558ae94 100644
--- a/manpages/shorewall-policy.xml
+++ b/manpages/shorewall-policy.xml
@@ -322,7 +322,7 @@
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
     shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5),
     shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-providers.xml b/manpages/shorewall-providers.xml
index 8a3bc0912..25952c059 100644
--- a/manpages/shorewall-providers.xml
+++ b/manpages/shorewall-providers.xml
@@ -349,7 +349,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5),
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
-    shorewall-policy(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-policy(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-proxyarp.xml b/manpages/shorewall-proxyarp.xml
index 1c61a6748..21951d0e5 100644
--- a/manpages/shorewall-proxyarp.xml
+++ b/manpages/shorewall-proxyarp.xml
@@ -141,7 +141,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5),
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
-    shorewall-policy(5), shorewall-providers(5), shorewall-route_rules(5),
+    shorewall-policy(5), shorewall-providers(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-routes.xml b/manpages/shorewall-routes.xml
index 16465f324..e033ffa2d 100644
--- a/manpages/shorewall-routes.xml
+++ b/manpages/shorewall-routes.xml
@@ -86,7 +86,7 @@
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
     shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5),
     shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-routestopped.xml b/manpages/shorewall-routestopped.xml
index e6495ee91..46e35897d 100644
--- a/manpages/shorewall-routestopped.xml
+++ b/manpages/shorewall-routestopped.xml
@@ -209,7 +209,7 @@
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-rules(5), shorewall.conf(5),
+    shorewall-rtrules(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
     shorewall-zones(5)</para>
diff --git a/manpages/shorewall-route_rules.xml b/manpages/shorewall-rtrules.xml
similarity index 97%
rename from manpages/shorewall-route_rules.xml
rename to manpages/shorewall-rtrules.xml
index 22f6573dc..5fad310a5 100644
--- a/manpages/shorewall-route_rules.xml
+++ b/manpages/shorewall-rtrules.xml
@@ -3,20 +3,20 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <refentry>
   <refmeta>
-    <refentrytitle>shorewall-route_rules</refentrytitle>
+    <refentrytitle>shorewall-rtrules</refentrytitle>
 
     <manvolnum>5</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>route_rules</refname>
+    <refname>rtrules</refname>
 
     <refpurpose>Shorewall Routing Rules file</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>/etc/shorewall/route_rules</command>
+      <command>/etc/shorewall/rtrules</command>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -174,7 +174,7 @@
   <refsect1>
     <title>FILES</title>
 
-    <para>/etc/shorewall/route_rules</para>
+    <para>/etc/shorewall/rtrules</para>
   </refsect1>
 
   <refsect1>
diff --git a/manpages/shorewall-rules.xml b/manpages/shorewall-rules.xml
index 13af47808..a0a92d768 100644
--- a/manpages/shorewall-rules.xml
+++ b/manpages/shorewall-rules.xml
@@ -1548,7 +1548,7 @@
     shorewall_interfaces(5), shorewall-ipsets(5), shorewall-maclist(5),
     shorewall-masq(5), shorewall-nat(5), shorewall-netmap(5),
     shorewall-params(5), shorewall-policy(5), shorewall-providers(5),
-    shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall.conf(5), shorewall-secmarks(5),
     shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
     shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-secmarks.xml b/manpages/shorewall-secmarks.xml
index 24a0fee56..d8bed9ed7 100644
--- a/manpages/shorewall-secmarks.xml
+++ b/manpages/shorewall-secmarks.xml
@@ -397,7 +397,7 @@ RESTORE                               I:ER</programlisting>
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
     shorewall-zones(5)</para>
diff --git a/manpages/shorewall-tcclasses.xml b/manpages/shorewall-tcclasses.xml
index 24825d6c2..f6c3b49e9 100644
--- a/manpages/shorewall-tcclasses.xml
+++ b/manpages/shorewall-tcclasses.xml
@@ -508,7 +508,7 @@
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
     shorewall-zones(5)</para>
diff --git a/manpages/shorewall-tcdevices.xml b/manpages/shorewall-tcdevices.xml
index 0be099a32..421205637 100644
--- a/manpages/shorewall-tcdevices.xml
+++ b/manpages/shorewall-tcdevices.xml
@@ -254,7 +254,7 @@
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
     shorewall-zones(5)</para>
diff --git a/manpages/shorewall-tcfilters.xml b/manpages/shorewall-tcfilters.xml
index 9bcf9c6fa..86963c692 100644
--- a/manpages/shorewall-tcfilters.xml
+++ b/manpages/shorewall-tcfilters.xml
@@ -247,7 +247,7 @@
     shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-tcinterfaces.xml b/manpages/shorewall-tcinterfaces.xml
index 24b7153ad..b9933b7b8 100644
--- a/manpages/shorewall-tcinterfaces.xml
+++ b/manpages/shorewall-tcinterfaces.xml
@@ -224,7 +224,7 @@
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcpri(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
     shorewall-zones(5)</para>
diff --git a/manpages/shorewall-tcpri.xml b/manpages/shorewall-tcpri.xml
index 25ceb8815..b9dd81107 100644
--- a/manpages/shorewall-tcpri.xml
+++ b/manpages/shorewall-tcpri.xml
@@ -155,7 +155,7 @@
     shorewall_interfaces(5), shorewall-ipsets(5), shorewall-maclist(5),
     shorewall-masq(5), shorewall-nat(5), shorewall-netmap(5),
     shorewall-params(5), shorewall-policy(5), shorewall-providers(5),
-    shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-tcrules.xml b/manpages/shorewall-tcrules.xml
index ef91ea521..cc356f703 100644
--- a/manpages/shorewall-tcrules.xml
+++ b/manpages/shorewall-tcrules.xml
@@ -907,7 +907,7 @@ SAME              $FW            0.0.0.0/0    tcp        80,443</programlisting>
     shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-template.xml b/manpages/shorewall-template.xml
index 52e6e2fb1..10ab822fb 100644
--- a/manpages/shorewall-template.xml
+++ b/manpages/shorewall-template.xml
@@ -55,7 +55,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5),
     shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
     shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-tos.xml b/manpages/shorewall-tos.xml
index a137f46ca..928e28480 100644
--- a/manpages/shorewall-tos.xml
+++ b/manpages/shorewall-tos.xml
@@ -169,7 +169,7 @@
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
     shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tunnels(5),
     shorewall-zones(5)</para>
diff --git a/manpages/shorewall-tunnels.xml b/manpages/shorewall-tunnels.xml
index f3f4f026a..b66c5523e 100644
--- a/manpages/shorewall-tunnels.xml
+++ b/manpages/shorewall-tunnels.xml
@@ -277,7 +277,7 @@
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
     shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5),
     shorewall-zones(5)</para>
diff --git a/manpages/shorewall-vardir.xml b/manpages/shorewall-vardir.xml
index 78285fde3..2fb377747 100644
--- a/manpages/shorewall-vardir.xml
+++ b/manpages/shorewall-vardir.xml
@@ -57,7 +57,7 @@
     shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
     shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
     shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5),
     shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
     shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall-zones.xml b/manpages/shorewall-zones.xml
index cdfd2d7c1..84bdf1770 100644
--- a/manpages/shorewall-zones.xml
+++ b/manpages/shorewall-zones.xml
@@ -348,7 +348,7 @@ c:a,b     ipv4</programlisting>
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-nesting(8), shorewall-netmap(5),
     shorewall-params(5), shorewall-policy(5), shorewall-providers(5),
-    shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-proxyarp(5), shorewall-rtrules(5),
     shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
     shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
     shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5)</para>
diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
index 07642528a..24a6ffa23 100644
--- a/manpages/shorewall.conf.xml
+++ b/manpages/shorewall.conf.xml
@@ -2092,7 +2092,7 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
           tcrules. This was done so that tcrules could reset the packet mark
           to zero, thus allowing the packet to be routed using the 'main'
           routing table. Using the main table allowed dynamic routes (such as
-          those added for VPNs) to be effective. The route_rules file was
+          those added for VPNs) to be effective. The rtrules file was
           created to provide a better alternative to clearing the packet mark.
           As a consequence, passing these packets to PREROUTING complicates
           things without providing any real benefit. Beginning with Shorewall
@@ -2263,7 +2263,7 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcinterfaces(5),
     shorewall-tcpri(5), shorewall-tcrules(5), shorewall-tos(5),
     shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml
index 54caeb1ee..f0604360e 100644
--- a/manpages/shorewall.xml
+++ b/manpages/shorewall.xml
@@ -1670,7 +1670,7 @@
     shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
     shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
     shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+    shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
     shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
     shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5),
     shorewall-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages6/shorewall6-accounting.xml b/manpages6/shorewall6-accounting.xml
index 981566877..1d6af0fd3 100644
--- a/manpages6/shorewall6-accounting.xml
+++ b/manpages6/shorewall6-accounting.xml
@@ -736,7 +736,7 @@
     <para>shorewall6(8), shorewall6-actions(5), shorewall6-blacklist(5),
     shorewall6-hosts(5), shorewall6-interfaces(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
diff --git a/manpages6/shorewall6-actions.xml b/manpages6/shorewall6-actions.xml
index 19313cabb..df2bcf9d5 100644
--- a/manpages6/shorewall6-actions.xml
+++ b/manpages6/shorewall6-actions.xml
@@ -50,7 +50,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-blacklist(5),
     shorewall6-hosts(5), shorewall6-interfaces(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5),
-    shorewall6-route_rules(5), shorewall6-routestopped(5),
+    shorewall6-rtrules(5), shorewall6-routestopped(5),
     shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
     shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages6/shorewall6-blacklist.xml b/manpages6/shorewall6-blacklist.xml
index d5c8a70d5..b0389999a 100644
--- a/manpages6/shorewall6-blacklist.xml
+++ b/manpages6/shorewall6-blacklist.xml
@@ -200,7 +200,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-hosts(5), shorewall6-interfaces(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
diff --git a/manpages6/shorewall6-blrules.xml b/manpages6/shorewall6-blrules.xml
index 15296b27f..c4d5bdfea 100644
--- a/manpages6/shorewall6-blrules.xml
+++ b/manpages6/shorewall6-blrules.xml
@@ -293,7 +293,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-hosts(5), shorewall6-interfaces(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
diff --git a/manpages6/shorewall6-exclusion.xml b/manpages6/shorewall6-exclusion.xml
index a5d8e13a2..aa6874ea4 100644
--- a/manpages6/shorewall6-exclusion.xml
+++ b/manpages6/shorewall6-exclusion.xml
@@ -104,7 +104,7 @@ ACCEPT          all!z2        net         tcp           22</programlisting>
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
     shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages6/shorewall6-hosts.xml b/manpages6/shorewall6-hosts.xml
index d71a93a3f..d51247d08 100644
--- a/manpages6/shorewall6-hosts.xml
+++ b/manpages6/shorewall6-hosts.xml
@@ -188,7 +188,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-interfaces(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
diff --git a/manpages6/shorewall6-interfaces.xml b/manpages6/shorewall6-interfaces.xml
index 2381cff23..526a31295 100644
--- a/manpages6/shorewall6-interfaces.xml
+++ b/manpages6/shorewall6-interfaces.xml
@@ -474,7 +474,7 @@ dmz     eth2      -</programlisting>
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
diff --git a/manpages6/shorewall6-ipsets.xml b/manpages6/shorewall6-ipsets.xml
index 94b962a3f..87a37a89e 100644
--- a/manpages6/shorewall6-ipsets.xml
+++ b/manpages6/shorewall6-ipsets.xml
@@ -117,7 +117,7 @@
     <para>shorewall6(8), shorewall6-actions(5), shorewall6-blacklist(5),
     shorewall6-hosts(5), shorewall6-interfaces(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5),
-    shorewall6-route_rules(5), shorewall6-routestopped(5),
+    shorewall6-rtrules(5), shorewall6-routestopped(5),
     shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
     shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-maclist.xml b/manpages6/shorewall6-maclist.xml
index 436697cdf..c56a8a0f6 100644
--- a/manpages6/shorewall6-maclist.xml
+++ b/manpages6/shorewall6-maclist.xml
@@ -107,7 +107,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
diff --git a/manpages6/shorewall6-modules.xml b/manpages6/shorewall6-modules.xml
index 47fbdd955..6e7a2320e 100644
--- a/manpages6/shorewall6-modules.xml
+++ b/manpages6/shorewall6-modules.xml
@@ -87,7 +87,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
diff --git a/manpages6/shorewall6-nesting.xml b/manpages6/shorewall6-nesting.xml
index 07efc0e13..38c0c49bd 100644
--- a/manpages6/shorewall6-nesting.xml
+++ b/manpages6/shorewall6-nesting.xml
@@ -110,7 +110,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
     shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-notrack.xml b/manpages6/shorewall6-notrack.xml
index f5344b884..c407ba756 100644
--- a/manpages6/shorewall6-notrack.xml
+++ b/manpages6/shorewall6-notrack.xml
@@ -223,7 +223,7 @@
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-ipsec(5), shoewall6-netmap(5),shorewall6-params(5),
     shorewall6-policy(5), shorewall6-providers(5), shorewall6-proxyarp(5),
-    shorewall6-route_rules(5), shorewall6-routestopped(5),
+    shorewall6-rtrules(5), shorewall6-routestopped(5),
     shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
     shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall-zones(5)</para>
diff --git a/manpages6/shorewall6-params.xml b/manpages6/shorewall6-params.xml
index 1c007dd9e..04d25447f 100644
--- a/manpages6/shorewall6-params.xml
+++ b/manpages6/shorewall6-params.xml
@@ -130,7 +130,7 @@ net     eth0            -               dhcp,nosmurfs</programlisting>
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shorewall6-policy(5), shorewall6-providers(5),
-    shorewall6-route_rules(5), shorewall6-routestopped(5),
+    shorewall6-rtrules(5), shorewall6-routestopped(5),
     shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5),
     shorewall6-tcdevices(5), shorewall6-tcrules(5), shorewall6-tos(5),
     shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-policy.xml b/manpages6/shorewall6-policy.xml
index f74877fa1..c7ef084a1 100644
--- a/manpages6/shorewall6-policy.xml
+++ b/manpages6/shorewall6-policy.xml
@@ -323,7 +323,7 @@
     shorewall6-nat(5), shorewall6-netmap(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
     shorewall6-providers(5), shorewall6-proxyarp(5),
-    shorewall6-route_rules(5), shorewall6-routestopped(5),
+    shorewall6-rtrules(5), shorewall6-routestopped(5),
     shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
     shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-providers.xml b/manpages6/shorewall6-providers.xml
index 66eade929..c91bc0634 100644
--- a/manpages6/shorewall6-providers.xml
+++ b/manpages6/shorewall6-providers.xml
@@ -321,7 +321,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5),
-    shorewall6-policy(5), shorewall6-route_rules(5),
+    shorewall6-policy(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
diff --git a/manpages6/shorewall6-proxyndp.xml b/manpages6/shorewall6-proxyndp.xml
index 4735ce572..6d5ce16db 100644
--- a/manpages6/shorewall6-proxyndp.xml
+++ b/manpages6/shorewall6-proxyndp.xml
@@ -139,7 +139,7 @@
     shorewall6-blacklist(5), shorewall6-exclusion(5), shorewall6-hosts(5),
     shorewall6-interfaces(5), shorewall6-maclist(5), shorewall6-nesting(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
diff --git a/manpages6/shorewall6-routes.xml b/manpages6/shorewall6-routes.xml
index d8e8b73b1..a3077f473 100644
--- a/manpages6/shorewall6-routes.xml
+++ b/manpages6/shorewall6-routes.xml
@@ -84,7 +84,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-hosts(5), shorewall6-interfaces(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
diff --git a/manpages6/shorewall6-routestopped.xml b/manpages6/shorewall6-routestopped.xml
index b22b65984..6b28d98d9 100644
--- a/manpages6/shorewall6-routestopped.xml
+++ b/manpages6/shorewall6-routestopped.xml
@@ -185,7 +185,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5),
-    shorewall6-policy(5), shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
     shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-route_rules.xml b/manpages6/shorewall6-rtrules.xml
similarity index 96%
rename from manpages6/shorewall6-route_rules.xml
rename to manpages6/shorewall6-rtrules.xml
index 438d189d5..fbcea5a52 100644
--- a/manpages6/shorewall6-route_rules.xml
+++ b/manpages6/shorewall6-rtrules.xml
@@ -3,20 +3,20 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <refentry>
   <refmeta>
-    <refentrytitle>shorewall6-route_rules</refentrytitle>
+    <refentrytitle>shorewall6-rtrules</refentrytitle>
 
     <manvolnum>5</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>route_rules</refname>
+    <refname>rtrules</refname>
 
     <refpurpose>Shorewall6 Routing Rules file</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>/etc/shorewall6/route_rules</command>
+      <command>/etc/shorewall6/rtrules</command>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -157,7 +157,7 @@
   <refsect1>
     <title>FILES</title>
 
-    <para>/etc/shorewall6/route_rules</para>
+    <para>/etc/shorewall6/rtrules</para>
   </refsect1>
 
   <refsect1>
diff --git a/manpages6/shorewall6-rules.xml b/manpages6/shorewall6-rules.xml
index f1f9e7b90..a3785636d 100644
--- a/manpages6/shorewall6-rules.xml
+++ b/manpages6/shorewall6-rules.xml
@@ -1224,7 +1224,7 @@
     shorewall6-blacklist(5), shorewall6-blrules(5), shorewall6-hosts(5),
     shorewall6-interfaces(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6.conf(5), shorewall6-secmarks(5),
     shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-secmarks.xml b/manpages6/shorewall6-secmarks.xml
index 00f05721c..53c6339cd 100644
--- a/manpages6/shorewall6-secmarks.xml
+++ b/manpages6/shorewall6-secmarks.xml
@@ -386,7 +386,7 @@ RESTORE                               I:ER</programlisting>
     <para>shorewall6(8), shorewall6-actions(5), shorewall6-blacklist(5),
     shorewall6-hosts(5), shorewall6-interfaces(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-tcclasses.xml b/manpages6/shorewall6-tcclasses.xml
index a42b286b5..b63db67c1 100644
--- a/manpages6/shorewall6-tcclasses.xml
+++ b/manpages6/shorewall6-tcclasses.xml
@@ -457,7 +457,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5),
-    shorewall6-policy(5), shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-tcdevices.xml b/manpages6/shorewall6-tcdevices.xml
index 630beecc7..b67ae57f4 100644
--- a/manpages6/shorewall6-tcdevices.xml
+++ b/manpages6/shorewall6-tcdevices.xml
@@ -251,7 +251,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5),
-    shorewall6-policy(5), shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-tcinterfaces.xml b/manpages6/shorewall6-tcinterfaces.xml
index 544b42469..297265484 100644
--- a/manpages6/shorewall6-tcinterfaces.xml
+++ b/manpages6/shorewall6-tcinterfaces.xml
@@ -222,7 +222,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcpri, shorewall6-tos(5),
     shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-tcpri.xml b/manpages6/shorewall6-tcpri.xml
index d90ba8ded..f8e2f5edf 100644
--- a/manpages6/shorewall6-tcpri.xml
+++ b/manpages6/shorewall6-tcpri.xml
@@ -150,7 +150,7 @@
     <para>PRIO(8), shorewall6(8), shorewall6-accounting(5),
     shorewall6-actions(5), shorewall6-blacklist(5), shorewall6-hosts(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
     shorewall6-tcinterfaces(5), shorewall6-tos(5), shorewall6-tunnels(5),
     shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-tcrules.xml b/manpages6/shorewall6-tcrules.xml
index fbad02eb5..1c97dd88f 100644
--- a/manpages6/shorewall6-tcrules.xml
+++ b/manpages6/shorewall6-tcrules.xml
@@ -857,7 +857,7 @@ SAME              $FW            0.0.0.0/0    tcp        80,443</programlisting>
     shorewall6-blacklist(5), shorewall6-ecn(5), shorewall6-exclusion(5),
     shorewall6-hosts(5), shorewall6-interfaces(5), shorewall6-maclist(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-template.xml b/manpages6/shorewall6-template.xml
index d3899142c..51b01fabe 100644
--- a/manpages6/shorewall6-template.xml
+++ b/manpages6/shorewall6-template.xml
@@ -55,7 +55,7 @@
     shorewall6-blacklist(5), shorewall6-exclusion(5), shorewall6-hosts(5),
     shorewall6-interfaces(5), shorewall6-maclist(5), shorewall6-nesting(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5),
-    shorewall6-route_rules(5), shorewall6-routestopped(5),
+    shorewall6-rtrules(5), shorewall6-routestopped(5),
     shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5),
     shorewall6-tcdevices(5), shorewall6-tcrules(5), shorewall6-tos(5),
     shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-tos.xml b/manpages6/shorewall6-tos.xml
index 34a5606cc..d1183b673 100644
--- a/manpages6/shorewall6-tos.xml
+++ b/manpages6/shorewall6-tos.xml
@@ -165,7 +165,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5),
-    shorewall6-policy(5), shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-tunnels.xml b/manpages6/shorewall6-tunnels.xml
index 1744aab6f..c3bd20c9f 100644
--- a/manpages6/shorewall6-tunnels.xml
+++ b/manpages6/shorewall6-tunnels.xml
@@ -234,7 +234,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5),
-    shorewall6-policy(5), shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-vardir.xml b/manpages6/shorewall6-vardir.xml
index d8ae0f420..9752e8833 100644
--- a/manpages6/shorewall6-vardir.xml
+++ b/manpages6/shorewall6-vardir.xml
@@ -56,7 +56,7 @@
     <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
     shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
     shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6-zones.xml b/manpages6/shorewall6-zones.xml
index d41e5f6fd..701d988b6 100644
--- a/manpages6/shorewall6-zones.xml
+++ b/manpages6/shorewall6-zones.xml
@@ -345,7 +345,7 @@ c:a,b     ipv6</programlisting>
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shorewall6-nesting(8),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5)</para>
diff --git a/manpages6/shorewall6.conf.xml b/manpages6/shorewall6.conf.xml
index 27397f823..da0dfa698 100644
--- a/manpages6/shorewall6.conf.xml
+++ b/manpages6/shorewall6.conf.xml
@@ -1809,7 +1809,7 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
           to zero, thus allowing the packet to be routed using the 'main'
           routing table. Using the main table allowed dynamic routes (such as
           those added for VPNs) to be effective. The <ulink
-          url="shorewall6-route_rules.html">shorewall6-route_rules</ulink>(5)
+          url="shorewall6-rtrules.html">shorewall6-rtrules</ulink>(5)
           file was created to provide a better alternative to clearing the
           packet mark. As a consequence, passing these packets to PREROUTING
           complicates things without providing any real benefit. Beginning
@@ -1978,7 +1978,7 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
     shorewall6-nat(5), shorewall6-netmap(5),
     shoewall6-netmap(5),shorewall6-params(5), shorewall6-policy(5),
     shorewall6-providers(5), shorewall6-proxyarp(5),
-    shorewall6-route_rules(5), shorewall6-routestopped(5),
+    shorewall6-rtrules(5), shorewall6-routestopped(5),
     shorewall6-rules(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),
     shorewall6-zones(5)</para>
diff --git a/manpages6/shorewall6.xml b/manpages6/shorewall6.xml
index 4ee86930b..a71516484 100644
--- a/manpages6/shorewall6.xml
+++ b/manpages6/shorewall6.xml
@@ -1490,7 +1490,7 @@
     <para>shorewall6-accounting(5), shorewall6-actions(5),
     shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
     shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5),
-    shorewall6-policy(5), shorewall6-providers(5), shorewall6-route_rules(5),
+    shorewall6-policy(5), shorewall6-providers(5), shorewall6-rtrules(5),
     shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5),
     shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5),
     shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5),