diff --git a/specs/XKB/ch02.xml b/specs/XKB/ch02.xml
index 6507cb2f..e0b27cc9 100644
--- a/specs/XKB/ch02.xml
+++ b/specs/XKB/ch02.xml
@@ -737,13 +737,13 @@ indicated ID
 <title>Display and Device Specifications in Function Calls</title>
 <para>
 Where a connection to the server is passed as an argument (Display*) and an
-<emphasis>XkbDescPtr</emphasis>
+<type>XkbDescPtr</type>
  is also passed as an argument, the Display* argument must match the
 <emphasis>dpy</emphasis>
  field of the
 <structname>XkbDescRec</structname>
  pointed to by the
-<emphasis>XkbDescPtr</emphasis>
+<type>XkbDescPtr</type>
  argument, or else the
 <emphasis>dpy</emphasis>
  field of the
@@ -793,14 +793,14 @@ its device identifier.
 
 <para>
 Where an Xkb device identifier is passed as an argument and an
-<emphasis>XkbDescPtr</emphasis>
+<type>XkbDescPtr</type>
  is also passed as an argument, if either the argument or the
 <structname>XkbDescRec</structname>
 <emphasis>device_spec</emphasis>
  field is
 <symbol>XkbUseCoreKbd</symbol>,
 and if the function returns successfully, the
-<emphasis>XkbDescPtr</emphasis>
+<type>XkbDescPtr</type>
 <emphasis>device_spec</emphasis>
  field will have been converted from
 <symbol>XkbUseCoreKbd</symbol>
@@ -809,7 +809,7 @@ and if the function returns successfully, the
  field remains unchanged. Subsequently, the device id argument must match the
 <emphasis>device_spec</emphasis>
  field of the
-<emphasis>XkbDescPtr</emphasis>
+<type>XkbDescPtr</type>
  argument. If they don’t match, a
 <errorname>BadMatch</errorname>
  error is returned (either in the return value or a backfilled
diff --git a/specs/XKB/ch15.xml b/specs/XKB/ch15.xml
index a3c4819a..9158949d 100644
--- a/specs/XKB/ch15.xml
+++ b/specs/XKB/ch15.xml
@@ -2259,7 +2259,7 @@ as appropriate. If the
  to include the
 <parameter>key</parameter>
  that was changed. See <link linkend="The_XkbMapChangesRec_Structure">section 14.3.1</link> for more information on the
-<emphasis>XkbMapChangesPtr</emphasis>
+<type>XkbMapChangesPtr</type>
  structure. If successful,
 <function>XkbChangeTypesOfKey</function>
  returns
diff --git a/specs/XKB/ch21.xml b/specs/XKB/ch21.xml
index ffeea2a4..902412a7 100644
--- a/specs/XKB/ch21.xml
+++ b/specs/XKB/ch21.xml
@@ -590,7 +590,7 @@ available via
 <function>XkbGetDeviceInfo</function>.
 These convenience functions mirror some of the mask bits. The functions all
 take an
-<emphasis>XkbDeviceInfoPtr</emphasis>
+<type>XkbDeviceInfoPtr</type>
  as an input argument and operate on the X Input Extension device specified by
 the
 <parameter>device_spec</parameter>