diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index 2a310d3ecf7..adba75a71ad 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -55,7 +55,7 @@
                 <title>Description</title>
 
                 <para>A unit configuration file whose name ends in
-                <filename>.automount</filename> encodes information
+                <literal>.automount</literal> encodes information
                 about a file system automount point controlled and
                 supervised by systemd.</para>
 
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index 1c29aa4e79f..e3cf071bcb9 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -55,7 +55,7 @@
                 <title>Description</title>
 
                 <para>A unit configuration file whose name ends in
-                <filename>.device</filename> encodes information about
+                <literal>.device</literal> encodes information about
                 a device unit as exposed in the
                 sysfs/<citerefentry><refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                 device tree.</para>
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 07f21025b8a..c57f613290d 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -55,7 +55,7 @@
                 <title>Description</title>
 
                 <para>A unit configuration file whose name ends in
-                <filename>.mount</filename> encodes information about
+                <literal>.mount</literal> encodes information about
                 a file system mount point controlled and supervised by
                 systemd.</para>
 
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index 1975142d2c0..8c782b85311 100644
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -55,7 +55,7 @@
                 <title>Description</title>
 
                 <para>A unit configuration file whose name ends in
-                <filename>.path</filename> encodes information about
+                <literal>.path</literal> encodes information about
                 a path monitored by systemd, for
                 path-based activation.</para>
 
@@ -185,7 +185,7 @@
                                 when any of the configured paths
                                 changes. The argument is a unit name,
                                 whose suffix is not
-                                <filename>.path</filename>. If not
+                                <literal>.path</literal>. If not
                                 specified, this value defaults to a
                                 service that has the same name as the
                                 path unit, except for the suffix. (See
diff --git a/man/systemd.snapshot.xml b/man/systemd.snapshot.xml
index 08d14c4e012..4e8d5a901ff 100644
--- a/man/systemd.snapshot.xml
+++ b/man/systemd.snapshot.xml
@@ -57,7 +57,7 @@
                 <para>Snapshot units are not configured via unit
                 configuration files. Nonetheless they are named
                 similar to filenames. A unit name whose name ends in
-                <filename>.snapshot</filename> refers to a dynamic
+                <literal>.snapshot</literal> refers to a dynamic
                 snapshot of the systemd runtime state.</para>
 
                 <para>Snapshots are not configured on disk but created
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 2e1fb7cea16..1b899c46a12 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -55,7 +55,7 @@
                 <title>Description</title>
 
                 <para>A unit configuration file whose name ends in
-                <filename>.socket</filename> encodes information about
+                <literal>.socket</literal> encodes information about
                 an IPC or network socket or a file system FIFO
                 controlled and supervised by systemd, for socket-based
                 activation.</para>
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 9a3905a927c..d931c46e803 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -55,7 +55,7 @@
                 <title>Description</title>
 
                 <para>A unit configuration file whose name ends in
-                <filename>.swap</filename> encodes information about a
+                <literal>.swap</literal> encodes information about a
                 swap device or file for memory paging controlled and
                 supervised by systemd.</para>
 
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index fd51cfde3a2..15662a548d8 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -55,7 +55,7 @@
                 <title>Description</title>
 
                 <para>A unit configuration file whose name ends in
-                <filename>.target</filename> encodes information about
+                <literal>.target</literal> encodes information about
                 a target unit of systemd, which is used for grouping
                 units and as well-known synchronization points during
                 start-up.</para>
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 1f0aac2eed0..fa67d59a22a 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -55,7 +55,7 @@
                 <title>Description</title>
 
                 <para>A unit configuration file whose name ends in
-                <filename>.timer</filename> encodes information about
+                <literal>.timer</literal> encodes information about
                 a timer controlled and supervised by systemd, for
                 timer-based activation.</para>
 
@@ -187,7 +187,7 @@
                                 <listitem><para>The unit to activate
                                 when this timer elapses. The argument is a
                                 unit name, whose suffix is not
-                                <filename>.timer</filename>. If not
+                                <literal>.timer</literal>. If not
                                 specified, this value defaults to a
                                 service that has the same name as the
                                 timer unit, except for the
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 4f0bd64b121..a870f6b17ab 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -173,7 +173,7 @@
                 <para>Along with a unit file
                 <filename>foo.service</filename> a directory
                 <filename>foo.service.d/</filename> may exist. All
-                files with the suffix <filename>.conf</filename> from
+                files with the suffix <literal>.conf</literal> from
                 this directory will be parsed after the file itself is
                 parsed. This is useful to alter or add configuration
                 settings to a unit, without having to modify their