diff --git a/specs/XKB/ch12.xml b/specs/XKB/ch12.xml
index d3534efd..a769d51b 100644
--- a/specs/XKB/ch12.xml
+++ b/specs/XKB/ch12.xml
@@ -143,7 +143,7 @@ The
  function reports the keysym associated with a particular index for a single
 key. The index specifies a column of symbols in the core keyboard mapping (that
 is, as reported by the core protocol
-<emphasis>GetKeyboardMapping</emphasis>
+<systemitem>GetKeyboardMapping</systemitem>
  request). The order of the symbols in the core mapping does not necessarily
 correspond to the order of the symbols used by Xkb; <link linkend="Xkb_Keyboard_Mapping_to_Core_Keyboard_Mapping_Transformations">section 17.1.3</link> describes
 the differences.
diff --git a/specs/XKB/ch17.xml b/specs/XKB/ch17.xml
index c12b880c..eba9d80c 100644
--- a/specs/XKB/ch17.xml
+++ b/specs/XKB/ch17.xml
@@ -42,9 +42,9 @@ Xkb components to core components and vice versa. In addition, the server also
 maintains a core keyboard mapping that approximates the Xkb keyboard mapping.
 The core keyboard mapping may be updated piecemeal, on a per-key basis. When
 the server receives a core protocol
-<emphasis>ChangeKeyboardMapping</emphasis>
+<systemitem>ChangeKeyboardMapping</systemitem>
  or
-<emphasis>SetModifierMapping</emphasis>
+<systemitem>SetModifierMapping</systemitem>
  request, it updates its core keyboard mapping, then uses the compatibility map
 to update its Xkb keyboard mapping. When the server receives an
 <function>XkbSetMap</function>
@@ -98,9 +98,9 @@ Xkb state in the server.
     <para>
 After core protocol requests received by the server to change the keyboard
 mapping (
-<emphasis>ChangeKeyboardMapping</emphasis>
+<systemitem>ChangeKeyboardMapping</systemitem>
  and
-<emphasis>SetModifierMapping</emphasis>
+<systemitem>SetModifierMapping</systemitem>
 ) have been applied to the server’s core keyboard map, the results must be
 transformed to achieve an equivalent change of the Xkb keyboard mapping
 maintained by the server.
diff --git a/specs/XKB/ch19.xml b/specs/XKB/ch19.xml
index 0fd30691..84a42638 100644
--- a/specs/XKB/ch19.xml
+++ b/specs/XKB/ch19.xml
@@ -125,7 +125,7 @@ Adjusts core protocol
   <para>
 Reports keyboard mappings for keys that match the stored legal range to clients
 that issue a core protocol
-<emphasis>GetKeyboardMapping</emphasis>
+<systemitem>GetKeyboardMapping</systemitem>
  request.
   </para>
 </listitem>
@@ -133,16 +133,16 @@ that issue a core protocol
   <para>
 Reports modifier mappings only for keys that match the stored legal range to
 clients that issue a core protocol
-<emphasis>GetModifierMapping</emphasis>
+<systemitem>GetModifierMapping</systemitem>
  request.
   </para>
 </listitem>
 <listitem>
   <para>
 Restricts the core protocol
-<emphasis>ChangeKeyboardMapping</emphasis>
+<systemitem>ChangeKeyboardMapping</systemitem>
  and
-<emphasis>SetModifierMapping</emphasis>
+<systemitem>SetModifierMapping</systemitem>
  requests to keys that fall inside the stored legal range.
   </para>
 </listitem>
@@ -284,7 +284,7 @@ of a key).
 
 <para>
 If the keyboard change is the result of an X Input Extension
-<emphasis>ChangeKeyboardDevice</emphasis>
+<systemitem>ChangeKeyboardDevice</systemitem>
  request,
 <structfield>req_major</structfield>
  contains the input extension major opcode, and