diff --git a/man/loginctl.xml b/man/loginctl.xml
index e129d1b136..ef0dfc06b6 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -91,7 +91,7 @@
                                 <term><option>--property=</option></term>
 
                                 <listitem><para>When showing
-                                session/user properties, limit
+                                session/user/seat properties, limit
                                 display to certain properties as
                                 specified as argument. If not
                                 specified, all set properties are
@@ -108,7 +108,7 @@
                                 <term><option>--all</option></term>
 
                                 <listitem><para>When showing
-                                unit/job/manager properties, show all
+                                session/user/seat properties, show all
                                 properties regardless whether they are
                                 set or not.</para></listitem>
                         </varlistentry>
diff --git a/man/machinectl.xml b/man/machinectl.xml
index ced304d6d8..37fefeadc8 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -91,7 +91,7 @@
                                 <term><option>--property=</option></term>
 
                                 <listitem><para>When showing
-                                session/user properties, limit the
+                                machine properties, limit the
                                 output to certain properties as
                                 specified by the argument. If not
                                 specified, all set properties are
@@ -108,7 +108,7 @@
                                 <term><option>--all</option></term>
 
                                 <listitem><para>When showing
-                                unit/job/manager properties, show all
+                                machine properties, show all
                                 properties regardless of whether they are
                                 set or not.</para></listitem>
                         </varlistentry>
@@ -141,13 +141,13 @@
                                 <term><option>--kill-who=</option></term>
 
                                 <listitem><para>When used with
-                                <command>kill-session</command>,
+                                <command>kill-machine</command>,
                                 choose which processes to kill. Must
                                 be one of <option>leader</option>, or
                                 <option>all</option> to select whether
                                 to kill only the leader process of the
-                                session or all processes of the
-                                session. If omitted, defaults to
+                                machine or all processes of the
+                                machine. If omitted, defaults to
                                 <option>all</option>.</para></listitem>
                         </varlistentry>
 
@@ -156,11 +156,10 @@
                                 <term><option>--signal=</option></term>
 
                                 <listitem><para>When used with
-                                <command>kill-session</command> or
-                                <command>kill-user</command>, choose
+                                <command>kill-machine</command> choose
                                 which signal to send to selected
-                                processes. Must be one of the well-known
-                                signal specifiers, such as
+                                processes. Must be one of the
+                                well-known signal specifiers, such as
                                 <constant>SIGTERM</constant>,
                                 <constant>SIGINT</constant> or
                                 <constant>SIGSTOP</constant>. If