diff --git a/manpages6/shorewall6-shorewall-actions.xml b/manpages6/shorewall6-actions.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-actions.xml
rename to manpages6/shorewall6-actions.xml
diff --git a/manpages6/shorewall6-shorewall-blacklist.xml b/manpages6/shorewall6-blacklist.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-blacklist.xml
rename to manpages6/shorewall6-blacklist.xml
diff --git a/manpages6/shorewall6-shorewall-ecn.xml b/manpages6/shorewall6-ecn.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-ecn.xml
rename to manpages6/shorewall6-ecn.xml
diff --git a/manpages6/shorewall6-shorewall-exclusion.xml b/manpages6/shorewall6-exclusion.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-exclusion.xml
rename to manpages6/shorewall6-exclusion.xml
diff --git a/manpages6/shorewall6-shorewall-hosts.xml b/manpages6/shorewall6-hosts.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-hosts.xml
rename to manpages6/shorewall6-hosts.xml
diff --git a/manpages6/shorewall6-shorewall-interfaces.xml b/manpages6/shorewall6-interfaces.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-interfaces.xml
rename to manpages6/shorewall6-interfaces.xml
diff --git a/manpages6/shorewall6-shorewall-maclist.xml b/manpages6/shorewall6-maclist.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-maclist.xml
rename to manpages6/shorewall6-maclist.xml
diff --git a/manpages6/shorewall6-shorewall-modules.xml b/manpages6/shorewall6-modules.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-modules.xml
rename to manpages6/shorewall6-modules.xml
diff --git a/manpages6/shorewall6-shorewall-nesting.xml b/manpages6/shorewall6-nesting.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-nesting.xml
rename to manpages6/shorewall6-nesting.xml
diff --git a/manpages6/shorewall6-shorewall-params.xml b/manpages6/shorewall6-params.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-params.xml
rename to manpages6/shorewall6-params.xml
diff --git a/manpages6/shorewall6-shorewall-policy.xml b/manpages6/shorewall6-policy.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-policy.xml
rename to manpages6/shorewall6-policy.xml
diff --git a/manpages6/shorewall6-shorewall-providers.xml b/manpages6/shorewall6-providers.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-providers.xml
rename to manpages6/shorewall6-providers.xml
diff --git a/manpages6/shorewall6-shorewall-route_rules.xml b/manpages6/shorewall6-route_rules.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-route_rules.xml
rename to manpages6/shorewall6-route_rules.xml
diff --git a/manpages6/shorewall6-shorewall-routestopped.xml b/manpages6/shorewall6-routestopped.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-routestopped.xml
rename to manpages6/shorewall6-routestopped.xml
diff --git a/manpages6/shorewall6-shorewall-rules.xml b/manpages6/shorewall6-rules.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-rules.xml
rename to manpages6/shorewall6-rules.xml
diff --git a/manpages6/shorewall6-accounting.xml b/manpages6/shorewall6-shorewall6-accounting.xml
similarity index 100%
rename from manpages6/shorewall6-accounting.xml
rename to manpages6/shorewall6-shorewall6-accounting.xml
diff --git a/manpages6/shorewall6-shorewall-tcclasses.xml b/manpages6/shorewall6-tcclasses.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-tcclasses.xml
rename to manpages6/shorewall6-tcclasses.xml
diff --git a/manpages6/shorewall6-shorewall-tcdevices.xml b/manpages6/shorewall6-tcdevices.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-tcdevices.xml
rename to manpages6/shorewall6-tcdevices.xml
diff --git a/manpages6/shorewall6-shorewall-tcfilters.xml b/manpages6/shorewall6-tcfilters.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-tcfilters.xml
rename to manpages6/shorewall6-tcfilters.xml
diff --git a/manpages6/shorewall6-shorewall-tcrules.xml b/manpages6/shorewall6-tcrules.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-tcrules.xml
rename to manpages6/shorewall6-tcrules.xml
diff --git a/manpages6/shorewall6-shorewall-template.xml b/manpages6/shorewall6-template.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-template.xml
rename to manpages6/shorewall6-template.xml
diff --git a/manpages6/shorewall6-shorewall-tos.xml b/manpages6/shorewall6-tos.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-tos.xml
rename to manpages6/shorewall6-tos.xml
diff --git a/manpages6/shorewall6-shorewall-tunnels.xml b/manpages6/shorewall6-tunnels.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-tunnels.xml
rename to manpages6/shorewall6-tunnels.xml
diff --git a/manpages6/shorewall6-shorewall-vardir.xml b/manpages6/shorewall6-vardir.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-vardir.xml
rename to manpages6/shorewall6-vardir.xml
diff --git a/manpages6/shorewall6-shorewall-zones.xml b/manpages6/shorewall6-zones.xml
similarity index 100%
rename from manpages6/shorewall6-shorewall-zones.xml
rename to manpages6/shorewall6-zones.xml