diff --git a/manpages/shorewall-notrack.xml b/manpages/shorewall-notrack.xml
index 91e6a2f2f..ae53bc057 100644
--- a/manpages/shorewall-notrack.xml
+++ b/manpages/shorewall-notrack.xml
@@ -11,12 +11,12 @@
   <refnamediv>
     <refname>notrack</refname>
 
-    <refpurpose>shorewall6 notrack file</refpurpose>
+    <refpurpose>shorewall notrack file</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>/etc/shorewall6/notrack</command>
+      <command>/etc/shorewall/notrack</command>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -27,8 +27,8 @@
     connection tracking. Traffic matching entries in this fill will not be
     tracked.</para>
 
-    <para>The file was added in shorewall6-perl 4.2.7 and is not supported by
-    shorewall6-shell or by earlier versions of shorewall6-perl.</para>
+    <para>The file was added in shorewall-perl 4.2.7 and is not supported by
+    shorewall-shell or by earlier versions of shorewall-perl.</para>
 
     <para>The columns in the file are as follows.</para>
 
@@ -42,7 +42,7 @@
           <replaceable>interface</replaceable> is an interface to that zone,
           and <replaceable>address-list</replaceable> is a comma-separated
           list of addresses (may contain exclusion - see <ulink
-          url="shorewall-exclusion.html">shorewall6-exclusion</ulink>
+          url="shorewall-exclusion.html">shorewall-exclusion</ulink>
           (5)).</para>
         </listitem>
       </varlistentry>
@@ -53,7 +53,7 @@
         <listitem>
           <para>where <replaceable>address-list</replaceable> is a
           comma-separated list of addresses (may contain exclusion - see
-          <ulink url="shorewall-exclusion.html">shorewall6-exclusion</ulink>
+          <ulink url="shorewall-exclusion.html">shorewall-exclusion</ulink>
           (5)).</para>
         </listitem>
       </varlistentry>
@@ -108,19 +108,19 @@
   <refsect1>
     <title>FILES</title>
 
-    <para>/etc/shorewall6/notrack</para>
+    <para>/etc/shorewall/notrack</para>
   </refsect1>
 
   <refsect1>
     <title>See ALSO</title>
 
-    <para>shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5),
-    shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5),
-    shorewall6-ipsec(5), shorewall6-params(5), shorewall6-policy(5),
-    shorewall6-providers(5), shorewall6-proxyarp(5),
-    shorewall6-route_rules(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), shorewall-zones(5)</para>
+    <para>shorewall(8), shorewall-accounting(5), shorewall-actions(5),
+    shorewall-blacklist(5), shorewall-hosts(5), shorewall-interfaces(5),
+    shorewall-ipsec(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.conf(5),
+    shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
+    shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
   </refsect1>
 </refentry>